From c719978e53d7dbfce4ce9457c43a0ce755ce4d1a Mon Sep 17 00:00:00 2001
From: Jovan Mitrevski <jovan.mitrevski@cern.ch>
Date: Fri, 27 May 2016 10:32:05 +0200
Subject: [PATCH] remove unneeded debug printout that caused issues
(AODFix-00-03-22)
* python/AODFix.py: remove unneeded debug printout that caused problems
* tagging AODFix-00-03-22
2016-05-18 Edward.Moyse@cern.ch
* Re-enable muon fix.
* Added AODFix_r21.py (so I don't forget to put the AODfix in there too)
* tag AODFix-00-03-21
---
Reconstruction/AODFix/python/AODFix.py | 6 ++-
Reconstruction/AODFix/python/AODFix_r207.py | 16 ++++++--
Reconstruction/AODFix/python/AODFix_r21.py | 41 +++++++++++++++++++++
3 files changed, 58 insertions(+), 5 deletions(-)
create mode 100644 Reconstruction/AODFix/python/AODFix_r21.py
diff --git a/Reconstruction/AODFix/python/AODFix.py b/Reconstruction/AODFix/python/AODFix.py
index 818c86df465b..6d3b5af99299 100644
--- a/Reconstruction/AODFix/python/AODFix.py
+++ b/Reconstruction/AODFix/python/AODFix.py
@@ -28,6 +28,7 @@ from AODFix_base import AODFix_base
from AODFix_r191 import AODFix_r191
from AODFix_r201 import AODFix_r201
from AODFix_r207 import AODFix_r207
+from AODFix_r21 import AODFix_r21
_aodFixInstance = AODFix_base()
@@ -173,8 +174,11 @@ def AODFix_Init():
(metadataOnly or rec.doApplyAODFix.is_locked() or
(prevReleaseSplit[0] == '20' and prevReleaseSplit[1] == '7'))):
_aodFixInstance = AODFix_r207(prevAODFix, metadataOnly, rec.doApplyAODFix.is_locked())
+ elif (curReleaseSplit[0] == '21' and curReleaseSplit[1] == '0' and
+ (metadataOnly or rec.doApplyAODFix.is_locked() or
+ (prevReleaseSplit[0] == '21' and prevReleaseSplit[1] == '0'))):
+ _aodFixInstance = AODFix_r21(prevAODFix, metadataOnly, rec.doApplyAODFix.is_locked())
else:
- print curReleaseSplit[0],curReleaseSplit[1],metadataOnly,rec.doApplyAODFix.is_locked(),prevReleaseSplit[0],prevReleaseSplit[1]
logAODFix.info("No AODFix scheduled for this release.")
# file produced by nightly ?
diff --git a/Reconstruction/AODFix/python/AODFix_r207.py b/Reconstruction/AODFix/python/AODFix_r207.py
index 235761236b0b..fae2287f1fd1 100644
--- a/Reconstruction/AODFix/python/AODFix_r207.py
+++ b/Reconstruction/AODFix/python/AODFix_r207.py
@@ -20,8 +20,17 @@ class AODFix_r207(AODFix_base):
@staticmethod
def latestAODFixVersion():
"""The latest version of the AODFix."""
- return "r207v2"
-
+ return "r207v3"
+
+ def muon_postSystemRec(self, topSequence):
+ """This fixes the muon momenta to match that of its primary TrackParticle.
+ JIRA: https://its.cern.ch/jira/browse/ATLASRECTS-3121
+ Reco meeting: https://indico.cern.ch/event/532806/
+ Incremented version to r207v3.
+ """
+ from xAODMuonCnv.xAODMuonCnvConf import xAOD__MuonAODFixAlg
+ topSequence+=xAOD__MuonAODFixAlg()
+
def postSystemRec(self):
if self.doAODFix:
@@ -568,5 +577,4 @@ class AODFix_r207(AODFix_base):
ParticleFlowJetSequence += METMakerAlg_PF
# Muon AODfix
- #from xAODMuonCnv.xAODMuonCnvConf import xAOD__MuonAODFixAlg
- #topSequence+=xAOD__MuonAODFixAlg()
+ self.muon_postSystemRec(topSequence)
diff --git a/Reconstruction/AODFix/python/AODFix_r21.py b/Reconstruction/AODFix/python/AODFix_r21.py
new file mode 100644
index 000000000000..5adbdef4d8b3
--- /dev/null
+++ b/Reconstruction/AODFix/python/AODFix_r21.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+
+from AthenaCommon.Logging import logging
+
+logAODFix_r21 = logging.getLogger( 'AODFix_r21' )
+
+from AODFix_base import AODFix_base
+
+class AODFix_r21(AODFix_base):
+ ''' This class just performs AODFix on 21.0.X releases
+
+ Instance variables
+ addMetadata (bool) (inherited): whether to add metaData
+ doAODFix (bool) (inherited): whether to do AODFix
+ prevAODFix (string): previous AODFix applied
+ newAODFix (string): new AODFix to apply
+ '''
+
+ @staticmethod
+ def latestAODFixVersion():
+ """The latest version of the AODFix."""
+ return "r21v1"
+
+ def muon_postSystemRec(self, topSequence):
+ """This fixes the muon momenta to match that of its primary TrackParticle.
+ JIRA: https://its.cern.ch/jira/browse/ATLASRECTS-3121
+ Reco meeting: https://indico.cern.ch/event/532806/
+ Incremented version to r21v1.
+ """
+ from xAODMuonCnv.xAODMuonCnvConf import xAOD__MuonAODFixAlg
+ topSequence+=xAOD__MuonAODFixAlg()
+
+
+ def postSystemRec(self):
+ if self.doAODFix:
+
+ logAODFix_r21.debug("Executing AODFix_r21_postSystemRec")
+
+ # Muon AODfix
+ self.muon_postSystemRec(topSequence)
--
GitLab