Properly apply pt cut in analysis sequences

PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/ElectronAnalysisSequence.py

@@ -297,14 +297,6 @@ def makeElectronWorkingPointSequence( seq, dataType, workingPoint,
                     dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])} )
         pass
 
-    # Set up an algorithm used for decorating baseline electron selection:
-    alg = createAlgorithm( 'CP::AsgSelectionAlg',
-                           'ElectronSelectionSummary' + postfix )
-    alg.selectionDecoration = 'baselineSelection' + postfix + ',as_char'
-    seq.append( alg, inputPropName = 'particles',
-                stageName = 'selection',
-                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])} )
-
     # Set up the electron efficiency correction algorithm:
     alg = createAlgorithm( 'CP::ElectronEfficiencyCorrectionAlg',
                            'ElectronEfficiencyCorrectionAlg' + postfix )
@@ -327,3 +319,11 @@ def makeElectronWorkingPointSequence( seq, dataType, workingPoint,
                     stageName = 'efficiency',
                     dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])} )
         pass
+
+    # Set up an algorithm used for decorating baseline electron selection:
+    alg = createAlgorithm( 'CP::AsgSelectionAlg',
+                           'ElectronSelectionSummary' + postfix )
+    alg.selectionDecoration = 'baselineSelection' + postfix + ',as_char'
+    seq.append( alg, inputPropName = 'particles',
+                stageName = 'selection',
+                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNames"])} )

PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/PhotonAnalysisSequence.py

@@ -294,17 +294,6 @@ def makePhotonWorkingPointSequence( seq, dataType, workingPoint, postfix = '',
                     dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])} )
         pass
 
-    # Set up an algorithm used for decorating baseline photon selection:
-    alg = createAlgorithm( 'CP::AsgSelectionAlg',
-                           'PhotonSelectionSummary' + postfix )
-    alg.selectionDecoration = 'baselineSelection' + postfix + ',as_char'
-    seq.append( alg, inputPropName = 'particles',
-                stageName = 'selection',
-                metaConfig = {'selectionDecorNames' : [alg.selectionDecoration],
-                              'selectionDecorNamesOutput' : [alg.selectionDecoration],
-                              'selectionDecorCount' : [1]},
-                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])} )
-
     # Set up the photon efficiency correction algorithm.
     alg = createAlgorithm( 'CP::PhotonEfficiencyCorrectionAlg',
                            'PhotonEfficiencyCorrectionAlg' + postfix )
@@ -327,3 +316,11 @@ def makePhotonWorkingPointSequence( seq, dataType, workingPoint, postfix = '',
         pass
 
     pass
+
+    # Set up an algorithm used for decorating baseline photon selection:
+    alg = createAlgorithm( 'CP::AsgSelectionAlg',
+                           'PhotonSelectionSummary' + postfix )
+    alg.selectionDecoration = 'baselineSelection' + postfix + ',as_char'
+    seq.append( alg, inputPropName = 'particles',
+                stageName = 'selection',
+                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNames"])} )

PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/python/MuonAnalysisSequence.py

@@ -247,5 +247,5 @@ def makeMuonWorkingPointSequence( seq, dataType, workingPoint, postfix = '',
     alg.selectionDecoration = 'baselineSelection' + postfix + ',as_char'
     seq.append( alg, inputPropName = 'particles',
                 stageName = 'selection',
-                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNamesOutput"])})
+                dynConfig = {'preselection' : lambda meta : "&&".join (meta["selectionDecorNames"])})
     pass