Fix and add analysis (#389)

* fix taking MID reco into account, dedicated handling in PV/SVFinder
  and AOD producer

* add another forward analysis

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

Author: benedikt-voelkel

MC/analysis_testing/o2dpg_analysis_test_workflow.py

@@ -147,6 +147,11 @@
                        "valid_for": [ANALYSIS_VALID_MC],
                        "cmd": "o2-analysis-multiplicity-table {CONFIG} --aod-writer-json aodWriterTempConfig.json | o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-pid-tof {CONFIG} | o2-analysis-pid-tpc {CONFIG} | o2-analysis-lf-lambdakzerobuilder {CONFIG} | o2-analysis-cf-femtodream-producer {CONFIG} {AOD}"}
 ANALYSES.append(analysis_LK0CFFemto)
+analysis_PWGMMFwdVertexing = {"name": "PWGMMFwdVertexing",
+                              "expected_output": ["AnalysisResults.root"],
+                              "valid_for": [ANALYSIS_VALID_MC],
+                              "cmd": "o2-analysis-mm-vertexing-fwd {CONFIG} {AOD}"}
+ANALYSES.append(analysis_PWGMMFwdVertexing)
 
 def make_merged_analysis(*analysis_names, accept_data_or_mc=ANALYSIS_VALID_MC):
     """merge CMD / DPL piping to one large pipe

MC/bin/o2dpg_sim_workflow.py

@@ -857,11 +857,25 @@ def getDigiTaskName(det):
       pvfinderneeds += [FDDRECOtask['name']]
    if isActive('MFT') and isActive('MCH'):
       pvfinderneeds += [MFTMCHMATCHtask['name']]
+
+   # Take None as default, we only add more if nothing from anchorConfig
+   pvfinder_sources = anchorConfig.get("o2-primary-vertexing-workflow-options",{}).get("vertexing-sources", None)
+   pvfinder_matching_sources = anchorConfig.get("o2-primary-vertexing-workflow-options",{}).get("vertex-track-matching-sources", None)
+   if not pvfinder_sources:
+      pvfinder_sources = "ITS,ITS-TPC,ITS-TPC-TRD,ITS-TPC-TOF"
+      if isActive("MID"):
+         pvfinder_sources += ",MID"
+         pvfinderneeds += [MIDRECOtask['name']]
+   if not pvfinder_matching_sources:
+      pvfinder_matching_sources = "ITS,MFT,TPC,ITS-TPC,MCH,MFT-MCH,TPC-TOF,TPC-TRD,ITS-TPC-TRD,ITS-TPC-TOF"
+      if isActive("MID"):
+         pvfinder_matching_sources += ",MID"
+         pvfinderneeds += [MIDRECOtask['name']]
+   
    PVFINDERtask = createTask(name='pvfinder_'+str(tf), needs=pvfinderneeds, tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu=NWORKERS, mem='4000')
    PVFINDERtask['cmd'] = '${O2_ROOT}/bin/o2-primary-vertexing-workflow ' \
                          + getDPL_global_options() + putConfigValuesNew(['ITSAlpideParam','MFTAlpideParam', 'pvertexer', 'TPCGasParam'], {"NameConf.mDirMatLUT" : ".."})
-   PVFINDERtask['cmd'] += ' --vertexing-sources ' + anchorConfig.get("o2-primary-vertexing-workflow-options",{}).get("vertexing-sources", "ITS,ITS-TPC,ITS-TPC-TRD,ITS-TPC-TOF") \
-                          + ' --vertex-track-matching-sources ' + anchorConfig.get("o2-primary-vertexing-workflow-options",{}).get("vertex-track-matching-sources","ITS,MFT,TPC,ITS-TPC,MCH,MFT-MCH,TPC-TOF,TPC-TRD,ITS-TPC-TRD,ITS-TPC-TOF")
+   PVFINDERtask['cmd'] += ' --vertexing-sources ' + pvfinder_sources + ' --vertex-track-matching-sources ' + pvfinder_matching_sources
    workflow['stages'].append(PVFINDERtask)
 
    if includeFullQC or includeLocalQC:
@@ -975,16 +989,25 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
    SVFINDERtask = createTask(name='svfinder_'+str(tf), needs=[PVFINDERtask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu=svfinder_cpu, mem='5000')
    SVFINDERtask['cmd'] = '${O2_ROOT}/bin/o2-secondary-vertexing-workflow '
    SVFINDERtask['cmd'] += getDPL_global_options(bigshm=True) + svfinder_threads + putConfigValuesNew(['svertexer'], {"NameConf.mDirMatLUT" : ".."})
-   SVFINDERtask['cmd'] += ' --vertexing-sources ' + anchorConfig.get("o2-secondary-vertexing-workflow-options",{}).get("vertexing-sources","ITS,ITS-TPC,TPC-TRD,TPC-TOF,ITS-TPC-TRD,ITS-TPC-TOF")
+   # Take None as default, we only add more if nothing from anchorConfig
+   svfinder_sources = anchorConfig.get("o2-secondary-vertexing-workflow-options",{}).get("vertexing-sources", None)
+   if not svfinder_sources:
+       svfinder_sources = "ITS,ITS-TPC,TPC-TRD,TPC-TOF,ITS-TPC-TRD,ITS-TPC-TOF"
+       if isActive("MID"):
+           svfinder_sources += ",MID"
+   SVFINDERtask['cmd'] += ' --vertexing-sources ' + svfinder_sources
    workflow['stages'].append(SVFINDERtask)
 
   # -----------
   # produce AOD
   # -----------
+   # TODO This needs further refinement, sources and dependencies should be constructed dynamically
+   aodinfosources = 'ITS,MFT,MCH,TPC,ITS-TPC,MFT-MCH,ITS-TPC-TOF,TPC-TOF,FT0,FDD,CTP,TPC-TRD,ITS-TPC-TRD,EMC'
    aodneeds = [PVFINDERtask['name'], SVFINDERtask['name'], TOFRECOtask['name'],
                FV0RECOtask['name']]
    if isActive('FV0'):
      aodneeds += [ FV0RECOtask['name'] ]
+     aodinfosources += ',FV0'
    if isActive('TOF'):
      aodneeds += [ TOFRECOtask['name'] ]
    if isActive('TRD'):
@@ -995,17 +1018,17 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
      aodneeds += [ CPVRECOtask['name'] ]
    if isActive('PHS'):
      aodneeds += [ PHSRECOtask['name'] ]
+   if isActive('MID'):
+      aodneeds += [ MIDRECOtask['name'] ]
+      aodinfosources += ',MID'
    if args.with_ZDC and isActive('ZDC'):
      aodneeds += [ ZDCRECOtask['name'] ]
+     aodinfosources += ',ZDC'
    if usebkgcache:
      aodneeds += [ BKG_KINEDOWNLOADER_TASK['name'] ]
 
    aod_df_id = '{0:03}'.format(tf)
 
-   aodinfosources = 'ITS,MFT,MCH,TPC,ITS-TPC,MFT-MCH,ITS-TPC-TOF,TPC-TOF,FT0,FV0,FDD,CTP,TPC-TRD,ITS-TPC-TRD,EMC'
-   if args.with_ZDC:
-      aodinfosources += ',ZDC'
-
    AODtask = createTask(name='aod_'+str(tf), needs=aodneeds, tf=tf, cwd=timeframeworkdir, lab=["AOD"], mem='4000', cpu='1')
    AODtask['cmd'] = ('','ln -nfs ../bkg_Kine.root . ;')[doembedding]
    AODtask['cmd'] += '[ -f AO2D.root ] && rm AO2D.root; ${O2_ROOT}/bin/o2-aod-producer-workflow --reco-mctracks-only 1 --aod-writer-keep dangling --aod-writer-resfile AO2D'