Skip to content

Commit

Permalink
Merge branch 'CMSSW_13_0_X' into 130X_WFs2023D
Browse files Browse the repository at this point in the history
  • Loading branch information
sunilUIET authored Jul 29, 2023
2 parents d2e8fa3 + c4747d2 commit 449b541
Show file tree
Hide file tree
Showing 38 changed files with 274 additions and 431 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ def getSequence(process, collection,

if collection in ("ALCARECOTkAlMinBias", "generalTracks",
"ALCARECOTkAlMinBiasHI", "hiGeneralTracks",
"ALCARECOTkAlJetHT", "ALCARECOTkAlDiMuonVertexTracks"):
"ALCARECOTkAlJetHT", "ALCARECOTkAlDiMuonVertexTracks",
"hltMergedTracks"):
options["TrackSelector"]["Alignment"].update({
"ptMin": 1.0,
"pMin": 8.,
Expand Down
50 changes: 27 additions & 23 deletions CondCore/Utilities/python/cond2xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,41 +76,45 @@ def __del__(self):
return

def discover(self, payloadType):

libName = 'pluginUtilities_payload2xml.so'
# first search: developer area or main release
libDir = os.path.join( os.environ["CMSSW_BASE"], 'lib', os.environ["SCRAM_ARCH"] )
devLibDir = libDir
libPath = os.path.join( devLibDir, libName )
releaseBase = os.environ["CMSSW_RELEASE_BASE"]
devCheckout = (releaseBase != '')
if not devCheckout:

isReadOnlyRel = (os.environ['CMSSW_RELEASE_BASE'] == '')
if isReadOnlyRel:
logging.debug('Looks like the current working environment is a read-only release')
if not os.path.exists( libPath ) and devCheckout:
# main release ( for dev checkouts )
libDir = os.path.join( releaseBase, 'lib', os.environ["SCRAM_ARCH"] )

# first search CMSSW_BASE (developer area), then CMSSW_RELEASE_BASE (release base),
# and finally CMSSW_FULL_RELEASE_BASE (full release base, defined only for patch releases)
foundLib = False
for cmsswBase in ['CMSSW_BASE', 'CMSSW_RELEASE_BASE', 'CMSSW_FULL_RELEASE_BASE']:
# Skip to next in case one is not defined or is empty
if not (cmsswBase in os.environ and os.environ[cmsswBase] != ''):
continue
libDir = os.path.join( os.environ[cmsswBase], 'lib', os.environ['SCRAM_ARCH'] )
libPath = os.path.join( libDir, libName )
if not os.path.exists( libPath ):
if "CMSSW_FULL_RELEASE_BASE" in os.environ:
libDir = os.path.join( os.environ["CMSSW_FULL_RELEASE_BASE"], 'lib', os.environ["SCRAM_ARCH"] )
libPath = os.path.join( libDir, libName )
if not os.path.exists( libPath ):
# it should never happen!
raise Exception('No built-in library %s found with XML converters.' %libPath)
logging.debug("Importing built-in library %s" %libPath)
if cmsswBase == 'CMSSW_BASE':
devLibDir = libDir
foundLib = os.path.isfile( libPath )
if foundLib:
logging.debug('Found built-in library with XML converters: %s' %libPath)
break
if not foundLib:
# this should never happen !!
raise Exception('No built-in library found with XML converters (library name: %s).' %libName)

logging.debug('Importing built-in library %s' %libPath)
module = importlib.import_module( libName.replace('.so', '') )
functors = dir(module)
funcName = payloadType+'2xml'
if funcName in functors:
logging.info('XML converter for payload class %s found in the built-in library.' %payloadType)
return getattr( module, funcName)
if not devCheckout:
# give-up if it is a read-only release...
raise Exception('No XML converter suitable for payload class %s has been found in the built-in library.')
if isReadOnlyRel:
# give up if it is a read-only release...
raise Exception('No XML converter suitable for payload class %s has been found in the built-in library.' %payloadType)
libName = 'plugin%s.so' %localLibName( payloadType )
libPath = os.path.join( devLibDir, libName )
if os.path.exists( libPath ):
logging.info('Found local library with XML converter for class %s' %payloadType )
logging.info('Found local library with XML converter for class %s' %payloadType)
module = importlib.import_module( libName.replace('.so', '') )
return getattr( module, funcName)
logging.warning('No XML converter for payload class %s found in the built-in library.' %payloadType)
Expand Down
22 changes: 11 additions & 11 deletions Configuration/AlCa/python/autoCond.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,27 @@
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode
'phase1_2018_cosmics_peak' : '123X_upgrade2018cosmics_realistic_peak_v2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2022
'phase1_2022_design' : '130X_mcRun3_2022_design_v2',
'phase1_2022_design' : '130X_mcRun3_2022_design_v3',
# GlobalTag for MC production with realistic conditions for Phase1 2022
'phase1_2022_realistic' : '130X_mcRun3_2022_realistic_v3',
'phase1_2022_realistic' : '130X_mcRun3_2022_realistic_v4',
# GlobalTag for MC production with realistic conditions for Phase1 2022 post-EE+ leak
'phase1_2022_realistic_postEE' : '130X_mcRun3_2022_realistic_postEE_v3',
'phase1_2022_realistic_postEE' : '130X_mcRun3_2022_realistic_postEE_v4',
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics' : '130X_mcRun3_2022cosmics_realistic_deco_v3',
'phase1_2022_cosmics' : '130X_mcRun3_2022cosmics_realistic_deco_v4',
# GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics_design' : '130X_mcRun3_2022cosmics_design_deco_v2',
'phase1_2022_cosmics_design' : '130X_mcRun3_2022cosmics_design_deco_v3',
# GlobalTag for MC production with realistic conditions for Phase1 2022 detector for Heavy Ion
'phase1_2022_realistic_hi' : '130X_mcRun3_2022_realistic_HI_v6',
'phase1_2022_realistic_hi' : '130X_mcRun3_2022_realistic_HI_v7',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2023
'phase1_2023_design' : '130X_mcRun3_2023_design_v7',
'phase1_2023_design' : '130X_mcRun3_2023_design_v8',
# GlobalTag for MC production with realistic conditions for Phase1 2023
'phase1_2023_realistic' : '130X_mcRun3_2023_realistic_v9',
'phase1_2023_realistic' : '130X_mcRun3_2023_realistic_v11',
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2023, Strip tracker in DECO mode
'phase1_2023_cosmics' : '130X_mcRun3_2023cosmics_realistic_deco_v8',
'phase1_2023_cosmics' : '130X_mcRun3_2023cosmics_realistic_deco_v10',
# GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2023, Strip tracker in DECO mode
'phase1_2023_cosmics_design' : '130X_mcRun3_2023cosmics_design_deco_v7',
'phase1_2023_cosmics_design' : '130X_mcRun3_2023cosmics_design_deco_v8',
# GlobalTag for MC production with realistic conditions for Phase1 2023 detector for Heavy Ion
'phase1_2023_realistic_hi' : '130X_mcRun3_2023_realistic_HI_v14',
'phase1_2023_realistic_hi' : '130X_mcRun3_2023_realistic_HI_v15',
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '130X_mcRun3_2024_realistic_v7',
# GlobalTag for MC production with realistic conditions for Phase2
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_2017.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
# (TTbar DigiNoHLT)
# 2023 (TTbar, TTbar PU, TTbar PU premix)
# (TTbar trackingMkFit)
# (TTbar FastSim)
# (TTbar FastSim, TTbar FastSim PU, MinBiasFS for mixing))
# 2024 (TTbar, TTbar PU, TTbar PU premix)
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
Expand Down Expand Up @@ -84,7 +84,7 @@
11634.601,
12434.0,12634.0,12634.99,
12434.7,
14034.0,
14034.0,14234.0,14040.303,
12834.0,13034.0,13034.99,]
for numWF in numWFIB:
if not numWF in _upgrade_workflows: continue
Expand Down
18 changes: 17 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
workflows[140.077] = ['',['RunTau2022E','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.078] = ['',['RunMuonEG2022E','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]

### run3 (2023) skims ###
### run3 (2022) skims ###
workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2022','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']]
workflows[140.105] = ['',['RunBTagMu2022D','HLTDR3_2022','RECONANORUN3_reHLT','SKIMBTAGMURUN3_reHLT']]
workflows[140.106] = ['',['RunJetMET2022D','HLTDR3_2022','RECONANORUN3_reHLT','SKIMJETMET0RUN3_reHLT']]
Expand Down Expand Up @@ -559,6 +559,22 @@
workflows[141.048] = ['',['RunMuonEG2023D','HLTDR3_2023','RECONANORUN3_reHLT_2023','HARVESTRUN3_2023']]
workflows[141.049] = ['',['RunParkingDoubleMuonLowMass2023D','HLTDR3_2023','RECONANORUN3_reHLT_2023','HARVESTRUN3_2023']]

### run3 (2023) skims ###
workflows[141.101] = ['',['RunZeroBias2023C','HLTDR3_2023','RECONANORUN3_ZB_reHLT_2023','SKIMZEROBIASRUN3_reHLT']]
workflows[141.102] = ['',['RunBTagMu2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMBTAGMURUN3_reHLT']]
workflows[141.103] = ['',['RunJetMET2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMJETMET0RUN3_reHLT']]
workflows[141.104] = ['',['RunDisplacedJet2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMDISPLACEDJETRUN3_reHLT']]
workflows[141.105] = ['',['RunEGamma2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMEGAMMA0RUN3_reHLT']]
workflows[141.106] = ['',['RunTau2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMTAURUN3_reHLT']]
workflows[141.107] = ['',['RunMuon2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMMUON0RUN3_reHLT']]
workflows[141.108] = ['',['RunMuonEG2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMMUONEGRUN3_reHLT']]
workflows[141.109] = ['',['RunNoBPTX2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMNOBPTXRUN3_reHLT']]
workflows[141.110] = ['',['RunHcalNZS2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMHCALNZSRUN3_reHLT']]
workflows[141.111] = ['',['RunHLTPhysics2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMHLTPHYSICSRUN3_reHLT']]
workflows[141.112] = ['',['RunCommissioning2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMCOMMISSIONINGRUN3_reHLT']]
workflows[141.113] = ['',['RunCosmics2023C','HLTDR3_2023','RECOCOSMRUN3_reHLT','SKIMCOSMICSRUN3_reHLT']]
workflows[141.114] = ['',['RunParkingDoubleMuonLowMass2023C','HLTDR3_2023','RECONANORUN3_reHLT_2023','SKIMPARKINGDOUBLEMUONLOWMASS0RUN3_reHLT']]

### fastsim ###
workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']]
workflows[5.2] = ['SingleMuPt10FS', ['SingleMuPt10FS','HARVESTFS']]
Expand Down
10 changes: 5 additions & 5 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@
steps['RunMuonEG2023D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2023D-v1/RAW',label='2023D',events=100000,location='STD', ls=Run2023D)}
steps['RunParkingDoubleMuonLowMass2023D']={'INPUT':InputInfo(dataSet='/ParkingDoubleMuonLowMass0/Run2023D-v1/RAW',label='2023D',events=100000,location='STD', ls=Run2023D)}


# Highstat HLTPhysics
Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891])
steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015DHS',events=100000,location='STD', ls=Run2015DHS)}
Expand Down Expand Up @@ -3903,7 +3904,8 @@ def gen2021HiMix(fragment,howMuch):
defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v'
defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_design_BS2022-v'
defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022_FastSim-v'
defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2023_realistic_v11_BS2022-v'
defaultDataSets['2023']='CMSSW_13_0_10-130X_mcRun3_2023_realistic_withEarly2023BS_v1_2023-v'
defaultDataSets['2023FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v'
defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2024_realistic_v11_BS2022-v'
defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v'
defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v'
Expand Down Expand Up @@ -3932,15 +3934,13 @@ def gen2021HiMix(fragment,howMuch):
name=baseDataSetReleaseBetter[key]
if '2017' in ds:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
elif '2018' in ds:
elif '2018' in ds or 'postLS2' in ds:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
elif '2021' in ds:
elif '2021' in ds or '2023' in ds:
if 'FS' not in ds:
PUDataSets[ds]={'-n':10,'--pileup':'Run3_Flat55To75_PoissonOOTPU','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)}
else:
PUDataSets[ds]={'-n':10,'--pileup':'Run3_Flat55To75_PoissonOOTPU','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM-RECO'%(name,)}
elif 'postLS2' in ds:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
elif '2026' in ds:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_200_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)}
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2391,7 +2391,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2023',
'Era' : 'Run3_2023',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'BeamSpot': 'Realistic25ns13p6TeVEarly2023Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024' : {
Expand Down Expand Up @@ -2423,7 +2423,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2023',
'Era' : 'Run3_FastSim',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'BeamSpot': 'Realistic25ns13p6TeVEarly2023Collision',
'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
},
}
Expand Down
4 changes: 2 additions & 2 deletions Configuration/Skimming/python/autoSkim.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOLLPJetHCAL+LogError+LogErrorMonitor',
'JetMET0' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor',
'JetMET1' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor',
'EGamma0':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor',
'EGamma1':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor',
'EGamma0':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+IsoPhotonEB+LogError+LogErrorMonitor',
'EGamma1':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+IsoPhotonEB+LogError+LogErrorMonitor',
'Tau' : 'EXODisappTrk+LogError+LogErrorMonitor',
'Muon0' : 'ZMu+EXODisappTrk+EXOCSCCluster+EXODisappMuon+LogError+LogErrorMonitor',
'Muon1' : 'ZMu+EXODisappTrk+EXOCSCCluster+EXODisappMuon+LogError+LogErrorMonitor',
Expand Down
2 changes: 1 addition & 1 deletion DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void OnlineBeamMonitor::bookHistograms(DQMStore::IBooker& ibooker,
ibooker.setCurrentFolder(monitorName_ + "Validation");
//Book histograms
bsChoice_ = ibooker.bookProfile("bsChoice",
"BS Choice (+1): HLT - (-1): Legacy - (-10): Fake BS - (0): No Transient ",
"BS Choice: +1=HLT / -1=Legacy / -10=Fake (fallback to PCL) / 0=No Transient ",
lastLumi - firstLumi + 1,
firstLumi - 0.5,
lastLumi + 0.5,
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorClient/python/PresampleClient_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
minChannelEntries = 6
expectedMean = 200.0
toleranceLow = 25.0
toleranceHigh = 40.0
toleranceHigh = 60.0
toleranceHighFwd = 100.0
toleranceRMS = 6.0
toleranceRMSFwd = 6.0
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorClient/python/TrigPrimClient_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from DQM.EcalMonitorTasks.OccupancyTask_cfi import ecalOccupancyTask

minEntries = 3
errorFractionThreshold = 0.1
errorFractionThreshold = 0.2
TTF4MaskingAlarmThreshold = 0.1

ecalTrigPrimClient = cms.untracked.PSet(
Expand Down
2 changes: 1 addition & 1 deletion DQM/HLTEvF/python/HLTTrackingMonitoring_Client_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
)

def _modifyForRun3Default(efffromhitpattern):
efffromhitpattern.subDirs = ["HLT/Tracking/pixelTracks/HitEffFromHitPattern*", "HLT/Tracking/tracks/HitEffFromHitPattern*"]
efffromhitpattern.subDirs = ["HLT/Tracking/pixelTracks/HitEffFromHitPattern*", "HLT/Tracking/tracks/HitEffFromHitPattern*", "HLT/Tracking/doubletRecoveryTracks/HitEffFromHitPattern*"] #, "HLT/Tracking/iter0HP/HitEffFromHitPattern*"

def _modifyForRun3EGM(efffromhitpattern):
efffromhitpattern.subDirs = ["HLT/EGM/Tracking/GSF/HitEffFromHitPattern*"]
Expand Down
2 changes: 1 addition & 1 deletion DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
)

from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toReplaceWith(trackingMonitoringHLTsequence, cms.Sequence(pixelTracksMonitoringHLT * iterHLTTracksMonitoringHLT))
run3_common.toReplaceWith(trackingMonitoringHLTsequence, cms.Sequence(pixelTracksMonitoringHLT * iterHLTTracksMonitoringHLT * doubletRecoveryHPTracksMonitoringHLT)) # * iter0HPTracksMonitoringHLT ))
run3_common.toReplaceWith(egmTrackingMonitorHLTsequence, cms.Sequence(gsfTracksMonitoringHLT))
3 changes: 2 additions & 1 deletion DQMOffline/Trigger/plugins/BTagAndProbe.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,8 @@ void BTagAndProbe::fillDescriptions(edm::ConfigurationDescriptions& descriptions
desc.add<edm::InputTag>("vertices", edm::InputTag("offlinePrimaryVertices"));
desc.add<edm::InputTag>("muons", edm::InputTag("muons"));
desc.add<edm::InputTag>("electrons", edm::InputTag("gedGsfElectrons"));
desc.add<edm::InputTag>("elecID", edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Fall17-94X-V1-tight"));
desc.add<edm::InputTag>("elecID",
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"));
desc.add<std::vector<edm::InputTag> >(
"btagAlgos", {edm::InputTag("pfDeepCSVJetTags:probb"), edm::InputTag("pfDeepCSVJetTags:probbb")});

Expand Down
4 changes: 2 additions & 2 deletions DQMOffline/Trigger/plugins/ParticleNetJetTagMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1037,9 +1037,9 @@ void ParticleNetJetTagMonitor::fillDescriptions(edm::ConfigurationDescriptions&
desc.add<edm::InputTag>("muons", edm::InputTag("muons"));
desc.add<edm::InputTag>("electrons", edm::InputTag("gedGsfElectrons"));
desc.add<edm::InputTag>("tagElectronID",
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Fall17-94X-V2-tight"));
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"));
desc.add<edm::InputTag>("vetoElectronID",
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Fall17-94X-V2-loose"));
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-loose"));
desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"));
desc.add<edm::InputTag>("jetPNETScore", edm::InputTag("pfParticleNetAK4DiscriminatorsJetTags", "BvsAll"));
desc.add<edm::InputTag>("jetPNETScoreHLT", edm::InputTag("hltParticleNetDiscriminatorsJetTags", "BvsAll"));
Expand Down
3 changes: 2 additions & 1 deletion DQMOffline/Trigger/plugins/TopMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,8 @@ void TopMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
desc.add<edm::InputTag>("vertices", edm::InputTag("offlinePrimaryVertices"));
desc.add<edm::InputTag>("muons", edm::InputTag("muons"));
desc.add<edm::InputTag>("electrons", edm::InputTag("gedGsfElectrons"));
desc.add<edm::InputTag>("elecID", edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-Fall17-94X-V1-tight"));
desc.add<edm::InputTag>("elecID",
edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight"));
desc.add<edm::InputTag>("photons", edm::InputTag("photons"));
desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"));
desc.add<std::vector<edm::InputTag> >(
Expand Down
Loading

0 comments on commit 449b541

Please sign in to comment.