Changes sim command back to the original, without datarunnumber.

AtlasWHHV · Nov 30, 2017 · b36e469 · b36e469
1 parent 366f11c
commit b36e469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/constants.py b/constants.py
@@ -16,7 +16,7 @@ def __init__(self, command, release, tag):
     self.release = release
     self.tag = tag
 
-s2608_tag = Tag("Sim_tf.py --physicsList 'FTFP_BERT' --truthStrategy 'MC12' --simulator 'MC12G4' --DBRelease 'default:current' --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' --postInclude 'default:PyJobTransforms/UseFrontier.py' --inputEVNTFile {} --outputHITSFile {}", 'AtlasProduction,19.2.4.14', 's2608')
-r7773_tag = Tag("""Reco_tf.py --digiSteeringConf 'StandardSignalOnlyTruth' --conditionsTag 'default:OFLCOND-MC15c-SDR-09' --ignorePatterns 'Py:TrigConf2COOLLib.py.+ERROR.===================================+' --pileupFinalBunch '6' --numberOfHighPtMinBias '0.12268057' --autoConfiguration 'everything' --postInclude 'default:RecJobTransforms/UseFrontier.py' --numberOfLowPtMinBias '39.8773194' --steering 'doRDO_TRIG' --preInclude='HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run284500_v3.py' 'RDOtoRDOTrigger:RecExPers/RecoOutputMetadataList_jobOptions.py' --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'ESDtoAOD:fixedAttrib=[s if "CONTAINER_SPLITLEVEL = \\\\\'99\\\\\'" not in s else "" for s in svcMgr.AthenaPoolCnvSvc.PoolAttributes];svcMgr.AthenaPoolCnvSvc.PoolAttributes=fixedAttrib' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False' 'ESDtoAOD:TriggerFlags.AODEDMSet="AODSLIM"' --triggerConfig 'RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2046,20,56' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --numberOfCavernBkg '0' --inputHITSFile {} --outputAODFile {}""", 'AtlasProd1,20.7.5.1.1', 'r7773')
+s2608_tag = Tag("Sim_tf.py --physicsList 'FTFP_BERT' --truthStrategy 'MC12' --simulator 'MC12G4' --DBRelease 'default:current' --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' --postInclude 'default:PyJobTransforms/UseFrontier.py' --inputEVNTFile {} --outputHITSFile {}", 'AtlasProduction,19.2.3.7', 's2608')
+r7773_tag = Tag("""Reco_tf.py --digiSteeringConf 'StandardSignalOnlyTruth' --conditionsTag 'default:OFLCOND-MC15c-SDR-09' --ignorePatterns 'Py:TrigConf2COOLLib.py.+ERROR.===================================+' --pileupFinalBunch '6' --numberOfHighPtMinBias '0.12268057' --autoConfiguration 'everything' --postInclude 'default:RecJobTransforms/UseFrontier.py' --numberOfLowPtMinBias '39.8773194' --steering 'doRDO_TRIG' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run284500_v3.py' 'RDOtoRDOTrigger:RecExPers/RecoOutputMetadataList_jobOptions.py' --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'ESDtoAOD:fixedAttrib=[s if "CONTAINER_SPLITLEVEL = \\\\\'99\\\\\'" not in s else "" for s in svcMgr.AthenaPoolCnvSvc.PoolAttributes];svcMgr.AthenaPoolCnvSvc.PoolAttributes=fixedAttrib' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False' 'ESDtoAOD:TriggerFlags.AODEDMSet="AODSLIM"' --triggerConfig 'RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2046,20,56' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --numberOfCavernBkg '0' --inputHITSFile {} --outputAODFile {}""", 'AtlasProd1,20.7.5.1.1', 'r7773')
 p2952_tag = Tag('''Reco_tf.py --reductionConf 'EXOT15' --passThrough 'True' --athenaMPMergeTargetSize 'DAOD_*:0' --preExec 'default:from BTagging.BTaggingFlags import BTaggingFlags;BTaggingFlags.CalibrationTag = "BTagCalibRUN12-08-18"' --inputAODFile {} --outputDAODFile {}''', 'AtlasDerivation,20.7.8.7', 'p2952')
 tags = [s2608_tag, r7773_tag, p2952_tag]
diff --git a/reco.py b/reco.py
@@ -13,6 +13,7 @@ def reco(evnt_file, version, output_dir, num_events, skip_events, log_file, tmp_
     output_file = string.split(input_file, sep='/')[-1] + '_' + tag.tag
     command = tag.command.format(input_file, output_file) + ' --maxEvents {} --skipEvents {}'.format(num_events, skip_events)
     arg = '{} {} && {}'.format(asetup, tag.release, command)
+    print('{} arg: {}'.format(tag.tag, arg))
     try:
       subprocess32.check_call(arg, executable='/bin/bash', cwd=tmp_dir, shell=True, stdout=log_file_handle, stderr=subprocess32.STDOUT)
     except subprocess32.CalledProcessError as e: