Trackselection -> itsMatcher

README.md

@@ -4,7 +4,7 @@
 
 [![doxygen](https://img.shields.io/badge/doxygen-documentation-blue.svg)](https://dquserinterfaceoop.github.io/docs/html/)
 
-This project includes python based user interface development for PWG-DQ Workflows based on nightly-20220912. You can follow the instructions and you can find tutorials in table of contents (For prerequisites, Installation guide for argcomplete and Some Informations good to know).
+This project includes python based user interface development for PWG-DQ Workflows based on nightly-20220914. You can follow the instructions and you can find tutorials in table of contents (For prerequisites, Installation guide for argcomplete and Some Informations good to know).
 
 ## Contact
 Ionut Cristian Arsene (Owner of [`O2DQWorkflows`](https://github.com/iarsene/O2DQworkflows))

commondeps/trackselection.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+# -*- coding: utf-8 -*- 
+
+# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+# All rights not expressly granted are reserved.
+#
+# This software is distributed under the terms of the GNU General Public
+# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization
+# or submit itself to any jurisdiction.
+
+# Orginal Task: https://github.com/AliceO2Group/O2Physics/blob/master/Common/TableProducer/trackselection.cxx
+
+import argparse
+
+from argcomplete.completers import ChoicesCompleter
+
+class TrackSelectionTask(object):
+    """
+    Class for Interface -> trackselection.cxx.cxx Task -> Configurable, Process Functions  
+
+    Args:
+        object (parser_args() object): trackselection.cxx.cxx Interface
+    """
+
+    def __init__(self, parserTrackSelectionTask=argparse.ArgumentParser(add_help=False)):
+        super(TrackSelectionTask, self).__init__()
+        self.parserTrackSelectionTask = parserTrackSelectionTask
+
+    def addArguments(self):
+        """
+        This function allows to add arguments for parser_args() function
+        """
+
+        # Predefined Selections
+        itsMatchingSelections = ["0","1","2"]
+
+        # Interface
+        groupTrackSelectionTask = self.parserTrackSelectionTask.add_argument_group(title="Data processor options: track-selection")
+        groupTrackSelectionTask.add_argument("--itsMatching", help="condition for ITS matching (0: Run2 SPD kAny, 1: Run3ITSibAny, 2: Run3ITSallAny, 3: Run3ITSall7Layers)", action="store", type=str, choices=(itsMatchingSelections)).completer = ChoicesCompleter(itsMatchingSelections)
+
+
+    def parseArgs(self):
+        """
+        This function allows to save the obtained arguments to the parser_args() function
+
+        Returns:
+            Namespace: returns parse_args()
+        """
+
+        return self.parserTrackSelectionTask.parse_args()

configs/configFilterPPDataRun2.json

@@ -150,6 +150,7 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "false"
+        "isRun3": "false",
+        "itsMatching": "0"
     }
 }

configs/configFilterPPDataRun3.json

@@ -150,6 +150,7 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "true"
+        "isRun3": "true",
+        "itsMatching": "0"
     }
 }

configs/configFlowDataRun2.json

@@ -37,7 +37,8 @@
         "processRun3": "false"
     },
     "track-selection": {
-        "isRun3": "false"
+        "isRun3": "false",
+        "itsMatching": "0"
     },
     "event-selection-task": {
         "syst": "PbPb",

configs/configFlowDataRun3.json

@@ -37,7 +37,8 @@
         "processRun3": "true"
     },
     "track-selection": {
-        "isRun3": "true"
+        "isRun3": "true",
+        "itsMatching": "0"
     },
     "event-selection-task": {
         "syst": "PbPb",

configs/configTableMakerDataRun2.json

@@ -140,7 +140,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "false"
+        "isRun3": "false",
+        "itsMatching": "0"
     },
     "weak-decay-indices-cascades": "",
     "v0-selector": {

configs/configTableMakerDataRun3.json

@@ -140,7 +140,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "true"
+        "isRun3": "true",
+        "itsMatching": "0"
     },
     "weak-decay-indices-cascades": "",
     "v0-selector": {

configs/configTableMakerMCRun2.json

@@ -140,7 +140,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "false"
+        "isRun3": "false",
+        "itsMatching": "0"
     },
     "table-maker-m-c": {
         "cfgEventCuts": "eventStandardNoINT7",

configs/configTableMakerMCRun3.json

@@ -134,7 +134,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "true"
+        "isRun3": "true",
+        "itsMatching": "0"
     },
     "table-maker-m-c": {
         "cfgEventCuts": "eventStandardNoINT7",

configs/configV0SelectorDataRun2.json

@@ -140,7 +140,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "false"
+        "isRun3": "false",
+        "itsMatching": "0"
     },
     "weak-decay-indices-cascades": "",
     "v0-selector": {

configs/configV0SelectorDataRun3.json

@@ -140,7 +140,8 @@
         "processOnlyFT0": "false"
     },
     "track-selection": {
-        "isRun3": "true"
+        "isRun3": "true",
+        "itsMatching": "0"
     },
     "weak-decay-indices-cascades": "",
     "v0-selector": {

dqtasks/tableMaker.py

@@ -158,7 +158,7 @@ def addArguments(self):
         # Interface
 
         # table-maker configurables
-        groupTableMakerConfigs = self.parserTableMaker.add_argument_group(title="Data processor options: table-maker-m-c")
+        groupTableMakerConfigs = self.parserTableMaker.add_argument_group(title="Data processor options: table-maker")
         groupTableMakerConfigs.add_argument("--cfgEventCuts", help="Space separated list of event cuts", nargs="*", action="store", type=str, metavar="CFGEVENTCUTS", choices=allAnalysisCuts).completer = ChoicesCompleterList(allAnalysisCuts)
         groupTableMakerConfigs.add_argument("--cfgBarrelTrackCuts", help=" Space separated list of barrel track cuts", nargs="*", action="store", type=str, metavar="CFGBARRELTRACKCUTS", choices=allAnalysisCuts).completer = ChoicesCompleterList(allAnalysisCuts)
         groupTableMakerConfigs.add_argument("--cfgMuonCuts", help="Space separated list of muon cuts in table-maker", action="store", nargs="*", type=str, metavar="CFGMUONCUTS", choices=allAnalysisCuts).completer = ChoicesCompleterList(allAnalysisCuts)
@@ -170,7 +170,7 @@ def addArguments(self):
         groupTableMakerConfigs.add_argument("--cfgMinTpcSignal", help="Minimum TPC signal", action="store", type=str)
         groupTableMakerConfigs.add_argument("--cfgMaxTpcSignal", help="Maximum TPC signal", action="store", type=str)
 
-        groupProcessTableMaker = self.parserTableMaker.add_argument_group(title="Data processor options: table-maker-m-c")
+        groupProcessTableMaker = self.parserTableMaker.add_argument_group(title="Data processor options: table-maker")
         groupProcessTableMaker.add_argument("--process",help="Process Selection options for tableMaker/tableMakerMC Data Processing and Skimming", action="store", type=str, nargs="*", metavar="PROCESS", choices=tableMakerProcessSelectionsList).completer = ChoicesCompleterList(tableMakerProcessSelectionsList)
         for key,value in tableMakerProcessSelections.items():
             groupProcessTableMaker.add_argument(key, help=value, action="none")

dqtasks/v0selector.py

@@ -39,7 +39,7 @@ def addArguments(self):
 
         # Interface
         groupV0Selector = self.parserV0selector.add_argument_group(title="Data processor options: v0-selector")
-        groupV0Selector.add_argument("--d_bz_input", help="bz field in kG", action="store", type=str)
+        groupV0Selector.add_argument("--d_bz_input", help="bz field in kG, -999 is automatic", action="store", type=str)
         groupV0Selector.add_argument("--v0cospa", help="v0cospa", action="store", type=str)
         groupV0Selector.add_argument("--dcav0dau", help="DCA V0 Daughters", action="store", type=str)
         groupV0Selector.add_argument("--v0Rmin", help="v0Rmin", action="store", type=str)

runDQFlow.py

@@ -38,6 +38,8 @@
 from commondeps.pidTOFBeta import TofPidBeta
 from commondeps.pidTPCTOFFull import TpcTofPidFull
 from commondeps.trackPropagation import TrackPropagation
+from commondeps.trackselection import TrackSelectionTask
+
 from dqtasks.dqFlow import AnalysisQvector
 
 from pycacheRemover import PycacheRemover
@@ -120,6 +122,7 @@ def __init__(self,
                 tofPidBeta =TofPidBeta(),
                 tpcTofPidFull=TpcTofPidFull(),
                 trackPropagation=TrackPropagation(),
+                trackSelection=TrackSelectionTask(),
                 debugOptions=DebugOptions()
                 ):
         super(RunAnalysisQvector, self).__init__()
@@ -132,6 +135,7 @@ def __init__(self,
         self.tofPidBeta = tofPidBeta
         self.tpcTofPidFull = tpcTofPidFull
         self.trackPropagation = trackPropagation
+        self.trackSelection = trackSelection
         self.debugOptions = debugOptions
         self.parserRunAnalysisQvector.register("action", "none", NoAction)
         self.parserRunAnalysisQvector.register("action", "store_choice", ChoicesAction)
@@ -198,6 +202,9 @@ def mergeArgs(self):
 
         self.trackPropagation.parserTrackPropagation = self.parserRunAnalysisQvector
         self.trackPropagation.addArguments()
+
+        self.trackSelection.parserTrackSelectionTask = self.parserRunAnalysisQvector
+        self.trackSelection.addArguments()
 
         self.debugOptions.parserDebugOptions = self.parserRunAnalysisQvector
         self.debugOptions.addArguments()
@@ -502,7 +509,12 @@ def mergeMultiArgs(self, *objects):
                 elif value != extrargs.FT0:
                     value2 = "false"
                     config[key][value] = value2
-                    logging.debug(" - [%s] %s : %s",key,value,value2)   
+                    logging.debug(" - [%s] %s : %s",key,value,value2)
+
+            # track-selection
+            if extrargs.itsMatching:
+                config[key][value] = extrargs.itsMatching
+                logging.debug(" - [%s] %s : %s",key,value,extrargs.itsMatching)   
 
 # AOD File Checker
 if extrargs.aod != None:

runFilterPP.py

@@ -37,6 +37,7 @@
 from commondeps.pidTOFBeta import TofPidBeta
 from commondeps.pidTPCTOFFull import TpcTofPidFull
 from commondeps.trackPropagation import TrackPropagation
+from commondeps.trackselection import TrackSelectionTask
 
 from dqtasks.filterPP import DQFilterPPTask
 
@@ -127,6 +128,7 @@ def __init__(self,
                 tofPidBeta=TofPidBeta(),
                 tpcTofPidFull=TpcTofPidFull(),
                 trackPropagation=TrackPropagation(),
+                trackSelection=TrackSelectionTask(),
                 debugOptions=DebugOptions()
                 ):
         super(RunFilterPP, self).__init__()
@@ -138,6 +140,7 @@ def __init__(self,
         self.tofPidBeta = tofPidBeta
         self.tpcTofPidFull = tpcTofPidFull
         self.trackPropagation = trackPropagation
+        self.trackSelection = trackSelection
         self.debugOptions = debugOptions
         self.parserRunFilterPP.register("action", "none", NoAction)
         self.parserRunFilterPP.register("action", "store_choice", ChoicesAction)
@@ -201,6 +204,9 @@ def mergeArgs(self):
 
         self.trackPropagation.parserTrackPropagation = self.parserRunFilterPP
         self.trackPropagation.addArguments()
+
+        self.trackSelection.parserTrackSelectionTask = self.parserRunFilterPP
+        self.trackSelection.addArguments()
 
         self.debugOptions.parserDebugOptions = self.parserRunFilterPP
         self.debugOptions.addArguments()
@@ -551,7 +557,12 @@ def mergeMultiArgs(self, *objects):
                 elif value != extrargs.FT0:
                     value2 = "false"
                     config[key][value] = value2
-                    logging.debug(" - [%s] %s : %s",key,value,value2)     
+                    logging.debug(" - [%s] %s : %s",key,value,value2)
+
+            # track-selection
+            if extrargs.itsMatching:
+                config[key][value] = extrargs.itsMatching
+                logging.debug(" - [%s] %s : %s",key,value,extrargs.itsMatching)        
 
 
             if value == "processDummy" and extrargs.autoDummy:            

runTableMaker.py

@@ -38,6 +38,7 @@
 from commondeps.pidTOFBeta import TofPidBeta
 from commondeps.pidTPCTOFFull import TpcTofPidFull
 from commondeps.trackPropagation import TrackPropagation
+from commondeps.trackselection import TrackSelectionTask
 
 from dqtasks.tableMaker import TableMaker
 from dqtasks.v0selector import V0selector
@@ -172,6 +173,7 @@ def __init__(self,
                 tofPidBeta =TofPidBeta(),
                 tpcTofPidFull=TpcTofPidFull(),
                 trackPropagation=TrackPropagation(),
+                trackSelection=TrackSelectionTask(),
                 v0selector = V0selector(),
                 tableMaker=TableMaker(),
                 debugOptions=DebugOptions()
@@ -185,6 +187,7 @@ def __init__(self,
         self.tofPidBeta = tofPidBeta
         self.tpcTofPidFull = tpcTofPidFull
         self.trackPropagation = trackPropagation
+        self.trackSelection = trackSelection
         self.v0selector = v0selector
         self.tableMaker = tableMaker
         self.debugOptions = debugOptions
@@ -256,6 +259,9 @@ def mergeArgs(self):
         self.trackPropagation.parserTrackPropagation = self.parserRunTableMaker
         self.trackPropagation.addArguments()
 
+        self.trackSelection.parserTrackSelectionTask = self.parserRunTableMaker
+        self.trackSelection.addArguments()
+
         self.v0selector.parserV0selector = self.parserRunTableMaker
         self.v0selector.addArguments()
 
@@ -930,7 +936,12 @@ def mergeMultiArgs(self, *objects):
                     config[key]["processStandard"] = "false"
                     config[key]["processCovariance"] = "true"
                     logging.debug(" - [%s] processStandart : false",key)
-                    logging.debug(" - [%s] processCovariance : true",key) 
+                    logging.debug(" - [%s] processCovariance : true",key)
+
+            # track-selection        
+            if extrargs.itsMatching:
+                config[key][value] = extrargs.itsMatching
+                logging.debug(" - [%s] %s : %s",key,value,extrargs.itsMatching)
 
             # dummy automizer
             if value == "processDummy" and extrargs.autoDummy and extrargs.runData:

runTableMakerMC.py

@@ -38,6 +38,7 @@
 from commondeps.pidTOFBeta import TofPidBeta
 from commondeps.pidTPCTOFFull import TpcTofPidFull
 from commondeps.trackPropagation import TrackPropagation
+from commondeps.trackselection import TrackSelectionTask
 
 from dqtasks.tableMakerMC import TableMakerMC
 
@@ -176,6 +177,7 @@ def __init__(self,
                 tofPidBeta=TofPidBeta(),
                 tpcTofPidFull=TpcTofPidFull(),
                 trackPropagation=TrackPropagation(),
+                trackSelection=TrackSelectionTask(),
                 tableMakerMC=TableMakerMC(),
                 debugOptions=DebugOptions()
                 ):
@@ -188,6 +190,7 @@ def __init__(self,
         self.tofPidBeta = tofPidBeta
         self.tpcTofPidFull = tpcTofPidFull
         self.trackPropagation = trackPropagation
+        self.trackSelection = trackSelection
         self.tableMakerMC = tableMakerMC
         self.debugOptions = debugOptions
         self.parserRunTableMakerMC.register("action", "none", NoAction)
@@ -261,6 +264,9 @@ def mergeArgs(self):
         self.trackPropagation.parserTrackPropagation = self.parserRunTableMakerMC
         self.trackPropagation.addArguments()
 
+        self.trackSelection.parserTrackSelectionTask = self.parserRunTableMakerMC
+        self.trackSelection.addArguments()
+
         self.tableMakerMC.parserTableMakerMC = self.parserRunTableMakerMC
         self.tableMakerMC.addArguments()
 
@@ -763,7 +769,12 @@ def mergeMultiArgs(self, *objects):
                     config[key]["processStandard"] = "false"
                     config[key]["processCovariance"] = "true"
                     logging.debug(" - [%s] processStandart : false",key)
-                    logging.debug(" - [%s] processCovariance : true",key) 
+                    logging.debug(" - [%s] processCovariance : true",key)
+
+            # track-selection
+            if extrargs.itsMatching:
+                config[key][value] = extrargs.itsMatching
+                logging.debug(" - [%s] %s : %s",key,value,extrargs.itsMatching)    
 
 # Centrality table delete for pp processes
 if extrargs.process and len(centSearch) != 0 and (extrargs.syst == "pp" or (extrargs.syst == None and config["event-selection-task"]["syst"] == "pp")):