Skip to content
Snippets Groups Projects
Commit eb703dc9 authored by James Beacham's avatar James Beacham
Browse files

Merge branch 'cherry-pick-7a645f98 [formerly 41bcfdabfb]-21.0-mc16d' into '21.0-mc16d'

Sweeping !7530 from 21.0 to 21.0-mc16d.
Write trigger metadata for DAODs

See merge request atlas/athena!7904

Former-commit-id: a7978326f744d48ed9d2a6ead452994658d2a170
parents 75ffcc4b f8ec9e89
No related branches found
No related tags found
No related merge requests found
...@@ -466,6 +466,14 @@ class doWriteESD(JobProperty): ...@@ -466,6 +466,14 @@ class doWriteESD(JobProperty):
statusOn=True statusOn=True
allowedTypes=['bool'] allowedTypes=['bool']
StoredValue=True StoredValue=True
class doWriteDPD(JobProperty):
""" If True writes out DPD file
"""
statusOn=True
allowedTypes=['bool']
StoredValue=True
# #
class doWriteBS(JobProperty): class doWriteBS(JobProperty):
""" If True writes out RDO bytestream file """ If True writes out RDO bytestream file
...@@ -484,6 +492,7 @@ class doWriteRDO(JobProperty): ...@@ -484,6 +492,7 @@ class doWriteRDO(JobProperty):
jobproperties.Rec.__dict__.get('doESD').set_Value(False) jobproperties.Rec.__dict__.get('doESD').set_Value(False)
jobproperties._log.info('RecExCommon_flags::doWriteRDO : all algorithms are off') jobproperties._log.info('RecExCommon_flags::doWriteRDO : all algorithms are off')
jobproperties.Rec.__dict__.get('doWriteESD').set_Value(False) jobproperties.Rec.__dict__.get('doWriteESD').set_Value(False)
jobproperties.Rec.__dict__.get('doWriteDPD').set_Value(False)
jobproperties.Rec.__dict__.get('doAOD').set_Value(False) jobproperties.Rec.__dict__.get('doAOD').set_Value(False)
jobproperties.Rec.__dict__.get('doWriteAOD').set_Value(False) jobproperties.Rec.__dict__.get('doWriteAOD').set_Value(False)
jobproperties.Rec.__dict__.get('doWriteTAG').set_Value(False) jobproperties.Rec.__dict__.get('doWriteTAG').set_Value(False)
...@@ -1015,7 +1024,7 @@ doDetailedAuditor, doSGAuditor, doFastMemoryAuditor, doMemoryAuditor, OutputSuff ...@@ -1015,7 +1024,7 @@ doDetailedAuditor, doSGAuditor, doFastMemoryAuditor, doMemoryAuditor, OutputSuff
doDumpTDS, doDumpTES, doFloatingPointException, abortOnUncheckedStatusCode, abortOnErrorMessage, oldFlagCompatibility, oldFlagTopSteering,oldFlagLandMine,\ doDumpTDS, doDumpTES, doFloatingPointException, abortOnUncheckedStatusCode, abortOnErrorMessage, oldFlagCompatibility, oldFlagTopSteering,oldFlagLandMine,\
doEdmMonitor, doHist, doJiveXML, doPersint,doVP1, doNameAuditor, \ doEdmMonitor, doHist, doJiveXML, doPersint,doVP1, doNameAuditor, \
doRestrictedESD, doShowSizeStatistics, doTimeLimit, doTruth,\ doRestrictedESD, doShowSizeStatistics, doTimeLimit, doTruth,\
doWriteAOD, doWritexAOD, doWriteESD, doWriteBS, doWriteRDO, doWriteTAG, doWriteTAGCOM, PoolTAGCOMOutput, readAOD, readTAG, readRDO, \ doWriteAOD, doWritexAOD, doWriteESD, doWriteDPD, doWriteBS, doWriteRDO, doWriteTAG, doWriteTAGCOM, PoolTAGCOMOutput, readAOD, readTAG, readRDO, \
readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \ readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \
doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doFTK,doTrigger,doBTagging, Production, doPhysValMonHists, \ doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doFTK,doTrigger,doBTagging, Production, doPhysValMonHists, \
doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \ doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \
......
...@@ -155,7 +155,7 @@ class TriggerConfigGetter(Configured): ...@@ -155,7 +155,7 @@ class TriggerConfigGetter(Configured):
self.readPool = globalflags.InputFormat() == 'pool' self.readPool = globalflags.InputFormat() == 'pool'
self.readRDO = rec.readRDO() self.readRDO = rec.readRDO()
self.writeESDAOD = rec.doWriteESD() or rec.doWriteAOD() self.writeESDAOD = rec.doWriteESD() or rec.doWriteAOD() or rec.doWriteDPD()
self.ConfigSrcList = TriggerFlags.configurationSourceList() self.ConfigSrcList = TriggerFlags.configurationSourceList()
self.readMC = globalflags.DataSource()=='geant3' or globalflags.DataSource()=='geant4' self.readMC = globalflags.DataSource()=='geant3' or globalflags.DataSource()=='geant4'
self.readTriggerDB = TriggerFlags.readMenuFromTriggerDb() and self.readRDO self.readTriggerDB = TriggerFlags.readMenuFromTriggerDb() and self.readRDO
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment