adding calib-workflow

Author: chiarazampolli

prodtests/full-system-test/aggregator-workflow.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+SEVERITY="detail"
+ENABLE_METRICS=1
+source $O2DPG_ROOT/DATA/common/setenv.sh
+source $O2_ROOT/prodtests/full-system-test/workflow-setup.sh
+
+# ---------------------------------------------------------------------------------------------------------------------
+# Set general arguments
+source $O2DPG_ROOT/DATA/common/getCommonArgs.sh
+
+# Set up calibrations
+source $O2DPG_ROOT/DATA/common/setenv_calib.sh
+
+# Adding calibrations
+EXTRA_WORKFLOW=
+
+echo "CALIB_PRIMVTX_MEANVTX = $CALIB_PRIMVTX_MEANVTX" 1>&2
+echo "CALIB_TOF_LHCPHASE = $CALIB_TOF_LHCPHASE" 1>&2
+echo "CALIB_TOF_CHANNELOFFSETS = $CALIB_TOF_CHANNELOFFSETS" 1>&2
+echo "CALIB_TOF_DIAGNOSTICS = $CALIB_TOF_DIAGNOSTICS" 1>&2
+
+# PrimVertex
+if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then
+    EXTRA_WORKFLOW+="o2-calibration-mean-vertex-calibration-workflow $ARGS_ALL | "
+fi
+
+# TOF
+if [[ $CALIB_TOF_LHCPHASE == 1 ]] || [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
+    if [[ $CALIB_TOF_LHCPHASE == 1 ]]; then
+  EXTRA_WORKFLOW+="o2-calibration-tof-calib-workflow $ARGS_ALL --do-lhc-phase --tf-per-slot 10 | "
+    fi
+    if [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
+  EXTRA_WORKFLOW+="o2-calibration-tof-calib-workflow $ARGS_ALL --do-channel-offset --update-at-end-of-run-only --min-entries 8 --range 100000 |"
+    fi
+fi
+if [[ $CALIB_TOF_DIAGNOSTICS == 1 ]]; then
+    EXTRA_WORKFLOW+="o2-calibration-tof-diagnostic-workflow $ARGS_ALL --tf-per-slot 26400 | "
+fi
+
+WORKFLOW="o2-dpl-raw-proxy $ARGS_ALL --proxy-name aggregator-proxy --dataspec \"$CALIBDATASPEC\" --channel-config \"name=aggregator-proxy,method=bind,type=pull,rateLogging=1,transport=zeromq,address=tcp://localhost:30453\" |"
+WORKFLOW+=$EXTRA_WORKFLOW
+WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
+
+if [ $WORKFLOWMODE == "print" ]; then
+  echo Workflow command:
+  echo $WORKFLOW | sed "s/| */|\n/g"
+else
+  # Execute the command we have assembled
+  WORKFLOW+=" --$WORKFLOWMODE"
+  eval $WORKFLOW
+fi

prodtests/full-system-test/calib-workflow.sh

@@ -1,14 +1,22 @@
 #!/bin/bash
 
+# ---------------------------------------------------------------------------------------------------------------------
+# Get this script's directory and load common settings (use zsh first (e.g. on Mac) and fallback on `readlink -f` if zsh is not there)
+MYDIR="$(dirname $(realpath $0))"
+source $O2DPG_ROOT/DATA/common/setenv.sh
+source $O2DPG_ROOT/DATA/common/setenv_calib.sh
+
 if [[ -z "$WORKFLOW" ]] || [[ -z "$MYDIR" ]]; then
   echo This script must be called from the dpl-workflow.sh and not standalone 1>&2
   exit 1
 fi
 
-if [[ $BEAMTYPE != "cosmic" ]]; then
-  has_detector_calib TPC && has_detectors TPC ITS TRD TOF && add_W o2-tpc-scdcalib-interpolation-workflow "$DISABLE_ROOT_OUTPUT --disable-root-input --pipeline $(get_N tpc-track-interpolation TPC REST)" "$ITSMFT_FILES"
-  has_detector_calib ITS && has_detectors ITS && has_detectors_reco ITS && has_detector_matching PRIMVTX && [[ ! -z "$VERTEXING_SOURCES" ]] && add_W o2-calibration-mean-vertex-calibration-workflow
-  has_detector_calib TRD && has_detector ITS TPC TRD && add_W o2-calibration-trd-vdrift-exb
+# specific calibration workflows
+if [[ $CALIB_TPC_SCDCALIB == 1 ]]; then add_W o2-tpc-scdcalib-interpolation-workflow "$DISABLE_ROOT_OUTPUT --disable-root-input --pipeline $(get_N tpc-track-interpolation TPC REST)" "$ITSMFT_FILES"; fi
+
+# output-proxy for aggregator
+if [[ ! -z $CALIBDATASPEC ]]; then
+    WORKFLOW+="o2-dpl-output-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC\" --proxy-channel-name aggregator-proxy --channel-config \"name=aggregator-proxy,method=connect,type=push,transport=zeromq,rateLogging=1,address=tcp://localhost:30453\" | "
 fi
 
 true # everything OK up to this point, so the script should return 0 (it is !=0 already if a has_detector check fails)

prodtests/full-system-test/dpl-workflow.sh

@@ -386,7 +386,10 @@ fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Calibration workflows
-workflow_has_parameter CALIB && { source $MYDIR/calib-workflow.sh; [[ $? != 0 ]] && exit 1; }
+if [[ -z $CALIB_WF ]]; then
+    CALIB_WF=$MYDIR/calib-workflow.sh
+fi
+workflow_has_parameter CALIB && { source $CALIB_WF; [[ $? != 0 ]] && exit 1; }
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Event display