From eaf59c5a75c8474b491e4d50229d61a71a890c18 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Wed, 25 Jan 2017 09:45:19 +0100
Subject: [PATCH] 2017-01-24 Jochen Meyer * RecoUsefulFlags.py: adjust
for move of muonCalibFlags to MuonCnvExample in 2013 * Tagging
RecExCommon-00-14-73 (RecExCommon-00-14-73)
* RecoUsefulFlags.py: adjust for move of muonCalibFlags to MuonCnvExample in 2013
* Tagging RecExCommon-00-14-73
2017-01-23 Mark Hodgkinson
* share/RecExCommon_topOptions.py; Add thinning of CaloCluster for AOD reduction task force
* Tagging RecExCommon-00-14-72
2017-01-23 Mark Hodgkinson
* share/RecExCommon_topOptions.py: Remove deprecated include of DetectorStatus/DetStatusSvc_CondDB.py
* ATLASRECTS-3849
* Tagging RecExCommon-00-14-71
2017-01-13 Mark Hodgkinson
* share/RecExCommon_topOptions.py: Apply patch file from James Catmore to implement AOD reduction task force updates
* Tagging RecExCommon-00-14-70
---
.../RecExCommon/share/RecExCommon_topOptions.py | 16 ++++++++--------
.../RecExCommon/share/RecoUsefulFlags.py | 3 +--
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index f1d6a9dd924c..943d1274a8f7 100755
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -153,14 +153,6 @@ if rec.LoadGeometry():
protectedInclude( "PartPropSvc/PartPropSvc.py" )
include.block( "PartPropSvc/PartPropSvc.py" )
-# Detector Status
-if rec.doDetStatus() and not athenaCommonFlags.isOnline():
- try:
- include("DetectorStatus/DetStatusSvc_CondDB.py")
- except Exception:
- treatException("Could not load DetStatusSvc_CondDb !")
- rec.doFileMetaData=False
-
if rec.doFileMetaData():
## compute ESD item list (in CILMergedESD )
protectedInclude ( "RecExPers/RecoOutputMetadataList_jobOptions.py" )
@@ -1428,6 +1420,14 @@ if rec.doWriteAOD():
if AODFlags.TauTrackSlimmer:
protectedInclude("tauRec/tauMerged_trackslim_jobOptions.py")
+ if rec.doTruth() and AODFlags.ThinGeantTruth:
+ from ThinningUtils.ThinGeantTruth import ThinGeantTruth
+ ThinGeantTruth()
+
+ if AODFlags.ThinNegativeEnergyCaloClusters:
+ from ThinningUtils.ThinNegativeEnergyCaloClusters import ThinNegativeEnergyCaloClusters
+ ThinNegativeEnergyCaloClusters()
+
# Doens't exist in xAOD world:
# if AODFlags.TrackParticleSlimmer or AODFlags.TrackParticleLastHitAndPerigeeSlimmer:
# from PrimaryDPDMaker.PrimaryDPDMakerConf import SlimTrackInfo
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecoUsefulFlags.py b/Reconstruction/RecExample/RecExCommon/share/RecoUsefulFlags.py
index 8b70ac5280a2..cacc91d6feea 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecoUsefulFlags.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecoUsefulFlags.py
@@ -68,11 +68,10 @@ except Exception:
print "WARNING could not load muonCnvFlags"
try:
- from MuonCalibAlgs.MuonCalibFlags import muonCalibFlags
+ from MuonCnvExample.MuonCalibFlags import muonCalibFlags
except Exception:
print "WARNING could not load muonCalibFlags"
-
try:
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
except Exception:
--
GitLab