Merge branch 'AliceO2Group:master' into tpc-laser-raw-filter

rmunzer · Mar 26, 2024 · c536bb7 · c536bb7
2 parents 7eea1cd + bb29737
commit c536bb7
Show file tree

Hide file tree

Showing 45 changed files with 1,469 additions and 259 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -17,11 +17,15 @@
 /DATA/testing/detectors/TRD @martenole
 /DATA/testing/detectors/ZDC
 
-/MC @sawenzel @chiarazampolli @gconesab @benedikt-voelkel
+/MC @sawenzel @chiarazampolli @benedikt-voelkel
 
 # PWG experts
 /MC/*/PWGHF @AliceO2Group/reviewers-pwg-hf @sawenzel @chiarazampolli @benedikt-voelkel
 /MC/*/PWGLF @AliceO2Group/reviewers-pwg-lf @sawenzel @chiarazampolli @benedikt-voelkel
 /MC/*/PWGEM @AliceO2Group/reviewers-pwg-em @sawenzel @chiarazampolli @benedikt-voelkel
+/MC/*/PWGGAJE @AliceO2Group/reviewers-pwg-je @sawenzel @chiarazampolli @benedikt-voelkel
+/MC/*/PWGCF @AliceO2Group/reviewers-pwg-cf @sawenzel @chiarazampolli @benedikt-voelkel
+/MC/*/PWGDQ @AliceO2Group/reviewers-pwg-dq @sawenzel @chiarazampolli @benedikt-voelkel
+/MC/*/PWGUD @AliceO2Group/reviewers-pwg-ud @sawenzel @chiarazampolli @benedikt-voelkel
 
-/RelVal @sawenzel @chiarazampolli @gconesab @benedikt-voelkel
+/RelVal @sawenzel @chiarazampolli @benedikt-voelkel
diff --git a/DATA/common/setenv_calib.sh b/DATA/common/setenv_calib.sh
@@ -208,6 +208,7 @@ fi
 
 
 if [[ "0${GEN_TOPO_VERBOSE:-}" == "01" ]]; then
+  echo "CALIB_RCT_UPDATER = ${CALIB_RCT_UPDATER:-}" 1>&2
   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
@@ -239,6 +240,8 @@ fi
 
 # define spec for proxy for TF-based outputs from BARREL
 if [[ -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
+  # RCT updater
+  if [[ ${CALIB_RCT_UPDATER:-} == 1 ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "calibRCT:CTD/DONE/0"; fi
   # prim vtx
   if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "pvtx:GLO/PVTX/0"; fi
 

diff --git a/DATA/production/calib/tpc-laser-filter.sh b/DATA/production/calib/tpc-laser-filter.sh
@@ -67,11 +67,12 @@ o2-dpl-raw-proxy ${ARGS_ALL} \
     | o2-tpc-reco-workflow ${ARGS_ALL}  ${TPC_CORR_SCALING:-} \
     --input-type digitizer  \
     --output-type "tracks,disable-writer,clusters" \
+    --disable-ctp-lumi-request \
     --disable-mc \
     --pipeline tpc-zsEncoder:20,tpc-tracker:8 \
     ${GPU_CONFIG} \
     --condition-remap "file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPECS;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPMagField;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser=TPC/Calib/LaserTracks" \
-    --configKeyValues "${ARGS_ALL_CONFIG};align-geom.mDetectors=none;GPU_global.deviceType=$GPUTYPE;GPU_proc.tpcIncreasedMinClustersPerRow=500000;GPU_proc.ignoreNonFatalGPUErrors=1;$GPU_CONFIG_KEY;GPU_global.tpcTriggeredMode=1;GPU_rec_tpc.clusterError2AdditionalY=0.1;GPU_rec_tpc.clusterError2AdditionalZ=0.15;GPU_rec_tpc.clustersShiftTimebinsClusterizer=35;GPU_proc.memoryScalingFactor=2" \
+    --configKeyValues "${ARGS_ALL_CONFIG};align-geom.mDetectors=none;GPU_global.deviceType=$GPUTYPE;GPU_proc.tpcIncreasedMinClustersPerRow=500000;GPU_proc.ignoreNonFatalGPUErrors=1;$GPU_CONFIG_KEY;GPU_global.tpcTriggeredMode=1;GPU_rec_tpc.clusterError2AdditionalY=0.1;GPU_rec_tpc.clusterError2AdditionalZ=0.15;GPU_rec_tpc.clustersShiftTimebinsClusterizer=35;GPU_proc.memoryScalingFactor=2;GPU_proc_param.tpcTriggerHandling=0" \
     | o2-tpc-laser-track-filter ${ARGS_ALL}  \
     | o2-dpl-output-proxy ${ARGS_ALL} \
     --dataspec "$PROXY_OUTSPEC" \

diff --git a/DATA/production/qc-async/cpv.json b/DATA/production/qc-async/cpv.json
@@ -3,23 +3,14 @@
     "config": {
       "database": {
         "implementation": "CCDB",
-        "host": "alio2-cr1-hv-qcdb1.cern.ch:8083",
-        "username": "not_applicable",
-        "password": "not_applicable",
-        "name": "not_applicable"
-      },
-      "Activity": {
-        "number": "42",
-        "type": "2"
+        "host": "ccdb-test.cern.ch:8080"
       },
+      "Activity": {},
       "monitoring": {
-        "url": "influxdb-unix:///tmp/telegraf.sock"
-      },
-      "consul": {
-          "url": "alio2-cr1-hv-aliecs:8500"
+        "url": "infologger:///debug?qc"
       },
       "conditionDB": {
-        "url": "http://localhost:8084/"
+        "url": "ccdb-test.cern.ch:8080"
       }
     },
     "tasks": {
@@ -30,7 +21,6 @@
         "moduleName": "QcCPV",
         "detectorName": "CPV",
         "cycleDurationSeconds": "120",
-        "maxNumberCycles": "-1",
         "dataSource": {
           "type": "direct",
           "query": "clusters:CPV/CLUSTERS/0;ctrigrec:CPV/CLUSTERTRIGRECS/0"
@@ -40,9 +30,7 @@
           "ccdbCheckInterval": "1000"
         }
       }
-    },
-    "dataSamplingPolicies": [
-
-    ]
-  }
-}
+    }
+  },
+  "dataSamplingPolicies": []
+}
diff --git a/DATA/production/qc-async/its.json b/DATA/production/qc-async/its.json
@@ -44,17 +44,7 @@
 	  "dicttimestamp" : "0",
           "publishDetailedSummary": "1",
 	  "publishSummary1D": "0"
-        },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "false",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
-        }
+        }	
       },
       "ITSTracks": {
         "active": "true",
@@ -80,7 +70,8 @@
 	  "nBCbins" : "103",
 	  "dicttimestamp" : 0,
 	  "doNorm": "1",
-          "InvMasses" : "1"
+          "InvMasses" : "1",
+	  "publishMore": "0"
         }
       }
     },

diff --git a/DATA/production/qc-async/mch-tracks.json b/DATA/production/qc-async/mch-tracks.json
@@ -33,7 +33,7 @@
                 "maxNumberCycles": "-1",
                 "dataSource": {
                     "type": "direct",
-                    "query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS"
+                    "query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/TRACKDIGITS"
                 },
                 "taskParameters": {
                     "maxTracksPerTF": "600",

diff --git a/DATA/production/qc-async/mft.json b/DATA/production/qc-async/mft.json
@@ -37,21 +37,12 @@
         },
         "movingWindows": [ "mClustersROFSize" ],
         "taskParameters": {
+          "onlineQC" : "0",
           "maxClusterROFSize" : "50000",
           "maxDuration" : "60000",
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
-        },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
-        }
+        }	
       },
       "MFTTracks": {
         "active": "true",
@@ -74,6 +65,16 @@
           "MaxClusterROFSize": "50000",
           "MaxDuration": "60000",
           "TimeBinSize": "0.1"
+        },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
         }
       }
     },

diff --git a/DATA/production/qc-async/phs.json b/DATA/production/qc-async/phs.json
@@ -3,23 +3,14 @@
     "config": {
       "database": {
         "implementation": "CCDB",
-        "host": "ali-qcdb.cern.ch:8083",
-        "username": "not_applicable",
-        "password": "not_applicable",
-        "name": "not_applicable"
-      },
-      "Activity": {
-        "number": "42",
-        "type": "2"
+        "host": "ccdb-test.cern.ch:8080"
       },
+      "Activity": {},
       "monitoring": {
-        "url": "influxdb-unix:///tmp/telegraf.sock"
-      },
-      "consul": {
-        "url": ""
+        "url": "infologger:///debug?qc"
       },
       "conditionDB": {
-        "url": "http://localhost:8084"
+        "url": "ccdb-test.cern.ch:8080"
       }
     },
     "tasks": {
@@ -30,18 +21,13 @@
         "moduleName": "QcPHOS",
         "detectorName": "PHS",
         "cycleDurationSeconds": "100",
-        "maxNumberCycles": "-1",
         "dataSource": {
           "type": "direct",
           "query": "clusters:PHS/CLUSTERS/0;clustertr:PHS/CLUSTERTRIGREC/0"
         },
-        "taskParameters": {
-          "": ""
-        }
+        "taskParameters": {}
       }
-    },
-    "dataSamplingPolicies": [
-
-    ]
-  }
-}
+    }
+  },
+  "dataSamplingPolicies": []
+}
diff --git a/DATA/production/qc-async/tpc.json b/DATA/production/qc-async/tpc.json
@@ -33,7 +33,8 @@
         "cycleDurationSeconds": "300",
         "dataSource": {
           "type": "dataSamplingPolicy",
-          "name": "tpc-clusters"
+          "name": "tpc-clusters",
+          "query": "inputClusters:TPC/CLUSTERNATIVE"
         },
         "taskParameters": {
           "mergeableOutput": "true",
@@ -65,7 +66,8 @@
           "cutMinpTPC": "0.05",
           "cutMaxpTPC": "20.",
           "cutMinpTPCMIPs": "0.45",
-          "cutMaxpTPCMIPs": "0.55"
+          "cutMaxpTPCMIPs": "0.55",
+          "turnOffHistosForAsync": "true"
        }
       },
       "TPCTrackClusters": {
@@ -97,14 +99,16 @@
         "movingWindows" : [ "h2DNClustersEta" ],
         "dataSource": {
           "type": "dataSamplingPolicy",
-          "name": "tpc-tracks"
+          "name": "tpc-tracks",
+          "query": "inputTracks:TPC/TRACKS/0"
         },
         "taskParameters": {
           "cutAbsEta": "1.",
           "cutMinNCluster": "60",
           "cutMindEdxTot": "20.",
           "samplingFractionDCAr": "0.1",
-          "cutPtForDCAr": "1.5"
+          "cutPtForDCAr": "1.5",
+          "turnOffHistosForAsync": "true"
         },
 	"grpGeomRequest" : {
           "geomRequest": "None",

diff --git a/DATA/production/qc-sync/its.json b/DATA/production/qc-sync/its.json
@@ -46,17 +46,7 @@
           "publishSummary1D": "0",
 	  "publishDetailedSummary": "0"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "false",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
-         },
-          "localMachines": [
+        "localMachines": [
           "localhost", "epn"
         ],
         "localControl": "odc",

diff --git a/DATA/production/qc-sync/mft-full-no-tracks.json b/DATA/production/qc-sync/mft-full-no-tracks.json
@@ -58,6 +58,16 @@
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines" : [ "flp" ], 
         "remoteMachine": "any",
@@ -75,21 +85,12 @@
           "name": "mft-clusters"
         },
         "taskParameters" : {
+          "onlineQC" : "1",
           "maxClusterROFSize" : "50000",
           "maxDuration" : "60000",
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-            "needPropagatorD":  "false"
-	},
         "location": "local",
         "localMachines": [
           "epn", "localhost"