From 5fd7df32c6a8deff40e609a8aaf1fc523e686a2d Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 18 Dec 2018 22:08:01 +0100
Subject: [PATCH] JetRec: Fix q220 test.

The PFO tools are now private.  That implies that we need to set propery
overrides in ctm.modifiersMap _before_ the corresponding call
to ctm.buildConstitModifSequence, or we override will not be effective.
---
 .../Jet/JetRec/python/JetRecStandardTools.py       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
index b9605faae43..e3c1b11dae8 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # JetRecStandardTools.py
 #
@@ -358,18 +358,18 @@ ctm.add( CorrectPFOTool("CorrectPFOTool",
 ctm.add( ChargedHadronSubtractionTool("CHSTool", InputType = xAOD.Type.ParticleFlow),
          alias = 'chsPFO' )
 
-# Run the above tools to modify PFO
-jtm += ctm.buildConstitModifSequence( "JetConstitSeq_PFlowCHS",
-                                      InputContainer = "JetETMiss",
-                                      OutputContainer = "CHS",  #"ParticleFlowObjects" will be appended later
-                                      modList = ['correctPFO', 'chsPFO'] )
-
 # Options to disable dependence on primary vertex container
 # for PFO corrections (e.g. when running cosmics)
 if not jetFlags.useTracks:
   ctm.modifiersMap['correctPFO'].CorrectNeutral=False
   ctm.modifiersMap['chsPFO'].IgnoreVertex=True
 
+# Run the above tools to modify PFO
+jtm += ctm.buildConstitModifSequence( "JetConstitSeq_PFlowCHS",
+                                      InputContainer = "JetETMiss",
+                                      OutputContainer = "CHS",  #"ParticleFlowObjects" will be appended later
+                                      modList = ['correctPFO', 'chsPFO'] )
+
 # EM-scale pflow.
 jtm += PseudoJetGetter(
   "empflowget",
-- 
GitLab