Centralise isActive function for detectors

Author: Benedikt Volkel

MC/bin/o2dpg_qc_finalization_workflow.py

@@ -17,7 +17,7 @@
 
 sys.path.append(join(dirname(__file__), '.', 'o2dpg_workflow_utils'))
 
-from o2dpg_workflow_utils import createTask, dump_workflow
+from o2dpg_workflow_utils import createTask, dump_workflow, isActive
 
 def getDPL_global_options(bigshm=False, noIPC=None):
    common="-b --run --driver-client-backend ws:// "

MC/bin/o2dpg_sim_workflow.py

@@ -30,7 +30,7 @@
 
 sys.path.append(join(dirname(__file__), '.', 'o2dpg_workflow_utils'))
 
-from o2dpg_workflow_utils import createTask, dump_workflow, adjust_RECO_environment
+from o2dpg_workflow_utils import createTask, dump_workflow, adjust_RECO_environment, isActive, activate_detector
 from o2dpg_qc_finalization_workflow import include_all_QC_finalization
 from o2dpg_sim_config import create_sim_config
 
@@ -178,21 +178,13 @@ def load_external_config(configfile):
 activeDetectors = anchorConfig.get('o2-ctf-reader-workflow-options',{}).get('onlyDet','all')
 # convert to set/hashmap
 activeDetectors = { det:1 for det in activeDetectors.split(",") }
-
-# see if a detector is in list of activeDetectors
-def isActive(detID):
-   """
-   detID == the usual detID string (3 letters)
-   """
-   if "all" in activeDetectors:
-      return True
-   return detID in activeDetectors
+for det in activeDetectors:
+    activate_detector(det)
 
 def addWhenActive(detID, needslist, appendstring):
    if isActive(detID):
       needslist.append(appendstring)
 
-
 def retrieve_sor(run_number):
     """
     retrieves start of run (sor)

MC/bin/o2dpg_workflow_utils.py

@@ -4,6 +4,21 @@
 import json
 
 
+# List of active detectors
+ACTIVE_DETECTORS = ["all"]
+
+def activate_detector(det):
+    try:
+        # first of all remove "all" if a specific detector is passed
+        ind = ACTIVE_DETECTORS.index("all")
+        del ACTIVE_DETECTORS[ind]
+    except ValueError:
+        pass
+    ACTIVE_DETECTORS.append(det)
+
+def isActive(det):
+    return "all" in ACTIVE_DETECTORS or det in ACTIVE_DETECTORS
+
 def relativeCPU(n_rel, n_workers):
     # compute number of CPUs from a given number of workers
     # n_workers and a fraction n_rel