Add converters extra-tracks-v2 and mft-tracks. Update JSON for multip…

…licity table.
vkucera · Dec 12, 2024 · e709069 · e709069
1 parent f4af31c
commit e709069
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 51 deletions.
diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh
@@ -40,54 +40,54 @@ case $INPUT_CASE in
   1)
     INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, real"
     INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/real/LHC17p_pass1_CENT_woSDD"
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   2) # reference
     INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
     INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282099"
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   3)
     INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
     INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282341"
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   4)
     INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, real"
     INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/real/LHC15o"
     INPUT_SYS="PbPb"
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   5)
     INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, MC LHC15k1a3"
     INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/sim/LHC15k1a3"
     INPUT_SYS="PbPb"
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   6)
     INPUT_LABEL="Run 2, p-p 13 TeV LHC16p, MC LHC19g6f3, dedicated Ξc"
     INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC19g6f3"
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   7)
     INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o, real"
     INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22o_pass4_minBias_small"
     INPUT_FILES="AO2D.root"
     INPUT_RUN=3
     INPUT_IS_O2=1
-    INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1 DOO2_CONV_MFT=1"
     ;;
   8)
     INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22r, real, low interaction rate (100 kHz)"
     INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22r"
     INPUT_FILES="AO2D.root"
     INPUT_RUN=3
     INPUT_IS_O2=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
     ;;
   9)
     INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC21k6, general purpose"
@@ -96,28 +96,28 @@ case $INPUT_CASE in
     INPUT_RUN=3
     INPUT_IS_O2=1
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
     ;;
   10)
     INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (ESD)"
     INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC20f4a"
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
     ;;
   11)
     INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (AO2D)"
     INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim_converted/LHC20f4a"
     INPUT_FILES="AO2D.root"
     INPUT_IS_O2=1
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
     ;;
   12)
     INPUT_LABEL="Run 2, p-p 13 TeV, LHC17j (AO2D)"
     INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/real_converted/LHC17j_20220601" # converted good AO2Ds
     INPUT_FILES="AO2D.root"
     INPUT_IS_O2=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
     ;;
   13)
     INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC22b1b, D2H enriched"
@@ -126,7 +126,7 @@ case $INPUT_CASE in
     INPUT_RUN=3
     INPUT_IS_O2=1
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1"
     ;;
   14)
     INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC23f4b2, general purpose"
@@ -135,7 +135,7 @@ case $INPUT_CASE in
     INPUT_RUN=3
     INPUT_IS_O2=1
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1"
     ;;
   15)
     INPUT_LABEL="Run 3, Pb-Pb 5.36 TeV LHC23zzi_pass2"
@@ -152,6 +152,6 @@ case $INPUT_CASE in
     INPUT_RUN=3
     INPUT_IS_O2=1
     INPUT_IS_MC=1
-    INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1"
+    INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_1_2=1"
     ;;
   esac
diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh
@@ -127,14 +127,17 @@ DOO2_PID_TOF=0      # pid-tof-full/alice3-pid-tof
 DOO2_PID_TOF_QA=0   # pid-tof-qa-mc
 DOO2_PID_BAYES=0    # pid-bayes
 # Converters (Consider setting these per input case via INPUT_TASK_CONFIG.)
-DOO2_CONV_MC=0      # mc-converter
-DOO2_CONV_FDD=0     # fdd-converter
-DOO2_CONV_COLL=0    # collision-converter
-DOO2_CONV_MCCOLL=0  # mccollision-converter
-DOO2_CONV_ZDC=0     # zdc-converter
-DOO2_CONV_BC=0      # bc-converter
-DOO2_CONV_TRKEX=0   # tracks-extra-converter
-DOO2_CONV_V0=0      # v0converter
+DOO2_CONV_MC=0         # mc-converter
+DOO2_CONV_FDD=0        # fdd-converter
+DOO2_CONV_COLL=0       # collision-converter
+DOO2_CONV_MCCOLL=0     # mccollision-converter
+DOO2_CONV_ZDC=0        # zdc-converter
+DOO2_CONV_BC=0         # bc-converter
+DOO2_CONV_TRKEX_0_1=0  # tracks-extra-converter (0→1)
+DOO2_CONV_TRKEX_0_2=0  # tracks-extra-v002-converter (0→2)
+DOO2_CONV_TRKEX_1_2=0  # tracks-extra-v002-converter (1→2)
+DOO2_CONV_V0=0         # v0converter
+DOO2_CONV_MFT=0        # mft-tracks-converter
 
 # Selection cuts
 APPLYCUTS_D0=1      # Apply D0 selection cuts.
@@ -265,6 +268,15 @@ function AdjustJson {
     ReplaceString "\"isRun3\": \"true\"" "\"isRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
   fi
 
+  # tracks-extra-v002-converter
+  if [ $DOO2_CONV_TRKEX_0_2 -eq 1 ]; then
+    ReplaceString "\"processV000ToV002\": \"false\"" "\"processV000ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processV001ToV002\": \"true\"" "\"processV001ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
+  elif [ $DOO2_CONV_TRKEX_1_2 -eq 1 ]; then
+    ReplaceString "\"processV000ToV002\": \"true\"" "\"processV000ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processV001ToV002\": \"false\"" "\"processV001ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
+  fi
+
   # lambdakzero-builder
   if [ "$INPUT_RUN" -eq 2 ]; then
     ReplaceString "\"isRun2\": \"0\"" "\"isRun2\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
@@ -538,8 +550,10 @@ function MakeScriptO2 {
   [ $DOO2_CONV_MCCOLL -eq 1 ] && WORKFLOWS+=" o2-analysis-mccollision-converter"
   [ $DOO2_CONV_ZDC -eq 1 ] && WORKFLOWS+=" o2-analysis-zdc-converter"
   [ $DOO2_CONV_BC -eq 1 ] && WORKFLOWS+=" o2-analysis-bc-converter"
-  [ $DOO2_CONV_TRKEX -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
+  [ $DOO2_CONV_TRKEX_0_1 -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
+  [[ $DOO2_CONV_TRKEX_0_2 -eq 1 || $DOO2_CONV_TRKEX_1_2 -eq 1 ]] && WORKFLOWS+=" o2-analysis-tracks-extra-v002-converter"
   [ $DOO2_CONV_V0 -eq 1 ] && WORKFLOWS+=" o2-analysis-v0converter"
+  [ $DOO2_CONV_MFT -eq 1 ] && WORKFLOWS+=" o2-analysis-mft-tracks-converter"
 
   # Translate options into arguments of the generating script.
   OPT_MAKECMD=""

diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json
@@ -7372,6 +7372,10 @@
         "processStandard": "false",
         "processCovariance": "true"
     },
+    "tracks-extra-v002-converter": {
+        "processV000ToV002": "true",
+        "processV001ToV002": "false"
+    },
     "track-to-collision-association": {
         "nSigmaForTimeCompat": "4",
         "timeMargin": "0",
@@ -7394,67 +7398,90 @@
         "processRun3FT0": "false"
     },
     "multiplicity-table": {
-        "processRun3": "0",
-        "processRun2": "1",
+        "doVertexZeq": "1",
+        "fractionOfEvents": "2",
         "enabledTables": {
+            "labels_rows": [
+                "FV0Mults",
+                "FT0Mults",
+                "FDDMults",
+                "ZDCMults",
+                "TrackletMults",
+                "TPCMults",
+                "PVMults",
+                "MultsExtra",
+                "MultSelections",
+                "FV0MultZeqs",
+                "FT0MultZeqs",
+                "FDDMultZeqs",
+                "PVMultZeqs",
+                "MultMCExtras",
+                "MFTMults"
+            ],
+            "labels_cols": [
+                "Enable"
+            ],
             "values": [
                 [
-                    -1
+                    "-1"
+                ],
+                [
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ],
                 [
-                    -1
+                    "-1"
                 ]
             ]
         },
-        "fractionOfEvents": "2",
-        "processMC2Mults": "0",
-        "min_pt_globaltrack": "0.15",
-        "min_ncluster_its_globaltrack": "5",
+        "ccdburl": "http:\/\/alice-ccdb.cern.ch",
+        "ccdbpath": "Centrality\/Calibration",
+        "reconstructionPass": "",
+        "produceHistograms": "false",
+        "min_pt_globaltrack": "0.150000006",
         "max_pt_globaltrack": "1e+10",
-        "processGlobalTrackingCounters": "0",
+        "min_ncluster_its_globaltrack": "5",
         "min_ncluster_itsib_globaltrack": "1",
-        "doVertexZeq": "1",
-        "produceHistograms": "0",
-        "reconstructionPass": " ",
-        "ccdbpath": "Centrality/Calibration",
-        "ccdburl": "http://alice-ccdb.cern.ch",
-        "processMC": "1"
+        "processRun2": "true",
+        "processRun3": "false",
+        "processGlobalTrackingCounters": "false",
+        "processMC": "false",
+        "processMC2Mults": "false"
     },
     "pid-multiplicity": {
         "processIU": "false",

diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
@@ -658,8 +658,12 @@ workflows:
 
   o2-analysis-tracks-extra-converter: {}
 
+  o2-analysis-tracks-extra-v002-converter: {}
+
   o2-analysis-v0converter: {}
 
+  o2-analysis-mft-tracks-converter: {}
+
   # LF
 
   o2-analysis-lf-lambdakzerobuilder: