Merge branch 'trigger_meta' into '21.0'

Write trigger metadata for DAODs

See merge request atlas/athena!7530

(cherry picked from commit 41bcfdabfb979905e485cba1198ea9a616a5491f)

eec51587 New doWriteDPD flag
5b5ef470 Apply new doWriteDPD flag to writing of metadata

Reconstruction/RecExample/RecExConfig/python/RecFlags.py

@@ -466,6 +466,14 @@ class doWriteESD(JobProperty):
     statusOn=True
     allowedTypes=['bool']
     StoredValue=True
+
+class doWriteDPD(JobProperty):
+    """ If True writes out DPD file
+    """
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=True
+
 #
 class doWriteBS(JobProperty):
     """ If True writes out RDO bytestream file
@@ -484,6 +492,7 @@ class doWriteRDO(JobProperty):
         jobproperties.Rec.__dict__.get('doESD').set_Value(False)
         jobproperties._log.info('RecExCommon_flags::doWriteRDO : all algorithms are off')
         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('doWriteAOD').set_Value(False)
         jobproperties.Rec.__dict__.get('doWriteTAG').set_Value(False)
@@ -1024,7 +1033,7 @@ doDetailedAuditor, doSGAuditor, doFastMemoryAuditor, doMemoryAuditor, OutputSuff
 doDumpTDS, doDumpTES, doFloatingPointException, abortOnUncheckedStatusCode, abortOnErrorMessage, oldFlagCompatibility, oldFlagTopSteering,oldFlagLandMine,\
 doEdmMonitor, doHist, doJiveXML, doPersint,doVP1, doNameAuditor, \
 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, \
 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, \

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py

@@ -155,7 +155,7 @@ class TriggerConfigGetter(Configured):
 
         self.readPool       = globalflags.InputFormat() == 'pool'
         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.readMC         = globalflags.DataSource()=='geant3' or globalflags.DataSource()=='geant4'
         self.readTriggerDB  = TriggerFlags.readMenuFromTriggerDb() and self.readRDO