From a6d927c28e495696190e02c9ec62886a34bd6293 Mon Sep 17 00:00:00 2001 From: Dan Guest Date: Tue, 29 Mar 2022 11:32:31 +0200 Subject: [PATCH 1/3] Remove MV2c10 expressions --- PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py | 2 +- PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py index 5267cd40352..73386c9b6a8 100644 --- a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py +++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py @@ -21,7 +21,7 @@ DRAW_TOPSLMU_Seq = CfgMgr.AthSequencer("DRAW_TOPSLMU_Seq") # FixedCutBEff_77 for btag sel_muon = 'Muons.pt > 30.0*GeV && abs(Muons.eta) < 2.5 && (Muons.quality == 0)' sel_jet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5' -sel_bjet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5 && BTagging_AntiKt4EMTopo.MV2c10_discriminant>0.645925' +sel_bjet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5' sel_el = 'Electrons.pt > 20*GeV && ( Electrons.Loose || Electrons.LHLoose ) && abs( Electrons.eta) < 2.47' #met = 'MET_Reference_AntiKt4EMTopo["FinalClus"].met > 55*GeV' diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py index f61cf6ccf3a..ae6da2e2aee 100644 --- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py +++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py @@ -26,7 +26,7 @@ sel_muon = 'Muons.pt > 24*GeV && Muons.ptcone20/Muons.pt < 0.2' from AthenaCommon.BFieldFlags import jobproperties if jobproperties.BField.solenoidOn(): PerfDPD_TtbarMuon_log.info( "Configuring b-tagging selection with solenoid on" ) - sel_bjet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5 && BTagging_AntiKt4EMTopo.MV2c10_discriminant>0.0314' + sel_bjet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5' else: PerfDPD_TtbarMuon_log.info( "Configuring b-tagging selection with solenoid off" ) sel_bjet = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5' -- GitLab From aad67ee2179316dfea7f4a14ad6755b010fdf43d Mon Sep 17 00:00:00 2001 From: Dan Guest Date: Tue, 29 Mar 2022 11:37:04 +0200 Subject: [PATCH 2/3] Remove MV2c10 from online monitoring --- .../TrigBjetHypo/python/TrigBjetMonitoringConfig.py | 2 -- .../TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx | 6 +----- .../TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py index 121828fc2b7..746c65ac453 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py +++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py @@ -67,8 +67,6 @@ def TrigBjetOnlineMonitoring(name="TrigBjetOnlineMonitoring"): # B-Tagging Histograms for tagger in ['IP2D', 'IP3D', 'DL1r', 'rnnip']: make_flavor_hists(montool, tagger) - montool.defineHistogram('MV2c10_discriminant', title="MV2c10 Score", xbins = default_bin_count, xmin=-1, xmax=1, path='EXPERT', type='TH1F') - montool.defineHistogram('JetFitter_N2Tpair', title='JetFitter: Number of 2-Track Pairs', diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx index 2243a34d35d..784419ea883 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx @@ -486,16 +486,12 @@ StatusCode TrigBjetBtagHypoAlg::monitor_btagging( const ElementLinkVector< xAOD: monitor_for_JetFitterSecondaryVertex_averageAllJetTrackRelativeEta ); - // Monitor MV2c10 - MONITOR_BTAG_AUX_VAR(MV2c10_discriminant, float, bTaggingEL); - auto monitor_group_for_btagging = Monitored::Group( m_monTool, monitor_for_JetFitter_isDefaults, monitor_for_SV1_isDefaults, monitor_for_IP2D_isDefaults, monitor_for_IP3D_isDefaults, - monitor_for_JetFitterSecondaryVertex_isDefaults, - monitor_for_MV2c10_discriminant + monitor_for_JetFitterSecondaryVertex_isDefaults ); return StatusCode::SUCCESS; diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py index abe3de31034..f99cd4fa958 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py @@ -181,10 +181,6 @@ ConfigFlags.Trigger.EDMVersion = 3 # Some legacy b-tagging configuration is trigger specific ConfigFlags.BTagging.databaseScheme = 'Trig' ConfigFlags.BTagging.forcedCalibrationChannel = 'AntiKt4EMTopo' -# something is asking for MV2 :'( -# TODO: remove whatever it is, see ATR-25239 -# Note: for some reason append(...) doesn't work here, but += [...] does -ConfigFlags.BTagging.taggerList += ['MV2c10'] # Set final Cond/Geo tag based on input file, command line or default globalflags.DetDescrVersion = opt.setDetDescr or ConfigFlags.Trigger.OnlineGeoTag -- GitLab From dfb07a9535d7ee059e857db1f0ec8a7bbf1ebdf9 Mon Sep 17 00:00:00 2001 From: Dan Guest Date: Tue, 29 Mar 2022 11:43:17 +0200 Subject: [PATCH 3/3] Fix import for renamed function --- .../JetTagging/JetTagAlgs/BTagging/python/BTagESD.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py index f306d65abdf..201efc41463 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py @@ -4,7 +4,9 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.BTagTrackAugmenterAlgConfig import BTagTrackAugmenterAlgCfg -from BTagging.BTagHighLevelAugmenterAlgConfig import BTagHighLevelAugmenterAlgCfg +from FlavorTagDiscriminants.BTagJetAugmenterAlgConfig import ( + BTagJetAugmenterAlgCfg) + from BTagging.HighLevelBTagAlgConfig import HighLevelBTagAlgCfg def RenameInputContainerCfg(suffix): @@ -73,7 +75,7 @@ def RunHighLevelTaggersCfg(inputFlags, jet, tracks, Associator, taggers): result = ComponentAccumulator() BTagCollection = inputFlags.BTagging.OutputFiles.Prefix+JetCollection - result.merge(BTagHighLevelAugmenterAlgCfg(inputFlags, JetCollection=jet, BTagCollection=BTagCollection, Associator=Associator, TrackCollection=tracks) ) + result.merge(BTagJetAugmenterAlgCfg(inputFlags, JetCollection=jet, BTagCollection=BTagCollection, Associator=Associator, TrackCollection=tracks) ) for dl2 in taggers: result.merge(HighLevelBTagAlgCfg(inputFlags, BTagCollection, TrackCollection=tracks, NNFile=dl2) ) -- GitLab