Revert "Use different seeds for different tfs"

This reverts commit a17bd49.

Author: benedikt-voelkel

MC/bin/o2dpg_sim_workflow.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
 #
-# A script producing a consistent MC->RECO->AOD workflow
-# It aims to handle the different MC possible configurations
+# A script producing a consistent MC->RECO->AOD workflow 
+# It aims to handle the different MC possible configurations 
 # It just creates a workflow.json txt file, to execute the workflow one must execute right after
-#   ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json
+#   ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json 
 #
 # Execution examples:
 #  - pp PYTHIA jets, 2 events, triggered on high pT decay photons on all barrel calorimeters acceptance, eCMS 13 TeV
@@ -15,7 +15,7 @@
 #  - pp PYTHIA ccbar events embedded into heavy-ion environment, 2 PYTHIA events into 1 bkg event, beams energy 2.510
 #     ./o2dpg_sim_workflow.py -e TGeant3 -nb 1 -ns 2 -j 8 -tf 1 -mod "--skipModules ZDC"  \
 #                             -col pp -eA 2.510 -proc "ccbar"  --embedding
-#
+# 
 
 import sys
 import importlib.util
@@ -125,11 +125,11 @@
 QUALITYCONTROL_ROOT=environ.get('QUALITYCONTROL_ROOT')
 O2PHYSICS_ROOT=environ.get('O2PHYSICS_ROOT')
 
-if O2DPG_ROOT == None:
+if O2DPG_ROOT == None: 
    print('Error: This needs O2DPG loaded')
 #   exit(1)
 
-if O2_ROOT == None:
+if O2_ROOT == None: 
    print('Error: This needs O2 loaded')
 #   exit(1)
 
@@ -184,7 +184,7 @@ def addWhenActive(detID, needslist, appendstring):
    if isActive(detID):
       needslist.append(appendstring)
 
-# ----------- START WORKFLOW CONSTRUCTION -----------------------------
+# ----------- START WORKFLOW CONSTRUCTION ----------------------------- 
 
 # set the time
 if args.timestamp==-1:
@@ -395,7 +395,7 @@ def getDPL_global_options(bigshm=False):
    WEIGHTPOW=float(args.weightPow)
    PTHATMIN=float(args.ptHatMin)
    PTHATMAX=float(args.ptHatMax)
-
+           
    # translate here collision type to PDG
    COLTYPE=args.col
 
@@ -439,7 +439,7 @@ def getDPL_global_options(bigshm=False):
    if GENERATOR == 'pythia8' and PROCESS!='':
       SGN_CONFIG_task['cmd'] = '${O2DPG_ROOT}/MC/config/common/pythia8/utils/mkpy8cfg.py \
                                 --output=pythia8.cfg                                     \
-                                --seed='+str(RNDSEED + tf)+'                             \
+                                --seed='+str(RNDSEED)+'                                  \
                                 --idA='+str(PDGA)+'                                      \
                                 --idB='+str(PDGB)+'                                      \
                                 --eCM='+str(ECMS)+'                                      \
@@ -469,7 +469,7 @@ def getDPL_global_options(bigshm=False):
    # -----------------
    signalprefix='sgn_' + str(tf)
    signalneeds=[ SGN_CONFIG_task['name'] ]
-
+   
    # add embedIntoFile only if embeddPattern does contain a '@'
    embeddinto= "--embedIntoFile ../bkg_MCHeader.root" if (doembedding & ("@" in args.embeddPattern)) else ""
    #embeddinto= "--embedIntoFile ../bkg_MCHeader.root" if doembedding else ""
@@ -511,7 +511,7 @@ def getDPL_global_options(bigshm=False):
    # digitization steps
    # ------------------
    CONTEXTFILE='collisioncontext.root'
-
+ 
    # Determine interation rate
    # it should be taken from CDB, meanwhile some default values
    INTRATE=int(args.interactionRate)
@@ -742,7 +742,7 @@ def getDigiTaskName(det):
    TRDTRACKINGtask = createTask(name='trdreco_'+str(tf), needs=[TRDDigitask['name'], ITSTPCMATCHtask['name'], TPCRECOtask['name'], ITSRECOtask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu='1', mem='2000')
    TRDTRACKINGtask['cmd'] = '${O2_ROOT}/bin/o2-trd-tracklet-transformer ' + getDPL_global_options() + putConfigValues()
    workflow['stages'].append(TRDTRACKINGtask)
-
+   
    # FIXME This is so far a workaround to avoud a race condition for trdcalibratedtracklets.root
    TRDTRACKINGtask2 = createTask(name='trdreco2_'+str(tf), needs=[TRDTRACKINGtask['name'],MATBUD_DOWNLOADER_TASK['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu='1', mem='2000')
    TRDTRACKINGtask2['cmd'] = '${O2_ROOT}/bin/o2-trd-global-tracking ' + getDPL_global_options(bigshm=True) \
@@ -806,7 +806,7 @@ def getDigiTaskName(det):
    PHSRECOtask = createTask(name='phsreco_'+str(tf), needs=[getDigiTaskName("PHS")], tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1500')
    PHSRECOtask['cmd'] = '${O2_ROOT}/bin/o2-phos-reco-workflow ' + getDPL_global_options() + putConfigValues()
    workflow['stages'].append(PHSRECOtask)
-
+ 
    CPVRECOtask = createTask(name='cpvreco_'+str(tf), needs=[getDigiTaskName("CPV")], tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1500')
    CPVRECOtask['cmd'] = '${O2_ROOT}/bin/o2-cpv-reco-workflow ' + getDPL_global_options() + putConfigValues()
    workflow['stages'].append(CPVRECOtask)
@@ -816,7 +816,7 @@ def getDigiTaskName(det):
       ZDCRECOtask['cmd'] = '${O2_ROOT}/bin/o2-zdc-digits-reco ' + getDPL_global_options() + putConfigValues()
       workflow['stages'].append(ZDCRECOtask)
 
-   ## forward matching
+   ## forward matching 
    MCHMIDMATCHtask = createTask(name='mchmidMatch_'+str(tf), needs=[MCHRECOtask['name'], MIDRECOtask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1500')
    MCHMIDMATCHtask['cmd'] = '${O2_ROOT}/bin/o2-mch-tracks-reader-workflow | ${O2_ROOT}/bin/o2-mid-tracks-reader-workflow | ${O2_ROOT}/bin/o2-muon-tracks-matcher-workflow | ${O2_ROOT}/bin/o2-muon-tracks-writer-workflow ' + getDPL_global_options()
    workflow['stages'].append(MCHMIDMATCHtask)
@@ -860,7 +860,7 @@ def getDigiTaskName(det):
 
      def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
        task = createTask(name=taskName + '_local' + str(tf), needs=needs, tf=tf, cwd=timeframeworkdir, lab=["QC"], cpu=1, mem='2000')
-       objectsFile = objectsFile if len(objectsFile) > 0 else taskName + '.root'
+       objectsFile = objectsFile if len(objectsFile) > 0 else taskName + '.root' 
        # the --local-batch argument will make QC Tasks store their results in a file and merge with any existing objects
        task['cmd'] = f'{readerCommand} | o2-qc --config {configFilePath}' + \
                      f' --local-batch ../{qcdir}/{objectsFile}' + \
@@ -869,9 +869,9 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
        # Prevents this task from being run for multiple TimeFrames at the same time, thus trying to modify the same file.
        task['semaphore'] = objectsFile
        workflow['stages'].append(task)
-
+ 
      ### MFT
-
+     
      # to be enabled once MFT Digits should run 5 times with different configurations
      for flp in range(5):
        addQCPerTF(taskName='mftDigitsQC' + str(flp),
@@ -957,7 +957,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
                 needs=[ITSRECOtask['name']],
                 readerCommand='o2-global-track-cluster-reader --track-types "ITS" --cluster-types "ITS"',
                 configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/its-mc-tracks-qc.json')
-
+ 
    #secondary vertexer
    svfinder_threads = ' --threads 1 '
    svfinder_cpu = 1
@@ -973,7 +973,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
   # -----------
   # produce AOD
   # -----------
-   aodneeds = [PVFINDERtask['name'], SVFINDERtask['name'], TOFRECOtask['name'],
+   aodneeds = [PVFINDERtask['name'], SVFINDERtask['name'], TOFRECOtask['name'], 
                FV0RECOtask['name']]
    if isActive('FV0'):
      aodneeds += [ FV0RECOtask['name'] ]
@@ -1008,7 +1008,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
    if args.run_anchored == False:
       AODtask['cmd'] += ' --aod-timeframe-id ${ALIEN_PROC_ID}' + aod_df_id
    AODtask['cmd'] += ' ' + getDPL_global_options(bigshm=True)
-   AODtask['cmd'] += ' --info-sources ' + anchorConfig.get("o2-aod-producer-workflow-options",{}).get("info-sources",str(aodinfosources))
+   AODtask['cmd'] += ' --info-sources ' + anchorConfig.get("o2-aod-producer-workflow-options",{}).get("info-sources",str(aodinfosources)) 
    AODtask['cmd'] += ' --lpmp-prod-tag ${ALIEN_JDL_LPMPRODUCTIONTAG:-unknown}'
    AODtask['cmd'] += ' --anchor-pass ${ALIEN_JDL_LPMANCHORPASSNAME:-unknown}'
    AODtask['cmd'] += ' --anchor-prod ${ALIEN_JDL_MCANCHOR:-unknown}'