ZDC: Add configuration file PbPb, modify configuration file pp, add s… (#1659)

* ZDC: Add configuration file PbPb, modify configuration file pp, add selection configuration file with Beamtype, reduce bin histograms.

* ZDC: Add configuration file PbPb

(cherry picked from commit 1af58ff)

Author: cpuggion84

DATA/production/qc-async/zdc.json

@@ -9,8 +9,6 @@
         "name": "not_applicable"
       },
       "Activity": {
-        "number": "42",
-        "type": "2"
       },
       "monitoring": {
         "url": "influxdb-unix:///tmp/telegraf.sock"
@@ -37,15 +35,23 @@
         },
         "taskParameters": {
           "ADC": "3025;-100;12000",
+          "ADCZEM": "3025;-100;12000",
           "ADCH": "1100;-100;1000",
-          "TDCT": "2400;-25;25",
+          "TDCT": "2400;-13.5;11.45",
           "TDCA": "2050;-0.5;4099.5",
-	  "TDCAH": "2000;-0.5;3999.5",
-          "ADCSUMvsTC": "605;-100;12000;605;-100;12000",
-          "ADCvsTDCT": "240;-25;25;605;-100;12000",
-          "TDCDIFF": "240;-25;25;240;-25;25",
-          "TDCAvsTDCT": "480;-25;25;500;-1;3999",
-	  "TDCAvsTDCA": "500;-1;3999;500;-1;3999",
+	  "TDCAH": "520;-20;500",
+	  "TDCAZEM": "2050;-0.5;4099.5",
+          "ADCSUMvsTC": "121;-100;12000;121;-100;12000",
+          "ADCZEMvsADCZEM": "121;-100;12000;121;-100;12000",
+          "ADCZEMvsTC": "121;-100;12000;121;-100;12000",
+          "ADCvsTDCT": "120;-13.5;11.45;121;-100;12000",
+          "ADCZEMvsTDCT": "120;-13.5;11.45;121;-100;12000",
+          "TDCDIFF": "240;-27;22.90;240;-27;22.90",
+          "TDCAvsTDCT": "120;-13.5;11.45;125;-1;3999",
+	  "TDCAZEMvsTDCT": "120;-13.5;11.45;125;-1;3999", 
+          "TDCAvsTDCA": "125;-1;3999;125;-1;3999",
+          "TDCAZEMvsTDCAZEM": "125;-1;3999;125;-1;3999",
+          "TDCAZEMvsTDCA": "125;-1;3999;125;-1;3999",
           "CENTR_ZNA": "200;-2;2;200;-2;2",
           "CENTR_ZNC": "200;-2;2;200;-2;2",
           "CENTR_ZPA": "2240;0;22.4",
@@ -55,3 +61,4 @@
     }
   }
 }
+

DATA/production/qc-async/zdcPbPb.json

@@ -0,0 +1,64 @@
+{
+  "qc": {
+    "config": {
+      "database": {
+        "implementation": "CCDB",
+        "host": "alio2-cr1-hv-qcdb1.cern.ch:8083",
+        "username": "not_applicable",
+        "password": "not_applicable",
+        "name": "not_applicable"
+      },
+      "Activity": {
+      },
+      "monitoring": {
+        "url": "influxdb-unix:///tmp/telegraf.sock"
+      },
+      "consul": {
+        "url": "http://ali-consul.cern.ch:8500"
+      },
+      "conditionDB": {
+        "url": "http://o2-ccdb.internal"
+      }
+    },
+    "tasks": {
+      "ZDCRec": {
+        "active": "true",
+	"taskName": "Rec",
+        "className": "o2::quality_control_modules::zdc::ZDCRecDataTask",
+        "moduleName": "QcZDC",
+        "detectorName": "ZDC",
+        "cycleDurationSeconds": "60",
+        "maxNumberCycles": "-1",
+        "dataSource": {
+          "type": "direct",
+          "query": "zdc-bcrec:ZDC/BCREC/0;zdc-energyrec:ZDC/ENERGY/0;zdc-tdcrec:ZDC/TDCDATA/0;zdc-inforec:ZDC/INFO/0"
+        },
+        "taskParameters": {
+          "ADC": "3600, -3;357",
+          "ADCZEM": "3025;-100;12000",
+          "ADCH": "2300;-3;20",
+          "TDCT": "2400;-13.5;11.45",
+          "TDCA": "3600, -3;357",
+	  "TDCAZEM": "2050;-0.5;4099.5",
+          "TDCAH": "2300,-3,20",
+          "ADCSUMvsTC": "144;-3;357;144;-3;357",
+          "ADCZEMvsADCZEM": "121;-100;12000;121;-100;12000",
+          "ADCZEMvsTC": "144;-3;357;121;-100;12000",
+          "ADCvsTDCT": "120;-13.5;11.45;144;-3;357",
+          "ADCZEMvsTDCT": "120;-13.5;11.45;121;-100;12000",
+          "TDCDIFF": "240;-27;22.90;240;-27;22.90",
+          "TDCAvsTDCT": "120;-13.5;11.45;144;-3;357",
+	  "TDCAZEMvsTDCT": "120;-13.5;11.45;125;-1;3999", 
+          "TDCAvsTDCA": "144;-3;357;144;-3;357",
+          "TDCAZEMvsTDCAZEM": "125;-1;3999;125;-1;3999",
+          "TDCAZEMvsTDCA": "144;-3;357;125;-1;3999",
+          "CENTR_ZNA": "200;-2;2;200;-2;2",
+          "CENTR_ZNC": "200;-2;2;200;-2;2",
+          "CENTR_ZPA": "2240;0;22.4",
+          "CENTR_ZPC": "2240;-22.4;0"
+        }
+      }
+    }
+  }
+}
+

DATA/production/qc-workflow.sh

@@ -173,14 +173,20 @@ elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
     [[ -z "${QC_JSON_FV0:-}" ]] && QC_JSON_FV0=$O2DPG_ROOT/DATA/production/qc-async/fv0.json
     [[ -z "${QC_JSON_FDD:-}" ]] && QC_JSON_FDD=$O2DPG_ROOT/DATA/production/qc-async/fdd.json
     [[ -z "${QC_JSON_MID:-}" ]] && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-async/mid.json
-    [[ -z "${QC_JSON_ZDC:-}" ]] && has_processing_step ZDC_RECO && QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdc.json
     if [[ -z "${QC_JSON_EMC:-}" ]]; then
       if [[ "$BEAMTYPE" == "PbPb" ]]; then
         QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-async/emc_PbPb.json
       else
         QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-async/emc.json
       fi
     fi
+    if [[ -z "${QC_JSON_ZDC:-}" ]] && has_processing_step ZDC_RECO; then
+      if [[ "$BEAMTYPE" == "PbPb" ]]; then
+        QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdcPbPb.json
+      else
+        QC_JSON_ZDC=$O2DPG_ROOT/DATA/production/qc-async/zdc.json
+      fi
+    fi
     if has_detector_qc MCH && [[ -z "${QC_JSON_MCH:-}" ]]; then
       add_QC_JSON MCH_DIGITS $O2DPG_ROOT/DATA/production/qc-async/mch-digits.json
       if has_processing_step "MCH_RECO"; then