Merge branch 'AliceO2Group:master' into master

mbroz84 · web-flow · commit 401663023fb8 · 2024-10-09T13:17:43.000+02:00
diff --git a/DATA/common/getCommonArgs.sh b/DATA/common/getCommonArgs.sh
@@ -13,7 +13,7 @@ ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segm
 ARGS_ALL_CONFIG="keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null;${ALL_EXTRA_CONFIG:-}"
 if [[ $EPNSYNCMODE == 1 ]]; then
   ARGS_ALL+=" --infologger-severity $INFOLOGGER_SEVERITY"
-  ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock --resources-monitoring 15"
+  ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock --resources-monitoring ${GEN_TOPO_RESOURCE_MONITORING:-15}"
   ARGS_ALL_CONFIG+="NameConf.mCCDBServer=$GEN_TOPO_EPN_CCDB_SERVER;"
   export DPL_CONDITION_BACKEND=$GEN_TOPO_EPN_CCDB_SERVER
   [[ -z ${O2_DPL_DEPLOYMENT_MODE:-} ]] && O2_DPL_DEPLOYMENT_MODE=OnlineECS
diff --git a/DATA/production/qc-async/itstpctof.json b/DATA/production/qc-async/itstpctof.json
@@ -29,13 +29,14 @@
         "className" : "o2::quality_control_modules::tof::TOFMatchedTracks",
         "moduleName" : "QcTOF",
         "detectorName" : "TOF",
-        "cycleDurationSeconds" : "60",
+        "cycleDurationSeconds" : "300",
         "maxNumberCycles" : "-1",
         "dataSource" : {
           "type" : "direct",
           "query_comment" : "checking every matched track",
           "query" : "matchITSTPCTOF:TOF/MTC_ITSTPC/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS/0;trackTPCClRefs:TPC/CLUSREFS/0;tofcluster:TOF/CLUSTERS/0"
         },
+	"movingWindows" : [ "mEffPt_ITSTPC-ITSTPCTRD" ],
         "taskParameters" : {
           "GID" : "ITS-TPC,TPC,ITS-TPC-TOF,TPC-TOF",
           "verbose" : "false",
diff --git a/DATA/production/qc-async/itstpctofwtrd.json b/DATA/production/qc-async/itstpctofwtrd.json
@@ -29,14 +29,15 @@
         "className" : "o2::quality_control_modules::tof::TOFMatchedTracks",
         "moduleName" : "QcTOF",
         "detectorName" : "TOF",
-        "cycleDurationSeconds" : "60",
+        "cycleDurationSeconds" : "300",
         "maxNumberCycles" : "-1",
         "dataSource" : {
           "type" : "direct",
           "query_comment" : "checking every matched track",
           "query" : "tofcluster:TOF/CLUSTERS/0;trackTPC:TPC/TRACKS/0;trackTPCClRefs:TPC/CLUSREFS/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;matchITSTPCTOF:TOF/MTC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0;trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0;trackTPCTRD:TRD/MATCH_TPC/0;trigTPCTRD:TRD/TRGREC_TPC/0;matchTPCTRDTOF:TOF/MTC_TPCTRD/0"
         },
-        "taskParameters" : {
+       	"movingWindows" : [ "mEffPt_ITSTPC-ITSTPCTRD" ],
+	"taskParameters" : {
           "GID" : "TPC,TPC-TOF,ITS-TPC,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,TPC-TRD,TPC-TRD-TOF",
           "verbose" : "false",
           "minPtCut" : "0.1f",
diff --git a/DATA/production/qc-async/pidft0tof.json b/DATA/production/qc-async/pidft0tof.json
@@ -36,13 +36,14 @@
                 "taskName": "PID",
                 "moduleName": "QcTOF",
                 "detectorName": "TOF",
-                "cycleDurationSeconds": "10",
+                "cycleDurationSeconds": "300",
                 "maxNumberCycles": "-1",
                 "dataSource": {
                     "type": "direct",
                     "query_comment": "checking every matched track",
                     "query": "matchITSTPCTOF:TOF/MTC_ITSTPC/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS/0;trackTPCClRefs:TPC/CLUSREFS/0;tofcluster:TOF/CLUSTERS/0;recpoints:FT0/RECPOINTS/0"
                 },
+		"movingWindows" : [ "EvTimeTOF", "DeltaEvTimeTOFVsFT0AC" ],
                 "taskParameters": {
                     "GID": "ITS-TPC,ITS-TPC-TOF,TPC,TPC-TOF",
                     "verbose": "false",
diff --git a/DATA/production/qc-async/pidft0tofwtrd.json b/DATA/production/qc-async/pidft0tofwtrd.json
@@ -36,13 +36,14 @@
                 "className": "o2::quality_control_modules::pid::TaskFT0TOF",
                 "moduleName": "QcTOF",
                 "detectorName": "TOF",
-                "cycleDurationSeconds": "10",
+                "cycleDurationSeconds": "300",
                 "maxNumberCycles": "-1",
                 "dataSource": {
                     "type": "direct",
                     "query_comment": "checking every matched track",
                     "query" : "tofcluster:TOF/CLUSTERS/0;recpoints:FT0/RECPOINTS/0;trackTPC:TPC/TRACKS/0;trackTPCClRefs:TPC/CLUSREFS/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;matchITSTPCTOF:TOF/MTC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0;trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0;trackTPCTRD:TRD/MATCH_TPC/0;trigTPCTRD:TRD/TRGREC_TPC/0;matchTPCTRDTOF:TOF/MTC_TPCTRD/0"
                 },
+		"movingWindows" : [ "EvTimeTOF", "DeltaEvTimeTOFVsFT0AC" ],
                 "taskParameters": {
                     "GID" : "TPC,TPC-TOF,ITS-TPC,ITS-TPC-TOF,ITS-TPC-TRD,ITS-TPC-TRD-TOF,TPC-TRD,TPC-TRD-TOF",
                     "verbose": "false",
diff --git a/DATA/production/qc-async/pidtof.json b/DATA/production/qc-async/pidtof.json
@@ -36,14 +36,15 @@
                 "className": "o2::quality_control_modules::pid::TaskFT0TOF",
                 "moduleName": "QcTOF",
                 "detectorName": "TOF",
-                "cycleDurationSeconds": "10",
+                "cycleDurationSeconds": "300",
                 "maxNumberCycles": "-1",
                 "dataSource": {
                     "type": "direct",
                     "query_comment": "checking every matched track",
                     "query": "matchITSTPCTOF:TOF/MTC_ITSTPC/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS/0;trackTPCClRefs:TPC/CLUSREFS/0;tofcluster:TOF/CLUSTERS/0"
                 },
-                "taskParameters": {
+                "movingWindows" : [ "EvTimeTOF", "DeltaEvTimeTOFVsFT0AC" ],
+		"taskParameters": {
                     "GID": "ITS-TPC,ITS-TPC-TOF,TPC,TPC-TOF",
                     "verbose": "false",
                     "minPtCut": "0.3f",
diff --git a/DATA/production/qc-async/tof.json b/DATA/production/qc-async/tof.json
@@ -29,13 +29,14 @@
         "className": "o2::quality_control_modules::tof::TaskDigits",
         "moduleName": "QcTOF",
         "detectorName": "TOF",
-        "cycleDurationSeconds": "60",
+        "cycleDurationSeconds": "300",
         "maxNumberCycles": "-1",
         "dataSource": {
           "type": "direct",
           "query": "tofdigits:TOF/DIGITS/0;readoutwin:TOF/READOUTWINDOW/0;patterns:TOF/PATTERNS;diafreq:TOF/DIAFREQ/0;channelCalib:TOF/CHCALIB/0?lifetime=condition&ccdb-path=TOF/Calib/ChannelCalib;lhcPhase:TOF/LHCP/0?lifetime=condition&ccdb-path=TOF/Calib/LHCphase",
           "query_comment" : "100% sampling"
         },
+	"movingWindows" : [ "DecodingErrors", "HitMap", "OrbitVsCrate" ],
         "taskParameters": {
           "Diagnostic": "true",
           "PerChannel": "True",
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap3.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap3.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(3,2)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap4.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap4.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(4,2)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap5.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap5.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(5,2)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap6.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap6.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(6,2)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap7.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyForcedDecay_Gap7.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(7,2)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap3.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap3.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyNoForcedDecays(3,3)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap4.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap4.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyNoForcedDecays(4,3)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap5.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap5.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyNoForcedDecays(5,3)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap6.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap6.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyNoForcedDecays(6,3)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap7.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_BeautyNoForcedDecay_Gap7.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyNoForcedDecays(7,3)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap3.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap3.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredCharmLepton(3,1)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap4.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap4.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredCharmLepton(4,1)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap5.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap5.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredCharmLepton(5,1)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap6.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap6.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredCharmLepton(6,1)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap7.ini b/MC/config/PWGEM/ini/GeneratorHFGapTriggered_Charm_Gap7.ini
@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredCharmLepton(7,1)
 
 [GeneratorPythia8]
 config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg
+includePartonEvent = true
diff --git a/MC/config/PWGUD/external/generator/GeneratorStarlight.C b/MC/config/PWGUD/external/generator/GeneratorStarlight.C
@@ -249,7 +249,7 @@ class GeneratorStarlight_class : public Generator
 				   0,0,0,0);
 	  //particle.Print();
 	  mParticles.push_back(particle);
-	  o2::mcutils::MCGenHelper::encodeParticleStatusAndTracking(mParticles.back(), 11);
+	  o2::mcutils::MCGenHelper::encodeParticleStatusAndTracking(mParticles.back(), false);
   }
   if(!mDecayEvtGen || mPdgMother == -1){ // Don't import daughters in case of external decayer
   for(int ipart=0;ipart<npart;ipart++) {
@@ -275,7 +275,7 @@ class GeneratorStarlight_class : public Generator
 				   vtx,vty,vtz,vtt);
 	  //particle.Print();
 	  mParticles.push_back(particle);
-      o2::mcutils::MCGenHelper::encodeParticleStatusAndTracking(mParticles.back(), 1);
+      o2::mcutils::MCGenHelper::encodeParticleStatusAndTracking(mParticles.back(), true);
     }  
   }
   return true; 

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ funcName = GeneratorPythia8GapTriggeredBeautyForcedDecays(3,2)`
`4`	`4`
`5`	`5`	`[GeneratorPythia8]`
`6`	`6`	`config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/configPythiaEmpty.cfg`
	`7`	`+includePartonEvent = true`