[SimWF] Small fixes (#1476)

* o2dpg_sim_workflow_anchored.py
  * remove unused function from CCDBAccessor
    due to undefined utility function that is used inside it
  * fix variable name

* o2dpg_sim_workflow.py
  * fix dependency of cleanup task

* o2dpg-workflow-tools.py
  * use return value of function correctly

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

Author: benedikt-voelkel

MC/bin/o2dpg-workflow-tools.py

@@ -15,15 +15,16 @@ def extend(args):
     is kept
     """
     # load workflows
-    workflow_orig = read_workflow(args.orig_wf)
-    workflow_extend = read_workflow(args.extend_wf)
+    workflow_orig, meta = read_workflow(args.orig_wf)
+    workflow_extend, _ = read_workflow(args.extend_wf)
 
     # extend
     workflow_orig.extend(workflow_extend)
 
     # dump in new file
     filename = args.output if args.output else args.orig_wf
-    dump_workflow(workflow_orig, filename)
+    # propagate meta information from original workflow that is extended
+    dump_workflow(workflow_orig, filename, meta)
 
 
 def create(args):

MC/bin/o2dpg_sim_workflow.py

@@ -1039,7 +1039,7 @@ def getDigiTaskName(det):
    TOFRECOtask['cmd'] = '${O2_ROOT}/bin/o2-tof-reco-workflow --use-ccdb ' + getDPL_global_options() + putConfigValuesNew() + ('',' --disable-mc')[args.no_mc_labels]
    workflow['stages'].append(TOFRECOtask)
 
-   
+
    toftpcmatchneeds = [TOFRECOtask['name'], TPCRECOtask['name'], ITSTPCMATCHtask['name'], TRDTRACKINGtask2['name']]
    toftracksrcdefault = anchorConfig.get('o2-tof-matcher-workflow-options', {}).get('track-sources', 'TPC,ITS-TPC,TPC-TRD,ITS-TPC-TRD')
    TOFTPCMATCHERtask = createTask(name='toftpcmatch_'+str(tf), needs=toftpcmatchneeds, tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1000')
@@ -1407,10 +1407,10 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
   # taking away digits, clusters and other stuff as soon as possible.
   # TODO: cleanup by labels or task names
    if args.early_tf_cleanup == True:
-     TFcleanup = createTask(name='tfcleanup_'+str(tf), needs= [ AOD_merge_task['name'] ], tf=tf, cwd=timeframeworkdir, lab=["CLEANUP"], mem='0', cpu='1')
+     TFcleanup = createTask(name='tfcleanup_'+str(tf), needs= [ AODtask['name'] ], tf=tf, cwd=timeframeworkdir, lab=["CLEANUP"], mem='0', cpu='1')
      TFcleanup['cmd'] = 'rm *digi*.root;'
      TFcleanup['cmd'] += 'rm *cluster*.root'
-     workflow['stages'].append(TFcleanup);
+     workflow['stages'].append(TFcleanup)
 
 # AOD merging as one global final step
 aodmergerneeds = ['aod_' + str(tf) for tf in range(1, NTIMEFRAMES + 1)]

MC/bin/o2dpg_sim_workflow_anchored.py

@@ -50,16 +50,6 @@ def __init__(self, url):
         # we allow nullptr responsens and will treat it ourselves
         o2.ccdb.BasicCCDBManager.instance().setFatalWhenNull(False)
 
-    def list(self, path, dump_path=None):
-        ret = self.api.list(path, False, "application/json")
-        ret = json.loads(ret)
-        if ret and "objects" in ret:
-            ret = ret["objects"]
-        if ret and dump_path:
-            print(f"CCDB object information for path {path} stored in {dump_path}")
-            dump_json(ret, dump_path)
-        return ret
-
     def fetch(self, path, obj_type, timestamp=None, meta_info=None):
         """
         TODO We could use CcdbApi::snapshot at some point, needs revision
@@ -95,7 +85,7 @@ def retrieve_sor_eor(ccdbreader, run_number):
     path_run_info = "RCT/Info/RunInformation"
     header = ccdbreader.fetch_header(path_run_info, run_number)
     if not header:
-       print(f"WARNING: Cannot find run information for run number {r}")
+       print(f"WARNING: Cannot find run information for run number {run_number}")
        return None
     # return this a dictionary
     return {"SOR": int(header["SOR"]), "EOR": int(header["EOR"])}