some adjustments for anchoring MC

for AOD, we will still need much more dynamic
source building ....

Author: sawenzel

MC/bin/o2dpg_sim_workflow.py

@@ -254,8 +254,8 @@ def getDPL_global_options(bigshm=False):
 orbitsPerTF=256
 GRP_TASK = createTask(name='grpcreate', cpu='0')
 GRP_TASK['cmd'] = 'o2-grp-simgrp-tool createGRPs --run ' + str(args.run) + ' --publishto ${ALICEO2_CCDB_LOCALCACHE:-.ccdb} -o grp --hbfpertf ' + str(orbitsPerTF) + ' --field ' + args.field
-GRP_TASK['cmd'] += ' --readoutDets ' + " ".join(activeDetectors) + ' --print '
-if len(args.bcPatternFile) > 0:
+GRP_TASK['cmd'] += ' --readoutDets ' + " ".join(activeDetectors) + ' --print ' + ('','--lhcif-CCDB')[args.run_anchored]
+if (not args.run_anchored == True) and len(args.bcPatternFile) > 0:
     GRP_TASK['cmd'] += '  --bcPatternFile ' + str(args.bcPatternFile)
 workflow['stages'].append(GRP_TASK)
 
@@ -1069,8 +1069,10 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
   # 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,ITS-TPC-TRD-TOF,EMC'
+   aodinfosources = 'ITS,MFT,MCH,TPC,ITS-TPC,MFT-MCH,ITS-TPC-TOF,TPC-TOF,FT0,FDD,TPC-TRD,ITS-TPC-TRD,ITS-TPC-TRD-TOF'
    aodneeds = [PVFINDERtask['name'], SVFINDERtask['name']]
+   if isActive('CTP'):
+     aodinfosources += ',CTP'
    if isActive('FV0'):
      aodneeds += [ FV0RECOtask['name'] ]
      aodinfosources += ',FV0'
@@ -1080,6 +1082,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
      aodneeds += [ TRDTRACKINGtask2['name'] ]
    if isActive('EMC'):
      aodneeds += [ EMCRECOtask['name'] ]
+     aodinfosources += ',EMC'
    if isActive('CPV'):
      aodneeds += [ CPVRECOtask['name'] ]
    if isActive('PHS'):

MC/bin/o2dpg_sim_workflow_anchored.py

@@ -238,12 +238,19 @@ def main():
     # make a CCDB accessor object
     ccdbreader = CCDBAccessor(args.ccdb_url)
     # fetch the EOR/SOR
-    # retrieve_sor_eor(ccdbreader, args.run_number) # <-- from RCT/Info
+    rct_sor_eor = retrieve_sor_eor(ccdbreader, args.run_number) # <-- from RCT/Info
     sor_eor = retrieve_sor_eor_fromGRPECS(ccdbreader, args.run_number)
     if not sor_eor:
        print ("No time info found")
        sys.exit(1)
 
+    # verify that the variaous sor_eor information are the same
+    if sor_eor["SOR"] != rct_sor_eor["SOR"]:
+       print ("Inconsistent SOR information on CCDB")
+
+    if sor_eor["EOR"] != rct_sor_eor["EOR"]:
+       print ("Inconsistent EOR information on CCDB")
+
     # determine timestamp, and production offset for the final
     # MC job to run
     timestamp, prod_offset = determine_timestamp(sor_eor["SOR"], sor_eor["EOR"], [args.split_id, args.prod_split], args.cycle, args.tf)