From f8ec9e89693941f09057e4fe9802ebc591f000bf Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Wed, 10 Jan 2018 16:49:54 +0000
Subject: [PATCH] Merge branch 'trigger_meta' into '21.0'
Write trigger metadata for DAODs
See merge request atlas/athena!7530
(cherry picked from commit 7a645f98b723428ce2db67a0920d591889301c88 [formerly 41bcfdabfb979905e485cba1198ea9a616a5491f])
eec51587 New doWriteDPD flag
5b5ef470 Apply new doWriteDPD flag to writing of metadata
Former-commit-id: 1024046d8e64a58e86865d2083475b9a6e62ecf5
---
.../RecExample/RecExConfig/python/RecFlags.py | 11 ++++++++++-
.../TriggerJobOpts/python/TriggerConfigGetter.py | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index a81409c6f36..5c475c00edb 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/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)
@@ -1015,7 +1024,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, \
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
index d9c9cb09a22..250d912a9f8 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
+++ b/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
--
GitLab