[EMCAL-565] Enable EMCAL bad channel calibration in aggregator workflow

Split CALIB_EMC_CHANNELCALIB into CALIB_EMC_BADCHANNELCALIB and
CALIB_EMC_TIMECALIB in order to steer both calibrators separately.

Author: mfasDa

DATA/common/setenv_calib.sh

@@ -54,7 +54,8 @@ if [[ $BEAMTYPE != "cosmic" ]] || [[ $FORCECALIBRATIONS == 1 ]] ; then
 
   # calibrations for EMC
   if has_detector_calib EMC && has_detector_reco EMC; then
-    if [[ -z ${CALIB_EMC_CHANNELCALIB+x} ]]; then CALIB_EMC_CHANNELCALIB=1; fi
+    if [[ -z ${CALIB_EMC_BADCHANNELCALIB+x} ]]; then CALIB_EMC_BADCHANNELCALIB=1; fi
+    if [[ -z ${CALIB_EMC_TIMECALIB+x} ]]; then CALIB_EMC_TIMECALIB=1; fi
   fi
 
   # calibrations for PHS
@@ -80,7 +81,8 @@ fi
 [[ -z ${CALIB_TPC_RESPADGAIN} ]] && CALIB_TPC_RESPADGAIN=0
 [[ -z ${CALIB_TPC_IDC} ]] && CALIB_TPC_IDC=0
 [[ -z ${CALIB_TRD_VDRIFTEXB} ]] && CALIB_TRD_VDRIFTEXB=0
-[[ -z ${CALIB_EMC_CHANNELCALIB} ]] && CALIB_EMC_CHANNELCALIB=0
+[[ -z ${CALIB_EMC_BADCHANNELCALIB} ]] && CALIB_EMC_BADCHANNELCALIB=0
+[[ -z ${CALIB_EMC_TIMECALIB} ]] && CALIB_EMC_TIMECALIB=0
 [[ -z ${CALIB_PHS_ENERGYCALIB} ]] && CALIB_PHS_ENERGYCALIB=0
 [[ -z ${CALIB_PHS_BADMAPCALIB} ]] && CALIB_PHS_BADMAPCALIB=0
 [[ -z ${CALIB_PHS_TURNONCALIB} ]] && CALIB_PHS_TURNONCALIB=0
@@ -92,7 +94,8 @@ if [[ "0$GEN_TOPO_VERBOSE" == "01" ]]; then
   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
-  echo "CALIB_EMC_CHANNELCALIB = $CALIB_EMC_CHANNELCALIB" 1>&2
+  echo "CALIB_EMC_BADCHANNELCALIB = $CALIB_EMC_BADCHANNELCALIB" 1>&2
+  echo "CALIB_EMC_TIMECALIB = $CALIB_EMC_TIMECALIB" 1>&2
   echo "CALIB_PHS_ENERGYCALIB = $CALIB_PHS_ENERGYCALIB" 1>&2
   echo "CALIB_PHS_BADMAPCALIB = $CALIB_PHS_BADMAPCALIB" 1>&2
   echo "CALIB_PHS_TURNONCALIB = $CALIB_PHS_TURNONCALIB" 1>&2
@@ -145,7 +148,7 @@ fi
 # define spec for proxy for TF-based outputs from CALO
 if [[ -z $CALIBDATASPEC_CALO_TF ]]; then
   # EMC
-  if [[ $CALIB_EMC_CHANNELCALIB == 1 ]]; then
+  if [[ $CALIB_EMC_BADCHANNELCALIB == 1 ]] || [[ $CALIB_EMC_TIMECALIB == 1 ]]; then
     add_semicolon_separated CALIBDATASPEC_CALO_TF "cellsEMC:EMC/CELLS/0"
     add_semicolon_separated CALIBDATASPEC_CALO_TF "cellsTrgREMC:EMC/CELLSTRGR/0"
   fi

DATA/production/configurations/2022/LHC22f/apass1_TPCcalib/setenv_extra.sh

@@ -138,7 +138,8 @@ export CALIB_TOF_DIAGNOSTICS=0
 export CALIB_TPC_TIMEGAIN=0
 export CALIB_TPC_RESPADGAIN=0
 export CALIB_TRD_VDRIFTEXB=0
-export CALIB_EMC_CHANNELCALIB=0
+export CALIB_EMC_BADCHANNELCALIB=0
+export CALIB_EMC_TIMECALIB=0
 export CALIB_PHS_ENERGYCALIB=0
 export CALIB_PHS_BADMAPCALIB=0
 export CALIB_PHS_TURNONCALIB=0