diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
index bac247aea3a13c6916d89014166ff174dbfe5a01..11763c8887b8aa989d5d2bdfef6af3845a3736c7 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
@@ -77,9 +77,10 @@ namespace xAODMaker {
if( detStore()->contains< AthenaAttributeList >( INDET_BEAMPOS ) ) {
m_beamCondSvcAvailable = true;
} else {
- ATH_MSG_WARNING( "Beam conditions service not available" );
- ATH_MSG_WARNING( "Will not fill beam spot information into "
- "xAOD::EventInfo" );
+ // This is normal in some cases, but tell the user anyway
+ ATH_MSG_INFO( "Beam conditions service not available" );
+ ATH_MSG_INFO( "Will not fill beam spot information into "
+ "xAOD::EventInfo" );
m_beamCondSvcAvailable = false;
}
if(m_disableBeamSpot){
diff --git a/PhysicsAnalysis/AnalysisCommon/AODSelect/share/AODSelect_setupOptions.py b/PhysicsAnalysis/AnalysisCommon/AODSelect/share/AODSelect_setupOptions.py
index 00553ea99b508f99bd3da07ec3022b1007cba284..8b0062584990b4f70ca4c51de8e99d17b08c7a2f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AODSelect/share/AODSelect_setupOptions.py
+++ b/PhysicsAnalysis/AnalysisCommon/AODSelect/share/AODSelect_setupOptions.py
@@ -59,7 +59,7 @@ if AODSelectFlags.isSim():
# Print a message what MCEventCollection is found
if AODSelectFlags.mcEventCollection() == "" :
- logAODSelect_setupOptions.warning( "No MCEventCollection found even though the input file is simulation!" )
+ logAODSelect_setupOptions.info( "No MCEventCollection found even though the input file is simulation!" )
pass
else:
logAODSelect_setupOptions.debug( "Found the McEventCollection with name: %s" \
@@ -67,7 +67,7 @@ if AODSelectFlags.isSim():
pass
# Print a message what TruthParticleContainer is found
if AODSelectFlags.truthParticleContainer() == "" :
- logAODSelect_setupOptions.warning( "No TruthParticleContainer found even though the input file is simulation!" )
+ logAODSelect_setupOptions.info( "No TruthParticleContainer found even though the input file is simulation!" )
pass
else:
logAODSelect_setupOptions.debug( "Found the TruthParticleContainer with name: %s" \
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH0.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH0.py
index 018a22cbe2e1859b4e148074f28eecda4d9a215a..10f6d13296e867439944c8acff7d6e23afa7c80f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH0.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH0.py
@@ -55,5 +55,4 @@ TRUTH0Stream.AddMetaDataItem( [ "xAOD::TruthMetaDataContainer#TruthMetaData", "x
# If we don't have a conditions tag set by now, then assume this job isn't going to have one and kill the conditions service
if len(globalflags.ConditionsTag())==0:
- for a in svcMgr.PoolSvc.ReadCatalog:
- svcMgr.PoolSvc.ReadCatalog.remove(a)
+ svcMgr.PoolSvc.ReadCatalog = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH1.py
index 49bce2ec6522673bb790d94e0d8ac848e8826195..f50030f25b36a78432e3a9dff20a23fbf90d4c0a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH1.py
@@ -90,5 +90,4 @@ TRUTH1Stream.AddMetaDataItem( [ "xAOD::TruthMetaDataContainer#TruthMetaData", "x
# If we don't have a conditions tag set by now, then assume this job isn't going to have one and kill the conditions service
if len(globalflags.ConditionsTag())==0:
- for a in svcMgr.PoolSvc.ReadCatalog:
- svcMgr.PoolSvc.ReadCatalog.remove(a)
+ svcMgr.PoolSvc.ReadCatalog = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH2.py
index d4ac40bb1c0bfe8aa2a24f5ee02bd6aa971083b0..98bcb682429271c52911895114a6f3b0c94ea5be 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH2.py
@@ -135,5 +135,4 @@ TRUTH2Stream.AddMetaDataItem( [ "xAOD::TruthMetaDataContainer#TruthMetaData", "x
# If we don't have a conditions tag set by now, then assume this job isn't going to have one and kill the conditions service
if len(globalflags.ConditionsTag())==0:
- for a in svcMgr.PoolSvc.ReadCatalog:
- svcMgr.PoolSvc.ReadCatalog.remove(a)
+ svcMgr.PoolSvc.ReadCatalog = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH3.py
index 5f44e324e5d3e23dc402ce2fab6399014d52e454..c318987149028da7ab235bd1521810065a653045 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/share/TRUTH3.py
@@ -59,5 +59,4 @@ TRUTH3Stream.RemoveItem('EventInfo#*')
# If we don't have a conditions tag set by now, then assume this job isn't going to have one and kill the conditions service
if len(globalflags.ConditionsTag())==0:
- for a in svcMgr.PoolSvc.ReadCatalog:
- svcMgr.PoolSvc.ReadCatalog.remove(a)
+ svcMgr.PoolSvc.ReadCatalog = []
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
index 95545c85dceab9224ffb6e09335ff8ef1f9daa46..6a7f35948b2b301061d3c2b66976619dff00927b 100644
--- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
@@ -52,9 +52,13 @@ elif hasattr(runArgs,'inputEVNTFile') or hasattr(runArgs,'jobConfig'):
rec.doForwardDet.set_Value_and_Lock(False)
rec.doFileMetaData.set_Value_and_Lock(False)
rec.doTruth.set_Value_and_Lock( True )
+ rec.doTrigger.set_Value_and_Lock( False )
+ rec.doWriteTAG.set_Value_and_Lock( False )
from AthenaCommon.DetFlags import DetFlags
DetFlags.detdescr.BField_setOff()
athenaCommonFlags.FilesInput = runArgs.inputEVNTFile
+ # Do not load conditions; this is running on EVNT
+ globalflags.ConditionsTag = ''
# Leave the remainder for the internal setup
else:
msg.error('AOD Reduction job started, but with no AOD inputs - aborting')
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
index bde8beb00ab826cd7818ae7fef32edf8008f5350..c086a7c36e3a594f5a299cd977c27b39caa2a449 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
@@ -515,19 +515,6 @@ class WriteDAOD_SCTVALIDStream(JobProperty):
jobproperties.PrimaryDPDFlags.add_JobProperty(WriteDAOD_SCTVALIDStream)
listRAWtoDPD.append(WriteDAOD_SCTVALIDStream.StreamName)
-class WriteDAOD_PIXELVALIDStream(JobProperty):
- """ Produce the DPD for DAOD_PIXELVALID - AOD with PrepRawData """
- statusOn = True
- allowedTypes = ['bool']
- StoredValue = False
- StreamName = "StreamDAOD_PIXELVALID"
- FileName = ""
- isVirtual = False
- DPDMakerScript = "InDetPrepRawDataToxAOD/PixelxAOD.py"
- pass
-jobproperties.PrimaryDPDFlags.add_JobProperty(WriteDAOD_PIXELVALIDStream)
-listRAWtoDPD.append(WriteDAOD_PIXELVALIDStream.StreamName)
-
class WriteDAOD_IDTIDEStream(JobProperty):
""" Produce the DPD for DAOD_IDTIDE - AOD with PrepRawData """
statusOn = True
diff --git a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
index 02a7462d2b73bf2fc8f2adec56d63d6b95c331fc..c4c508aece8f7926229d9f1acb5278e3025af7a3 100755
--- a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
+++ b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
@@ -465,14 +465,16 @@ else:
jobproperties.set_JobProperties(data)
else:
i_value=RecExCommonFlags.get(i)
- jpvalue = getattr(jobproperties.AthenaCommonFlags, i)()
- if i!="PoolRDOInput":
- if i_value!=jpvalue:
- logRecExCommon_flags.info('inconsistency: for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
- else:
- if i_value!=jpvalue:
- logRecExCommon_flags.info ('Modified value for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
-
+ if getattr(jobproperties.AthenaCommonFlags, i).statusOn:
+ jpvalue = getattr(jobproperties.AthenaCommonFlags, i)()
+ if i!="PoolRDOInput":
+ if i_value!=jpvalue:
+ logRecExCommon_flags.info('inconsistency: for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
+ else:
+ if i_value!=jpvalue:
+ logRecExCommon_flags.info ('Modified value for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
+ else:
+ logRecExCommon_flags.info('Modified value for flag %s new flag: unset, old flag %s',i,i_value)
# some special migration (temporary)
if rec.doFloatingPointException() and not athenaCommonFlags.isOnline():
diff --git a/Reconstruction/RecJobTransforms/scripts/Reco_tf.py b/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
index 958cb866868f1dc8dd3aab592ce46d9583747ea7..759fb5f4372138ca35853e9a71ef4f5733ccd553 100755
--- a/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
+++ b/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
@@ -65,9 +65,9 @@ def getTransform(RAWtoALL=False):
# For digi step - make sure we can add the digitisation/simulation arguments
# before we add this substep; allows Reco_tf to work without AtlasSimulation
try:
- from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addBasicDigiArgs, addPileUpTrfArgs, addCommonSimDigTrfArgs
+ from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addPileUpTrfArgs, addCommonSimDigTrfArgs
from SimuJobTransforms.SimTransformUtils import addDigitizationSubstep
- addBasicDigiArgs(trf.parser)
+ # NB "Basic Digi Args" are added by the overlay setup below, so no need for addBasicDigiArgs here
addForwardDetTrfArgs(trf.parser)
addPileUpTrfArgs(trf.parser)
addCommonSimDigTrfArgs(trf.parser)