diff --git a/DQMOffline/Trigger/python/EgammaMonitoring_Client_cff.py b/DQMOffline/Trigger/python/EgammaMonitoring_Client_cff.py index b794b5301be4d..4a1dbecba2454 100644 --- a/DQMOffline/Trigger/python/EgammaMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/EgammaMonitoring_Client_cff.py @@ -14,8 +14,8 @@ def makeEGEffHistDef(baseName,filterName): "{0}_{1}_vsSCEtaPhi_eff '{1} Efficiency vs SC #eta/#phi;#eta_{{SC}};#phi [rad];' {0}_{1}_vsSCEtaPhi_pass {0}_{1}_vsSCEtaPhi_tot".format(baseName,filterName)] def makeAllEGEffHistDefs(): - baseNames=["eleWPTightTag","eleWPTightTag-HEP17","eleWPTightTag-HEM17"] - filterNames=["hltEle33CaloIdLMWPMS2Filter","hltDiEle33CaloIdLMWPMS2UnseededFilter","hltEG300erFilter","hltEG70HEFilter","hltDiEG70HEUnseededFilter","hltEG85HEFilter","hltDiEG85HEUnseededFilter","hltEG30EIso15HE30EcalIsoLastFilter","hltEG18EIso15HE30EcalIsoUnseededFilter","hltEle23Ele12CaloIdLTrackIdLIsoVLTrackIsoLeg1Filter","hltEle23Ele12CaloIdLTrackIdLIsoVLTrackIsoLeg2Filter","hltEle27WPTightGsfTrackIsoFilter","hltEle32WPTightGsfTrackIsoFilter","hltEle35noerWPTightGsfTrackIsoFilter","hltEle38noerWPTightGsfTrackIsoFilter","hltEle27L1DoubleEGWPTightGsfTrackIsoFilter","hltEle32L1DoubleEGWPTightGsfTrackIsoFilter","hltEG25L1EG18HEFilter","hltEG33L1EG26HEFilter","hltEG50HEFilter","hltEG75HEFilter","hltEG90HEFilter","hltEG120HEFilter","hltEG150HEFilter","hltEG175HEFilter","hltEG200HEFilter","hltSingleCaloJet500","hltSingleCaloJet550","hltEle28HighEtaSC20TrackIsoFilter","hltEle50CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle115CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle135CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle145CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle200CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle250CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle300CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle20WPLoose1GsfTrackIsoFilter","hltEle20erWPLoose1GsfTrackIsoFilter","hltEle20WPTightGsfTrackIsoFilter","hltEle27L1DoubleEGWPTightEcalIsoFilter","hltDiEle27L1DoubleEGWPTightEcalIsoFilter","hltEle27CaloIdLMWPMS2Filter","hltDiEle27CaloIdLMWPMS2UnseededFilter","hltEle25CaloIdLMWPMS2Filter","hltDiEle25CaloIdLMWPMS2UnseededFilter","hltEle27CaloIdLMWPMS2Filter","hltDiEle27CaloIdLMWPMS2UnseededFilter","hltEle37CaloIdLMWPMS2UnseededFilter","hltSingleEle35WPTightGsfL1EGMTTrackIsoFilter" + baseNames=["eleWPTightTag"] + filterNames=["hltEle33CaloIdLMWPMS2Filter","hltDiEle33CaloIdLMWPMS2UnseededFilter","hltEG300erFilter","hltEG70HEFilter","hltDiEG70HEUnseededFilter","hltEG85HEFilter","hltDiEG85HEUnseededFilter","hltEG30EIso15HE30EcalIsoLastFilter","hltEG18EIso15HE30EcalIsoUnseededFilter","hltEle23Ele12CaloIdLTrackIdLIsoVLTrackIsoLeg1Filter","hltEle23Ele12CaloIdLTrackIdLIsoVLTrackIsoLeg2Filter","hltEle30WPTightGsfTrackIsoFilter","hltEle32WPTightGsfTrackIsoFilter","hltEle35noerWPTightGsfTrackIsoFilter","hltEle38noerWPTightGsfTrackIsoFilter","hltEle32L1DoubleEGWPTightGsfTrackIsoFilter","hltEG33L1EG26HEFilter","hltEG50HEFilter","hltEG75HEFilter","hltEG90HEFilter","hltEG120HEFilter","hltEG150HEFilter","hltEG175HEFilter","hltEG200HEFilter","hltSingleCaloJet500","hltSingleCaloJet550","hltEle28HighEtaSC20TrackIsoFilter","hltEle50CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle115CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle135CaloIdVTGsfTrkIdTGsfDphiFilter","hltEle27L1DoubleEGWPTightHcalIsoFilter","hltDiEle27L1DoubleEGWPTightHcalIsoFilter","hltEle25CaloIdLMWPMS2Filter","hltDiEle25CaloIdLMWPMS2UnseededFilter","hltEle27CaloIdLMWPMS2Filter","hltDiEle27CaloIdLMWPMS2UnseededFilter","hltEle27CaloIdLMWPMS2Filter","hltDiEle27CaloIdLMWPMS2UnseededFilter","hltEle37CaloIdLMWPMS2UnseededFilter" ] @@ -25,7 +25,7 @@ def makeAllEGEffHistDefs(): for filterName in filterNames: histDefs.extend(makeEGEffHistDef(baseName,filterName)) - baseNames=["eleWPTightTagPhoHighEtaProbe","eleWPTightTagPhoHighEtaProbe-HEM17","eleWPTightTagPhoHighEtaProbe-HEP17"] + baseNames=["eleWPTightTagPhoHighEtaProbe"] filterNames=["hltEle28HighEtaSC20Mass55Filter","hltEle28HighEtaSC20HcalIsoFilterUnseeded"] for baseName in baseNames: @@ -33,21 +33,21 @@ def makeAllEGEffHistDefs(): histDefs.extend(makeEGEffHistDef(baseName,filterName)) - baseNames=["eleWPTightTagPhoProbe","eleWPTightTagPhoProbe-HEM17","eleWPTightTagPhoProbe-HEP17"] + baseNames=["eleWPTightTagPhoProbe"] filterNames=["hltEG20CaloIdLV2ClusterShapeL1TripleEGFilter","hltTriEG20CaloIdLV2ClusterShapeUnseededFilter","hltEG20CaloIdLV2R9IdVLR9IdL1TripleEGFilter","hltTriEG20CaloIdLV2R9IdVLR9IdUnseededFilter","hltEG30CaloIdLV2ClusterShapeL1TripleEGFilter","hltEG10CaloIdLV2ClusterShapeUnseededFilter","hltDiEG30CaloIdLV2EtUnseededFilter","hltEG30CaloIdLV2R9IdVLR9IdL1TripleEGFilter","hltEG10CaloIdLV2R9IdVLR9IdUnseededFilter","hltDiEG30CaloIdLV2R9IdVLEtUnseededFilter","hltEG35CaloIdLV2R9IdVLR9IdL1TripleEGFilter","hltEG5CaloIdLV2R9IdVLR9IdUnseededFilter","hltDiEG35CaloIdLV2R9IdVLEtUnseededFilter"] for baseName in baseNames: for filterName in filterNames: histDefs.extend(makeEGEffHistDef(baseName,filterName)) - baseNames=["muonIsoMuTagPhoProbe","muonIsoMuTagPhoProbe-HEM17","muonIsoMuTagPhoProbe-HEP17"] + baseNames=["muonIsoMuTagPhoProbe"] filterNames=["hltMu12DiEG20HEUnseededFilter"] for baseName in baseNames: for filterName in filterNames: histDefs.extend(makeEGEffHistDef(baseName,filterName)) - baseNames=["muonIsoMuTagEleProbe","muonIsoMuTagEleProbe-HEM17","muonIsoMuTagEleProbe-HEP17"] + baseNames=["muonIsoMuTagEleProbe"] filterNames=["hltMu12DiEG20HEUnseededFilter","hltEle27CaloIdLMWPMS2UnseededFilter","hltEle37CaloIdLMWPMS2UnseededFilter","hltEle33CaloIdLMWPMS2Filter","hltEle32WPTightGsfTrackIsoFilter","hltEle32L1DoubleEGWPTightGsfTrackIsoFilter"] for baseName in baseNames: for filterName in filterNames: diff --git a/DQMOffline/Trigger/python/HLTEGTnPMonitor_cfi.py b/DQMOffline/Trigger/python/HLTEGTnPMonitor_cfi.py index 2f80d54b89e6f..3397365f0afb3 100644 --- a/DQMOffline/Trigger/python/HLTEGTnPMonitor_cfi.py +++ b/DQMOffline/Trigger/python/HLTEGTnPMonitor_cfi.py @@ -4,10 +4,7 @@ etBinsStd=cms.vdouble(5,10,12.5,15,17.5,20,22.5,25,30,35,40,45,50,60,80,100,150,200,250,300,350,400) scEtaBinsStd = cms.vdouble(-2.5,-2.4,-2.3,-2.2,-2.1,-2.0,-1.9,-1.8,-1.7,-1.566,-1.4442,-1.3,-1.2,-1.1,-1.0,-0.9,-0.8,-0.7,-0.6,-0.5,-0.4,-0.3,-0.2,-0.1,0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.1,1.2,1.3,1.4442,1.566,1.7,1.8,1.9,2.0,2.1,2.2,2.3,2.4,2.5) -scEtaBinsHEP17 = cms.vdouble(1.3,1.4442,1.566,1.7,1.8,1.9,2.0,2.1,2.2,2.3,2.4,2.5) -scEtaBinsHEM17 = cms.vdouble(-2.5,-2.4,-2.3,-2.2,-2.1,-2.0,-1.9,-1.8,-1.7,-1.566,-1.4442,-1.3) phiBinsStd = cms.vdouble(-3.32,-2.97,-2.62,-2.27,-1.92,-1.57,-1.22,-0.87,-0.52,-0.18,0.18,0.52,0.87,1.22,1.57,1.92,2.27,2.62,2.97,3.32) -phiBinsHE17 = cms.vdouble(-0.87,-0.80,-0.73,-0.66,-0.59,-0.52) etRangeCut= cms.PSet( rangeVar=cms.string("et"), @@ -47,34 +44,29 @@ rangeVar=cms.string("scEta"), allowedRanges=cms.vstring("-2.5:-1.556","-1.4442:-1.3"), ) -hcalPhi17Cut = cms.PSet( - rangeVar=cms.string("phi"), - allowedRanges=cms.vstring("-0.87:-0.52"), - ) muonEtaCut=cms.PSet( rangeVar=cms.string("eta"), allowedRanges=cms.vstring("-2.4:2.4") ) -tagAndProbeConfigEle27WPTight = cms.PSet( +tagAndProbeConfigEleWPTight = cms.PSet( trigEvent = cms.InputTag("hltTriggerSummaryAOD","","HLT"), tagColl = cms.InputTag("gedGsfElectrons"), probeColl = cms.InputTag("gedGsfElectrons"), - tagVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Summer16-80X-V1-tight"), - probeVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Summer16-80X-V1-tight"), + tagVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"), + probeVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"), sampleTrigRequirements = cms.PSet( hltInputTag = cms.InputTag("TriggerResults","","HLT"), - hltPaths = cms.vstring("HLT_Ele27_WPTight_Gsf_v*","HLT_Ele32_WPTight_Gsf_v*","HLT_Ele35_WPTight_Gsf_v*" + hltPaths = cms.vstring("HLT_Ele30_WPTight_Gsf_v*","HLT_Ele32_WPTight_Gsf_v*","HLT_Ele35_WPTight_Gsf_v*" "HLT_Ele38_WPTight_Gsf_v*", - "HLT_Ele27_WPTight_Gsf_L1DoubleEG_v*","HLT_Ele32_WPTight_Gsf_L1DoubleEG_v*", + "HLT_Ele32_WPTight_Gsf_L1DoubleEG_v*", ) ), #it is intended that these are the filters of the triggers listed for sampleTrigRequirements - tagFilters = cms.vstring("hltEle27WPTightGsfTrackIsoFilter", + tagFilters = cms.vstring("hltEle30WPTightGsfTrackIsoFilter", "hltEle32WPTightGsfTrackIsoFilter" "hltEle35noerWPTightGsfTrackIsoFilter" "hltEle38noerWPTightGsfTrackIsoFilter" - "hltEle27L1DoubleEGWPTightGsfTrackIsoFilter", "hltEle32L1DoubleEGWPTightGsfTrackIsoFilter" ), tagFiltersORed = cms.bool(True), tagRangeCuts = cms.VPSet(ecalBarrelEtaCut), @@ -85,62 +77,29 @@ minMass = cms.double(70.0), maxMass = cms.double(110.0), requireOpSign = cms.bool(False), - - - ) -tagAndProbeConfigEle27WPTightHEP17 = tagAndProbeConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - hcalPosEtaCut, - hcalPhi17Cut, -)) -tagAndProbeConfigEle27WPTightHEM17 = tagAndProbeConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - hcalNegEtaCut, - hcalPhi17Cut, -)) + +) -tagAndProbeElePhoConfigEle27WPTight = tagAndProbeConfigEle27WPTight.clone( +tagAndProbeElePhoConfigEleWPTight = tagAndProbeConfigEleWPTight.clone( probeColl=cms.InputTag("gedPhotons"), - probeVIDCuts=cms.InputTag("cutBasedPhotonID-Spring16-V2p2-loose"), + probeVIDCuts=cms.InputTag("cutBasedPhotonID-RunIIIWinter22-122X-V1-loose"), minTagProbeDR=cms.double(0.1) ) -tagAndProbeElePhoConfigEle27WPTightHEP17 = tagAndProbeElePhoConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - hcalPosEtaCut, - hcalPhi17Cut, -)) -tagAndProbeElePhoConfigEle27WPTightHEM17 = tagAndProbeElePhoConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - hcalNegEtaCut, - hcalPhi17Cut, -)) - -tagAndProbeElePhoHighEtaConfigEle27WPTight = tagAndProbeConfigEle27WPTight.clone( +tagAndProbeElePhoHighEtaConfigEleWPTight = tagAndProbeConfigEleWPTight.clone( probeColl=cms.InputTag("gedPhotons"), - probeVIDCuts=cms.InputTag("cutBasedPhotonID-Spring16-V2p2-loose"), + probeVIDCuts=cms.InputTag("cutBasedPhotonID-RunIIIWinter22-122X-V1-loose"), probeRangeCuts = cms.VPSet(), minTagProbeDR=cms.double(0.1) ) -tagAndProbeElePhoHighEtaConfigEle27WPTightHEP17 = tagAndProbeElePhoHighEtaConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - ecalEndcapPosHighEtaCut, - hcalPhi17Cut, -)) -tagAndProbeElePhoHighEtaConfigEle27WPTightHEM17 = tagAndProbeElePhoHighEtaConfigEle27WPTight.clone( - probeRangeCuts = cms.VPSet( - ecalEndcapPosHighEtaCut, - hcalPhi17Cut, -)) - tagAndProbeMuonEleConfigIsoMu = cms.PSet( trigEvent = cms.InputTag("hltTriggerSummaryAOD","","HLT"), tagColl = cms.InputTag("muons"), probeColl = cms.InputTag("gedGsfElectrons"), tagVIDCuts = cms.InputTag("egmDQMSelectedMuons"), - probeVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Summer16-80X-V1-tight"), + probeVIDCuts = cms.InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"), sampleTrigRequirements = cms.PSet( hltInputTag = cms.InputTag("TriggerResults","","HLT"), hltPaths = cms.vstring("HLT_IsoMu27_v*") @@ -159,36 +118,11 @@ requireOpSign = cms.bool(False), ) -tagAndProbeMuonEleConfigIsoMuHEP17 = tagAndProbeMuonEleConfigIsoMu.clone( - probeRangeCuts = cms.VPSet( - hcalPosEtaCut, - hcalPhi17Cut, - ) - ) -tagAndProbeMuonEleConfigIsoMuHEM17 = tagAndProbeMuonEleConfigIsoMu.clone( - probeRangeCuts = cms.VPSet( - hcalNegEtaCut, - hcalPhi17Cut, - ) - ) tagAndProbeMuonPhoConfigIsoMu = tagAndProbeMuonEleConfigIsoMu.clone( probeColl=cms.InputTag("gedPhotons"), - probeVIDCuts=cms.InputTag("cutBasedPhotonID-Spring16-V2p2-loose"), + probeVIDCuts=cms.InputTag("cutBasedPhotonID-RunIIIWinter22-122X-V1-loose"), ) -tagAndProbeMuonPhoConfigIsoMuHEP17 = tagAndProbeMuonPhoConfigIsoMu.clone( - probeRangeCuts = cms.VPSet( - hcalPosEtaCut, - hcalPhi17Cut, - ) - ) -tagAndProbeMuonPhoConfigIsoMuHEM17 = tagAndProbeMuonPhoConfigIsoMu.clone( - probeRangeCuts = cms.VPSet( - hcalNegEtaCut, - hcalPhi17Cut, - ) - ) - egammaStdHistConfigs = cms.VPSet( cms.PSet( @@ -238,52 +172,6 @@ ) -egammaHEP17HistConfigs = cms.VPSet( - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("et"), - nameSuffex=cms.string("_vsEt"), - rangeCuts=cms.VPSet(), - binLowEdges=etBinsStd, - ), - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("scEta"), - nameSuffex=cms.string("_vsSCEta"), - rangeCuts=cms.VPSet(), - binLowEdges=scEtaBinsHEP17, - ), - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("phi"), - nameSuffex=cms.string("_vsPhi"), - rangeCuts=cms.VPSet(), - binLowEdges=phiBinsHE17, - ) -) -egammaHEM17HistConfigs = cms.VPSet( - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("et"), - nameSuffex=cms.string("_vsEt"), - rangeCuts=cms.VPSet(), - binLowEdges=etBinsStd, - ), - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("scEta"), - nameSuffex=cms.string("_vsSCEta"), - rangeCuts=cms.VPSet(), - binLowEdges=scEtaBinsHEM17, - ), - cms.PSet( - histType=cms.string("1D"), - vsVar=cms.string("phi"), - nameSuffex=cms.string("_vsPhi"), - rangeCuts=cms.VPSet(), - binLowEdges=phiBinsHE17, - ) -) egammaHighEtaHistConfigs = cms.VPSet( cms.PSet( histType=cms.string("1D"), @@ -368,7 +256,6 @@ histTitle = cms.string(""), tagExtraFilter = cms.string("hltEG85HEFilter"), ), - cms.PSet( folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DiSC30_18_EIso_AND_HE_Mass70"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("35:99999")),), @@ -398,9 +285,9 @@ tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele27_WPTight_Gsf"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), - filterName = cms.string("hltEle27WPTightGsfTrackIsoFilter"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele30_WPTight_Gsf"), + rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("33:99999")),), + filterName = cms.string("hltEle30WPTightGsfTrackIsoFilter"), histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), @@ -425,13 +312,6 @@ histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele27_WPTight_Gsf_L1DoubleEG"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), - filterName = cms.string("hltEle27L1DoubleEGWPTightGsfTrackIsoFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), cms.PSet( folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele32_WPTight_Gsf_L1DoubleEG"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("35:99999")),), @@ -439,14 +319,6 @@ histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Photon25"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("28:99999")),), - filterName = cms.string("hltEG25L1EG18HEFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Photon33"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("35:99999")),), @@ -504,14 +376,14 @@ tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_CaloJet500"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_CaloJet500_NoJetID"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("500:99999")),), filterName = cms.string("hltSingleCaloJet500"), histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_CaloJet550"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_CaloJet550_NoJetID"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("550:99999")),), filterName = cms.string("hltSingleCaloJet550"), histTitle = cms.string(""), @@ -546,67 +418,32 @@ tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele145_CaloIdVT_GsfTrkIdT"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("150:99999")),), - filterName = cms.string("hltEle145CaloIdVTGsfTrkIdTGsfDphiFilter"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DiEle27_WPTightCaloOnly_L1DoubleEG"), + rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), + filterName = cms.string("hltEle27L1DoubleEGWPTightHcalIsoFilter"), histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele200_CaloIdVT_GsfTrkIdT"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("210:99999")),), - filterName = cms.string("hltEle200CaloIdVTGsfTrkIdTGsfDphiFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele250_CaloIdVT_GsfTrkIdT"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("260:99999")),), - filterName = cms.string("hltEle250CaloIdVTGsfTrkIdTGsfDphiFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele300_CaloIdVT_GsfTrkIdT"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("310:99999")),), - filterName = cms.string("hltEle300CaloIdVTGsfTrkIdTGsfDphiFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele20_WPLoose_Gsf"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("25:99999")),), - filterName = cms.string("hltEle20WPLoose1GsfTrackIsoFilter"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DiEle27_WPTightCaloOnly_L1DoubleEG"), + rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), + filterName = cms.string("hltDiEle27L1DoubleEGWPTightEcalIsoFilter"), histTitle = cms.string(""), - tagExtraFilter = cms.string(""), + tagExtraFilter = cms.string("hltEle27L1DoubleEGWPTightHcalIsoFilter"), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele20_eta2p1_WPLoose_Gsf"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("25:99999")),), - filterName = cms.string("hltEle20erWPLoose1GsfTrackIsoFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele20_WPTight_Gsf"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("25:99999")),), - filterName = cms.string("hltEle20WPTightGsfTrackIsoFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DiEle27_WPTightCaloOnly_L1DoubleEG"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), - filterName = cms.string("hltEle27L1DoubleEGWPTightEcalIsoFilter"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DoubleEle25_CaloIdL_MW"), + rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("28:99999")),), + filterName = cms.string("hltEle25CaloIdLMWPMS2Filter"), histTitle = cms.string(""), tagExtraFilter = cms.string(""), ), cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DiEle27_WPTightCaloOnly_L1DoubleEG"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), - filterName = cms.string("hltDiEle27L1DoubleEGWPTightEcalIsoFilter"), + folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DoubleEle25_CaloIdL_MW"), + rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("28:99999")),), + filterName = cms.string("hltDiEle25CaloIdLMWPMS2UnseededFilter"), histTitle = cms.string(""), - tagExtraFilter = cms.string("hltEle27L1DoubleEGWPTightEcalIsoFilter"), + tagExtraFilter = cms.string("hltEle25CaloIdLMWPMS2Filter"), ), cms.PSet( folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DoubleEle27_CaloIdL_MW"), @@ -621,21 +458,7 @@ filterName = cms.string("hltDiEle27CaloIdLMWPMS2UnseededFilter"), histTitle = cms.string(""), tagExtraFilter = cms.string("hltEle27CaloIdLMWPMS2Filter"), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DoubleEle25_CaloIdL_MW"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("28:99999")),), - filterName = cms.string("hltEle25CaloIdLMWPMS2Filter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_DoubleEle25_CaloIdL_MW"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("28:99999")),), - filterName = cms.string("hltDiEle25CaloIdLMWPMS2UnseededFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string("hltEle25CaloIdLMWPMS2Filter"), - ), + ), cms.PSet( folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele27_Ele37_CaloIdL_MW"), rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("30:99999")),), @@ -656,14 +479,7 @@ filterName = cms.string("hltEle37CaloIdLMWPMS2UnseededFilter"), histTitle = cms.string(""), tagExtraFilter = cms.string("hltEle27CaloIdLMWPMS2Filter"), - ), - cms.PSet( - folderName = cms.string("HLT/EGM/TagAndProbeEffs/HLT_Ele35_WPTight_Gsf_L1EGMT"), - rangeCuts = cms.VPSet(etRangeCut.clone(allowedRanges=cms.vstring("38:99999")),), - filterName = cms.string("hltSingleEle35WPTightGsfL1EGMTTrackIsoFilter"), - histTitle = cms.string(""), - tagExtraFilter = cms.string(""), - ), + ) ) @@ -855,71 +671,32 @@ egHLTDQMOfflineTnPSource = DQMEDAnalyzer("HLTEleTagAndProbeOfflineSource", tagAndProbeCollections = cms.VPSet( cms.PSet( - tagAndProbeConfigEle27WPTight, + tagAndProbeConfigEleWPTight, histConfigs = egammaStdHistConfigs, baseHistName = cms.string("eleWPTightTag_"), filterConfigs = egammaStdFiltersToMonitor, - ), - cms.PSet( - tagAndProbeConfigEle27WPTightHEM17, - histConfigs = egammaHEM17HistConfigs, - baseHistName = cms.string("eleWPTightTag-HEM17_"), - filterConfigs = egammaStdFiltersToMonitor, - ), - cms.PSet( - tagAndProbeConfigEle27WPTightHEP17, - histConfigs = egammaHEP17HistConfigs, - baseHistName = cms.string("eleWPTightTag-HEP17_"), - filterConfigs = egammaStdFiltersToMonitor, - ), - + ), ) ) egHLTElePhoHighEtaDQMOfflineTnPSource = DQMEDAnalyzer("HLTElePhoTagAndProbeOfflineSource", tagAndProbeCollections = cms.VPSet( cms.PSet( - tagAndProbeElePhoHighEtaConfigEle27WPTight, + tagAndProbeElePhoHighEtaConfigEleWPTight, histConfigs = egammaHighEtaHistConfigs, baseHistName = cms.string("eleWPTightTagPhoHighEtaProbe_"), filterConfigs = egammaPhoHighEtaFiltersToMonitor, - ), - cms.PSet( - tagAndProbeElePhoHighEtaConfigEle27WPTightHEM17, - histConfigs = egammaHighEtaHistConfigs, - baseHistName = cms.string("eleWPTightTagPhoHighEtaProbe-HEM17_"), - filterConfigs = egammaPhoHighEtaFiltersToMonitor, - ), - cms.PSet( - tagAndProbeElePhoHighEtaConfigEle27WPTightHEP17, - histConfigs = egammaHighEtaHistConfigs, - baseHistName = cms.string("eleWPTightTagPhoHighEtaProbe-HEP17_"), - filterConfigs = egammaPhoHighEtaFiltersToMonitor, - ), - + ), ) - ) +) egHLTElePhoDQMOfflineTnPSource = DQMEDAnalyzer("HLTElePhoTagAndProbeOfflineSource", tagAndProbeCollections = cms.VPSet( cms.PSet( - tagAndProbeElePhoConfigEle27WPTight, + tagAndProbeElePhoConfigEleWPTight, histConfigs = egammaStdHistConfigs, baseHistName = cms.string("eleWPTightTagPhoProbe_"), filterConfigs = egammaPhoFiltersToMonitor, - ), - cms.PSet( - tagAndProbeElePhoConfigEle27WPTightHEM17, - histConfigs = egammaHEM17HistConfigs, - baseHistName = cms.string("eleWPTightTagPhoProbe-HEM17_"), - filterConfigs = egammaPhoFiltersToMonitor, - ), - cms.PSet( - tagAndProbeElePhoConfigEle27WPTightHEP17, - histConfigs = egammaHEM17HistConfigs, - baseHistName = cms.string("eleWPTightTagPhoProbe-HEP17_"), - filterConfigs = egammaPhoFiltersToMonitor, - ), - + ), ) ) @@ -930,20 +707,7 @@ histConfigs = egammaStdHistConfigs, baseHistName = cms.string("muonIsoMuTagEleProbe_"), filterConfigs = egammaMuEleFiltersToMonitor, - ), - cms.PSet( - tagAndProbeMuonEleConfigIsoMuHEM17, - histConfigs = egammaHEM17HistConfigs, - baseHistName = cms.string("muonIsoMuTagEleProbe-HEM17_"), - filterConfigs = egammaMuEleFiltersToMonitor, - ), - cms.PSet( - tagAndProbeMuonPhoConfigIsoMuHEP17, - histConfigs = egammaHEP17HistConfigs, - baseHistName = cms.string("muonIsoMuTagEleProbe-HEP17_"), - filterConfigs = egammaMuEleFiltersToMonitor, - ), - + ), ) ) egHLTMuonPhoDQMOfflineTnPSource = DQMEDAnalyzer("HLTMuPhoTagAndProbeOfflineSource", @@ -953,20 +717,7 @@ histConfigs = egammaStdHistConfigs, baseHistName = cms.string("muonIsoMuTagPhoProbe_"), filterConfigs = egammaMuPhoFiltersToMonitor, - ), - cms.PSet( - tagAndProbeMuonPhoConfigIsoMuHEM17, - histConfigs = egammaHEM17HistConfigs, - baseHistName = cms.string("muonIsoMuTagPhoProbe-HEM17_"), - filterConfigs = egammaMuPhoFiltersToMonitor, - ), - cms.PSet( - tagAndProbeMuonPhoConfigIsoMuHEP17, - histConfigs = egammaHEP17HistConfigs, - baseHistName = cms.string("muonIsoMuTagPhoProbe-HEP17_"), - filterConfigs = egammaMuPhoFiltersToMonitor, - ), - + ), ) ) @@ -979,8 +730,7 @@ #note: be careful here to when selecting new ids that the vid tools dont do extra setup for them #for example the HEEP cuts need an extra producer which vid tools automatically handles from PhysicsTools.SelectorUtils.tools.vid_id_tools import setupVIDSelection -my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Summer16_80X_V1_cff', - 'RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Fall17_94X_V1_cff'] +my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Winter22_122X_V1_cff'] for id_module_name in my_id_modules: idmod= __import__(id_module_name, globals(), locals(), ['idName','cutFlow']) for name in dir(idmod): @@ -1004,7 +754,7 @@ #note: be careful here to when selecting new ids that the vid tools dont do extra setup for them #for example the HEEP cuts need an extra producer which vid tools automatically handles from PhysicsTools.SelectorUtils.tools.vid_id_tools import setupVIDSelection -my_id_modules = ['RecoEgamma.PhotonIdentification.Identification.cutBasedPhotonID_Spring16_V2p2_cff'] +my_id_modules = ['RecoEgamma.PhotonIdentification.Identification.cutBasedPhotonID_RunIIIWinter22_122X_V1_cff'] for id_module_name in my_id_modules: idmod= __import__(id_module_name, globals(), locals(), ['idName','cutFlow']) for name in dir(idmod):