Merge remote-tracking branch 'origin/QCMCHnew' into QCMCHnew

Author: lmassacr

DATA/production/calib/mid-badchannels.sh

@@ -44,7 +44,7 @@ workflow_has_parameter CTF && {
 add_W o2-mid-calibration-workflow "" "" 0
 add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDB_POPULATOR_UPLOAD_PATH\" --sspec-min 0 --sspec-max 0"
 add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDB_POPULATOR_UPLOAD_PATH_DCS\" --sspec-min 1 --sspec-max 1 --name-extention dcs"
-workflow_has_parameter QC && add_QC_from_consul "/o2/components/qc/ANY/any/mid-calib-qcmn" "--local --host localhost"
+workflow_has_parameter QC && add_QC_from_apricot "/o2/components/qc/ANY/any/mid-calib-qcmn" "--local --host localhost"
 WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
 
 if [ "$WORKFLOWMODE" == "print" ]; then

DATA/production/calib/tpc-pedestal.sh

@@ -21,26 +21,32 @@ HOST=localhost
 QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn?run_type=${RUNTYPE:-}"
 CALIB_CONFIG="TPCCalibPedestal.ADCMin=20"
 
-
-max_events=50
-publish_after=400
-
-if [[ ! -z ${TPC_CALIB_MAX_EVENTS:-} ]]; then
-    max_events=${TPC_CALIB_MAX_EVENTS}
-fi
-
-if [[ ! -z ${TPC_CALIB_PUBLISH_AFTER:-} ]]; then
-    publish_after=${TPC_CALIB_PUBLISH_AFTER}
-fi
-
+# ===| configuration from environment variables |===============================
+max_events=${TPC_CALIB_MAX_EVENTS:-50}
+publish_after=${TPC_CALIB_PUBLISH_AFTER:-400}
+sendToDCS=${TPC_CALIB_SEND_TO_DCS:-1}
+
+# ===| ccdb populator setup |===================================================
+# the production CCDB populator will accept subspecs in this range
+CCDBPRO_SUBSPEC_MIN=0
+CCDBPRO_SUBSPEC_MAX=32767
+CCDBPATHPRO="http://o2-ccdb.internal"
+
+# the DCS CCDB populator will accept subspecs in this range
+CCDBDCS_SUBSPEC_MIN=32768
+CCDBDCS_SUBSPEC_MAX=65535
+CCDBPATHDCS="$DCSCCDBSERVER_PERS"
 
 #################################################################################################################################
 
 
 WORKFLOW=
 add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
-add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36" "${CALIB_CONFIG}"
-add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
+add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --send-to-dcs-ccdb $sendToDCS" "${CALIB_CONFIG}"
+add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"$CCDBPATHPRO\"  --sspec-min $CCDBPRO_SUBSPEC_MIN --sspec-max $CCDBPRO_SUBSPEC_MAX" "" 0
+if [[ $sendToDCS -eq 1 ]]; then
+  add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"$CCDBPATHDCS\"  --sspec-min $CCDBDCS_SUBSPEC_MIN --sspec-max $CCDBDCS_SUBSPEC_MAX  --name-extention dcs" "" 0
+fi
 add_QC_from_apricot "${QC_CONFIG}" "--local --host localhost"
 
 WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"

DATA/production/configurations/asyncReco/setenv_extra.sh

@@ -119,6 +119,15 @@ if [[ $remappingITS == 1 ]] || [[ $remappingMFT == 1 ]]; then
   REMAPPING=$REMAPPING\"
 fi
 
+# generic remapping string
+if [[ -n "$ALIEN_JDL_REMAPPINGS" ]]; then
+  if [[ -n "$REMAPPING" ]]; then
+    REMAPPING="${REMAPPING::-1};$ALIEN_JDL_REMAPPINGS\""
+  else
+    REMAPPING="--condition-remap \"$ALIEN_JDL_REMAPPINGS\""
+  fi
+fi
+
 echo "Remapping = $REMAPPING"
 
 # needed if we need more wf
@@ -348,6 +357,14 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
     export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.globalTrackingRowRange=100;"
   fi
 
+  if [[ -n "$ALIEN_JDL_TPCDEDXCLMASK" ]]; then
+    CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.dEdxClusterRejectionFlagMask=$ALIEN_JDL_TPCDEDXCLMASK;"
+  fi
+
+  if [[ -n "$ALIEN_JDL_TPCCLUSTERFILTER" ]]; then
+    CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_proc.tpcUseOldCPUDecoding=1;GPU_proc.tpcApplyClusterFilterOnCPU=$ALIEN_JDL_TPCCLUSTERFILTER;"
+  fi
+
   #-------------------------------------- TPC corrections -----------------------------------------------
   # we need to provide to TPC
   # 1) interaction rate info (lumi) used for scaling or errors and possible of the corrections : INST_IR_FOR_TPC
@@ -583,6 +600,15 @@ if [[ $BEAMTYPE == "pp" ]]; then
   export CONFIG_EXTRA_PROCESS_o2_mch_reco_workflow+=";MCHTracking.chamberResolutionX=0.4;MCHTracking.chamberResolutionY=0.4;MCHTracking.sigmaCutForTracking=7;MCHTracking.sigmaCutForImprovement=6"
 fi
 
+# ad-hoc settings for MFT-MCH matching
+# Number of MFT-MCH matching candidates to be stored in AO2Ds
+# Setting MUON_MATCHING_NCANDIDATES=0 disables the storage of multiple candidates
+if [[ -z "${MUON_MATCHING_NCANDIDATES:-}" ]]; then
+  MUON_MATCHING_NCANDIDATES=0 # disable the saving of nCandidated by default
+  if [[ $BEAMTYPE == "pp" ]]; then MUON_MATCHING_NCANDIDATES=5; fi
+  if [[ $BEAMTYPE == "PbPb" ]]; then MUON_MATCHING_NCANDIDATES=20; fi
+fi
+
 # possibly adding calib steps as done online
 # could be done better, so that more could be enabled in one go
 if [[ $ADD_CALIB == "1" ]]; then

MC/run/ANCHOR/anchorMC.sh

@@ -312,20 +312,33 @@ if [ "${ISEXCLUDED}" ]; then
 fi
 
 # -- Create aligned geometry using ITS ideal alignment to avoid overlaps in geant
-CCDBOBJECTS_IDEAL_MC="ITS/Calib/Align"
-TIMESTAMP_IDEAL_MC=1
-${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch/ -p ${CCDBOBJECTS_IDEAL_MC} -d ${ALICEO2_CCDB_LOCALCACHE} --timestamp ${TIMESTAMP_IDEAL_MC}
-CCDB_RC="${?}"
-if [ ! "${CCDB_RC}" == "0" ]; then
-  echo_error "Problem during CCDB prefetching of ${CCDBOBJECTS_IDEAL_MC}. Exiting."
-  exit ${CCDB_RC}
+ENABLEPW=0
+if [[ ${remainingargs} == *"GeometryManagerParam.useParallelWorld=1"* ]]; then
+  ENABLEPW=1
+fi
+
+if [ "${ENABLEPW}" == "0" ]; then
+  CCDBOBJECTS_IDEAL_MC="ITS/Calib/Align"
+  TIMESTAMP_IDEAL_MC=1
+  ${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch/ -p ${CCDBOBJECTS_IDEAL_MC} -d ${ALICEO2_CCDB_LOCALCACHE} --timestamp ${TIMESTAMP_IDEAL_MC}
+  CCDB_RC="${?}"
+  if [ ! "${CCDB_RC}" == "0" ]; then
+    echo_error "Problem during CCDB prefetching of ${CCDBOBJECTS_IDEAL_MC}. Exiting."
+    exit ${CCDB_RC}
+  fi
 fi
 
 # TODO This can potentially be removed or if needed, should be taken over by o2dpg_sim_workflow_anchored.py and O2_dpg_workflow_runner.py
-echo "run with echo in pipe" | ${O2_ROOT}/bin/o2-create-aligned-geometry-workflow --configKeyValues "HBFUtils.startTime=${TIMESTAMP}" --condition-remap=file://${ALICEO2_CCDB_LOCALCACHE}=ITS/Calib/Align -b --run
+if [ "${ENABLEPW}" == "0" ]; then
+  echo "run with echo in pipe" | ${O2_ROOT}/bin/o2-create-aligned-geometry-workflow --configKeyValues "HBFUtils.startTime=${TIMESTAMP}" --condition-remap=file://${ALICEO2_CCDB_LOCALCACHE}=ITS/Calib/Align -b --run
+else
+  echo "run with echo in pipe" | ${O2_ROOT}/bin/o2-create-aligned-geometry-workflow --configKeyValues "HBFUtils.startTime=${TIMESTAMP}" -b --run
+fi
 mkdir -p $ALICEO2_CCDB_LOCALCACHE/GLO/Config/GeometryAligned
 ln -s -f $PWD/o2sim_geometry-aligned.root $ALICEO2_CCDB_LOCALCACHE/GLO/Config/GeometryAligned/snapshot.root
-[[ -f $PWD/its_GeometryTGeo.root ]] && mkdir -p $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry && ln -s -f $PWD/its_GeometryTGeo.root $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry/snapshot.root
+if [ "${ENABLEPW}" == "0" ]; then
+  [[ -f $PWD/its_GeometryTGeo.root ]] && mkdir -p $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry && ln -s -f $PWD/its_GeometryTGeo.root $ALICEO2_CCDB_LOCALCACHE/ITS/Config/Geometry/snapshot.root
+fi
 [[ -f $PWD/mft_GeometryTGeo.root ]] && mkdir -p $ALICEO2_CCDB_LOCALCACHE/MFT/Config/Geometry && ln -s -f $PWD/mft_GeometryTGeo.root $ALICEO2_CCDB_LOCALCACHE/MFT/Config/Geometry/snapshot.root
 
 # -- RUN THE MC WORKLOAD TO PRODUCE AOD --

MC/run/ANCHOR/tests/test_anchor_2023_apass2_pp.sh

@@ -30,6 +30,8 @@ export SEED=5
 # for pp and 50 events per TF, we launch only 4 workers.
 export NWORKERS=2
 
+export ALIEN_JDL_ANCHOR_SIM_OPTIONS="-gen pythia8 -confKey \"GeometryManagerParam.useParallelWorld=1;GeometryManagerParam.usePwGeoBVH=1;GeometryManagerParam.usePwCaching=1\""
+
 # run the central anchor steering script; this includes
 # * derive timestamp
 # * derive interaction rate