From 3a80e7fb4131a164023167838cbac3e1424e5ebc Mon Sep 17 00:00:00 2001 From: Uttiya Sarkar Date: Thu, 5 Jun 2025 20:36:56 +0200 Subject: [PATCH] fix:removal from the scheduler fix:Duplicate DeepCSV path removal, onnx model update bug:readded deleted L1 fragments Fix: onnx update and deepcsv duplicate path removal --- .../hltPfDeepFlavourJetTagsModEta2p4_cfi.py | 2 +- .../modules/hltPfDeepFlavourJetTags_cfi.py | 2 +- ..._30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py | 39 ----------------- ..._45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py | 43 ------------------- .../Configuration/python/HLT_75e33_cff.py | 4 -- 5 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTagsModEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTagsModEta2p4_cfi.py index 47bafe0743714..0204a3d7f3872 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTagsModEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTagsModEta2p4_cfi.py @@ -17,7 +17,7 @@ 'input_5' ), mightGet = cms.optional.untracked.vstring, - model_path = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourV02_PhaseII/DeepJet_retraining_phase2_new_inputs.onnx'), + model_path = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourV03_PhaseII/Deepjet_FixedSoftmaxLayer.onnx'), output_names = cms.vstring(), src = cms.InputTag("hltPfDeepFlavourTagInfosModEta2p4") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTags_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTags_cfi.py index bae231ffdf67f..0874b55da7ce7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTags_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourJetTags_cfi.py @@ -17,7 +17,7 @@ 'input_5' ), mightGet = cms.optional.untracked.vstring, - model_path = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourV02_PhaseII/DeepJet_retraining_phase2_new_inputs.onnx'), + model_path = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourV03_PhaseII/Deepjet_FixedSoftmaxLayer.onnx'), output_names = cms.vstring(), src = cms.InputTag("hltPfDeepFlavourTagInfos") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py deleted file mode 100644 index 038072ee9ac8c..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ /dev/null @@ -1,39 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hlt1PFPuppiCentralJet70MaxEta2p4_cfi import * -from ..modules.hlt2PFPuppiCentralJet40MaxEta2p4_cfi import * -from ..modules.hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4_cfi import * -from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * -from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * -from ..modules.hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi import * -from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.HLTHgcalLocalRecoSequence_cfi import * -from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * -from ..sequences.HLTBeginSequence_cfi import * -from ..sequences.HLTBtagDeepCSVSequencePFPuppiModEta2p4_cfi import * -from ..sequences.HLTEndSequence_cfi import * -from ..sequences.HLTMuonsSequence_cfi import * -from ..sequences.HLTParticleFlowSequence_cfi import * -from ..sequences.HLTTrackingSequence_cfi import * -from ..sequences.HLTLocalrecoSequence_cfi import * -from ..sequences.HLTRawToDigiSequence_cfi import * - -HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path( - HLTBeginSequence - + hltL1SeedsForQuadPuppiJetTripleBtagFilter - + HLTRawToDigiSequence - + HLTHgcalLocalRecoSequence - + HLTLocalrecoSequence - + HLTTrackingSequence - + HLTMuonsSequence - + HLTParticleFlowSequence - + HLTAK4PFPuppiJetsReconstruction - + hltPFPuppiCentralJetQuad30MaxEta2p4 - + hlt1PFPuppiCentralJet70MaxEta2p4 - + hlt2PFPuppiCentralJet40MaxEta2p4 - + hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4 - + hltPFPuppiCentralJetsQuad30HT200MaxEta2p4 - + HLTBtagDeepCSVSequencePFPuppiModEta2p4 - + hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4 - + HLTEndSequence -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py deleted file mode 100644 index 65e5dc6ce5e18..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ /dev/null @@ -1,43 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hlt1PFPuppiCentralJet75MaxEta2p4_cfi import * -from ..modules.hlt2PFPuppiCentralJet60MaxEta2p4_cfi import * -from ..modules.hlt3PFPuppiCentralJet45MaxEta2p4_cfi import * -from ..modules.hlt4PFPuppiCentralJet40MaxEta2p4_cfi import * -from ..modules.hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4_cfi import * -from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * -from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * -from ..modules.hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi import * -from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.HLTHgcalLocalRecoSequence_cfi import * -from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * -from ..sequences.HLTBeginSequence_cfi import * -from ..sequences.HLTBtagDeepCSVSequencePFPuppiModEta2p4_cfi import * -from ..sequences.HLTEndSequence_cfi import * -from ..sequences.HLTMuonsSequence_cfi import * -from ..sequences.HLTParticleFlowSequence_cfi import * -from ..sequences.HLTTrackingSequence_cfi import * -from ..sequences.HLTLocalrecoSequence_cfi import * -from ..sequences.HLTRawToDigiSequence_cfi import * - -HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path( - HLTBeginSequence - + hltL1SeedsForQuadPuppiJetTripleBtagFilter - + HLTRawToDigiSequence - + HLTHgcalLocalRecoSequence - + HLTLocalrecoSequence - + HLTTrackingSequence - + HLTMuonsSequence - + HLTParticleFlowSequence - + HLTAK4PFPuppiJetsReconstruction - + hltPFPuppiCentralJetQuad30MaxEta2p4 - + hlt1PFPuppiCentralJet75MaxEta2p4 - + hlt2PFPuppiCentralJet60MaxEta2p4 - + hlt3PFPuppiCentralJet45MaxEta2p4 - + hlt4PFPuppiCentralJet40MaxEta2p4 - + hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4 - + hltPFPuppiCentralJetsQuad30HT330MaxEta2p4 - + HLTBtagDeepCSVSequencePFPuppiModEta2p4 - + hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4 - + HLTEndSequence -) diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index 703d14033915c..d27561784ab98 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -120,9 +120,7 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Mu37_Mu27_FromL1TkMuon_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Mu50_FromL1TkMuon_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi") @@ -364,8 +362,6 @@ fragment.L1T_PFHT400PT30_QuadPFPuppiJet_70_55_40_40_2p4, fragment.L1T_DoublePFPuppiJets112_2p4_DEta1p6, - fragment.HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4, - fragment.HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4, fragment.HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4, fragment.HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4, fragment.HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4,