adapt scripts for new digital scan run type

Author: iravasen

DATA/production/calib/its-threshold-aggregator.sh

@@ -10,7 +10,7 @@ PROXY_INSPEC="tunestring:ITS/TSTR;runtype:ITS/RUNT;fittype:ITS/FITT;scantype:ITS
 
 CCDBPATH1=""
 CCDBPATH2=""
-if [ $RUNTYPE_ITS == "tuning" ] || [ $RUNTYPE_ITS == "digital" ] || [ $RUNTYPE_ITS == "tuningbb" ]; then
+if [[ $RUNTYPE_ITS == "tuning" ]] || [[ $RUNTYPE_ITS == *digital* ]] || [[ $RUNTYPE_ITS == "tuningbb" ]]; then
   CCDBPATH1="$DCSCCDBSERVER_PERS"
   CCDBPATH2="http://o2-ccdb.internal"
 else 
@@ -26,7 +26,7 @@ WORKFLOW=
 add_W o2-dpl-raw-proxy "--exit-transition-timeout 20 --proxy-name its-thr-input-proxy --dataspec \"$PROXY_INSPEC\" --network-interface ib0 --channel-config \"name=its-thr-input-proxy,method=bind,type=pull,rateLogging=0,transport=zeromq\"" "" 0
 add_W o2-its-threshold-aggregator-workflow "-b" "" 0
 add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDBPATH1\" --sspec-min 0 --sspec-max 0 --name-extention dcs"
-if [ $RUNTYPE_ITS == "digital" ]; then
+if [[ $RUNTYPE_ITS == *digital* ]]; then
   add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDBPATH2\" --sspec-min 1 --sspec-max 1"
 fi
 

DATA/production/calib/its-threshold-processing.sh

@@ -14,15 +14,19 @@ PROXY_OUTSPEC="tunestring:ITS/TSTR;runtype:ITS/RUNT;fittype:ITS/FITT;scantype:IT
 
 CHIPMODBASE=5
 NDECODERS=6
+ADDITIONAL_OPTIONS_DEC=""
+ADDITIONAL_OPTIONS_CAL=""
 if [ $RUNTYPE_ITS == "digital" ]; then
   CHIPMODBASE=10
 fi
+if [ $RUNTYPE_ITS == "digitalnomask" ]; then
+  CHIPMODBASE=10
+  ADDITIONAL_OPTIONS_CAL="--ninj 5"
+fi
 if [ $RUNTYPE_ITS == "thrfull" ]; then
   CHIPMODBASE=20
   NDECODERS=10
 fi
-ADDITIONAL_OPTIONS_DEC=""
-ADDITIONAL_OPTIONS_CAL=""
 if [ $RUNTYPE_ITS == "tuningbb" ]; then
   ADDITIONAL_OPTIONS_CAL="--min-vcasn 30 --max-vcasn 130"
 fi

DATA/production/standalone-calibration.desc

@@ -18,6 +18,8 @@ ITS-thr-full: "O2PDPSuite" reco,80,80,"RUNTYPE_ITS=thrfull production/calib/its-
 
 ITS-digital: "O2PDPSuite" reco,40,40,"RUNTYPE_ITS=digital production/calib/its-threshold-processing.sh" calib,40,"RUNTYPE_ITS=digital production/calib/its-threshold-aggregator.sh"
 
+ITS-digital-no-mask: "O2PDPSuite" reco,40,40,"RUNTYPE_ITS=digitalnomask production/calib/its-threshold-processing.sh" calib,40,"RUNTYPE_ITS=digitalnomask production/calib/its-threshold-aggregator.sh"
+
 ITS-pulselength: "O2PDPSuite" reco,40,40,"RUNTYPE_ITS=pulselength production/calib/its-threshold-processing.sh" calib,40,"RUNTYPE_ITS=pulselength production/calib/its-threshold-aggregator.sh"
 
 ITS-tot-1row: "O2PDPSuite" reco,40,40,"RUNTYPE_ITS=tot1row production/calib/its-threshold-processing.sh" calib,40,"RUNTYPE_ITS=tot1row production/calib/its-threshold-aggregator.sh"