fixes in logic

Author: chiarazampolli

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

@@ -17,9 +17,10 @@ if [[ -z $WORKFLOW_DETECTORS ]]; then echo "WORKFLOW_DETECTORS must be defined"
 
 # CCDB destination for uploads
 [[ -z ${CCDBPATH+x} ]] && CCDBPATH="http://o2-ccdb.internal"
+echo "CCDBPATH = $CCDBPATH" 1>&2
 
 # Adding calibrations
-EXTRA_WORKFLOW=
+EXTRA_WORKFLOW_CALIB=
 
 echo "CALIB_PRIMVTX_MEANVTX = $CALIB_PRIMVTX_MEANVTX" 1>&2
 echo "CALIB_TOF_LHCPHASE = $CALIB_TOF_LHCPHASE" 1>&2
@@ -34,45 +35,45 @@ echo "CALIB_TRD_VDRIFTEXB = $CALIB_TRD_VDRIFTEXB" 1>&2
 
 # PrimVertex
 if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-calibration-mean-vertex-calibration-workflow $ARGS_ALL | "
+    EXTRA_WORKFLOW_CALIB+="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 | "
+  EXTRA_WORKFLOW_CALIB+="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 |"
+  EXTRA_WORKFLOW_CALIB+="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 | "
+    EXTRA_WORKFLOW_CALIB+="o2-calibration-tof-diagnostic-workflow $ARGS_ALL --tf-per-slot 26400 | "
 fi
 
 # TRD
 if [[ $CALIB_TRD_VDRIFTEXB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-calibration-trd-vdrift-exb | "
+    EXTRA_WORKFLOW_CALIB+="o2-calibration-trd-vdrift-exb $ARGS_ALL | "
 fi
 
 # Calo cal
 # EMC
 if [[ $CALIB_EMC_CHANNELCALIB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-calibration-emcal-channel-calib-workflow --calibMode timeCalib | "
+    EXTRA_WORKFLOW_CALIB+="o2-calibration-emcal-channel-calib-workflow --calibMode timeCalib $ARGS_ALL | "
 fi
 
 # PHS
 if [[ $CALIB_PHS_ENERGYCALIB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-phos-calib-workflow --energy | "
+    EXTRA_WORKFLOW_CALIB+="o2-phos-calib-workflow --energy $ARGS_ALL | "
 fi
 if [[ $CALIB_PHS_BADMAPCALIB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-phos-calib-workflow --badmap --mode 0 | "
+    EXTRA_WORKFLOW_CALIB+="o2-phos-calib-workflow --badmap --mode 0 $ARGS_ALL | "
 fi
 if [[ $CALIB_PHS_TURNONCALIB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-phos-calib-workflow --turnon | "
+    EXTRA_WORKFLOW_CALIB+="o2-phos-calib-workflow --turnon |$ARGS_ALL | "
 fi
 if [[ $CALIB_PHS_RUNBYRUNCALIB == 1 ]]; then
-    EXTRA_WORKFLOW+="o2-phos-calib-workflow --runbyrun | "
+    EXTRA_WORKFLOW_CALIB+="o2-phos-calib-workflow --runbyrun $ARGS_ALL | "
 fi
 
 # starting with empty workflow
@@ -86,15 +87,18 @@ if workflow_has_parameters CALIB_PROXIES; then
     fi
 fi
 
-WORKFLOW+=$EXTRA_WORKFLOW
-if [[ $CCDBPATH != "none" ]]; then WORKFLOW+="o2-calibration-ccdb-populator-workflow --ccdb-path $CCDBPATH | "; fi
-WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT -b"
+WORKFLOW+=$EXTRA_WORKFLOW_CALIB
 
-if [ $WORKFLOWMODE == "print" ]; then
-  echo Workflow command:
+if [[ $CCDBPATH != "none" ]]; then WORKFLOW+="o2-calibration-ccdb-populator-workflow --ccdb-path $CCDBPATH $ARGS_ALL | "; fi
+
+if workflow_has_parameters CALIB_PROXIES; then
+    WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT -b"
+    if [ $WORKFLOWMODE == "print" ]; then
+  echo Workflow command adding aggregator:
   echo $WORKFLOW | sed "s/| */|\n/g"
-else
+    else
   # Execute the command we have assembled
   WORKFLOW+=" --$WORKFLOWMODE"
   eval $WORKFLOW
+    fi
 fi

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

@@ -386,8 +386,8 @@ fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Calibration workflows
-workflow_has_parameter CALIB && { source ${CALIB_WF:-$MYDIR/calib-workflow.sh}; [[ $? != 0 ]] && exit 1; }
-workflow_has_parameter CALIB && ! workflow_has_parameters CALIB_PROXIES && { source ${CALIB_AGGREGATOR_WF:-$MYDIR/aggregator-workflow.sh}; [[ $? != 0 ]] && exit 1; }
+workflow_has_parameter CALIB && { echo "sourcing calib"; source ${CALIB_WF:-$MYDIR/calib-workflow.sh}; [[ $? != 0 ]] && exit 1; }
+workflow_has_parameter CALIB && ! workflow_has_parameters CALIB_PROXIES && { echo "sourcing aggregator"; source ${CALIB_AGGREGATOR_WF:-$MYDIR/aggregator-workflow.sh}; [[ $? != 0 ]] && exit 1; }
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Event display