diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/for_compare.yaml b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/for_compare.yaml index d2d27ce55c5e083d86c6601c381da401b62c5868..707b3b4b2c60dc33f22e4047c10df71ce5985947 100644 --- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/for_compare.yaml +++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/for_compare.yaml @@ -111,3 +111,4 @@ Output: jet_: 'OutJets' met_: 'AnaMET' '': 'EventInfo' + commands: ['disable jet_select_jvt.*'] diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py index e972acc52e0b806363168c5da49e403bdffd3ce6..2e487427feb5488b791b2b76fa41e0a640b7ae04 100644 --- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py +++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py @@ -186,7 +186,10 @@ def makeSequenceOld (dataType, algSeq, forCompare, isPhyslite, noPhysliteBroken, algSeq += jvtSequence vars += ['OutJets_%SYS%.pt -> jet_pt_%SYS%', 'OutJets_NOSYS.phi -> jet_phi', - 'OutJets_NOSYS.eta -> jet_eta', ] + 'OutJets_NOSYS.eta -> jet_eta' + ] + if not forCompare: + vars += ['OutJets_%SYS%.jvt_selection -> jet_select_jvt_%SYS%'] if dataType != 'data' : vars += [ 'OutJets_%SYS%.jvt_effSF_%SYS% -> jet_jvtEfficiency_%SYS%', ] vars += [ @@ -844,6 +847,8 @@ def makeSequenceBlocks (dataType, algSeq, forCompare, isPhyslite, noPhysliteBrok configSeq.setOptionValue ('.vars', vars) configSeq.setOptionValue ('.metVars', metVars) configSeq.setOptionValue ('.containers', outputContainers) + if forCompare: + configSeq.setOptionValue ('.commands', ['disable jet_select_jvt.*']) configAccumulator = ConfigAccumulator (algSeq, dataType, isPhyslite, geometry, autoconfigFromFlags=autoconfigFromFlags) configSeq.fullConfigure (configAccumulator) diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py index 4ae6e72ec78cec692e177ea0facf510a057a0f82..5b61dddfb3202837a8a6dcb3d397667f4e4e0cf4 100644 --- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py +++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py @@ -239,6 +239,7 @@ class SmallRJetAnalysisConfig (ConfigBlock) : alg.selectionTool.MaxPtForJvt = 60e3 if self.jetInput == "EMPFlow" else 120e3 alg.selectionDecoration = "jvt_selection,as_char" alg.particles = config.readName(self.containerName) + config.addOutputVar(self.containerName, 'jvt_selection', 'select_jvt') if self.runJvtEfficiency and config.dataType() is not DataType.Data: alg = config.createAlgorithm( 'CP::JvtEfficiencyAlg', 'JvtEfficiencyAlg'+postfix ) @@ -265,6 +266,7 @@ class SmallRJetAnalysisConfig (ConfigBlock) : alg.particles = config.readName(self.containerName) alg = config.createAlgorithm( 'CP::JvtEfficiencyAlg', 'ForwardJvtEfficiencyAlg' ) config.addSelection (self.containerName, 'fjvt', 'fjvt_selection,as_char', preselection=False) + config.addOutputVar(self.containerName, 'fjvt_selection', 'select_fjvt') if self.runFJvtEfficiency and self.config.dataType() is not DataType.Data: alg = config.createAlgorithm( 'CP::JvtEfficiencyAlg', 'FJvtEfficiencyAlg'+postfix )