From 6e09c53827778d50c8034ef8ab665d9893d8eb81 Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 26 Sep 2024 12:59:48 +0200 Subject: [PATCH] HLT menu development for 14_1_X This update includes the integration of the following changes: - migration of the combined HLT table and related subtables to CMSSW_14_1_0 - removal of now useless customization functions related to CMSSW_14_1_X developments --- .../Configuration/python/HLT_2024v14_cff.py | 371 ++++++++-------- .../Configuration/python/HLT_FULL_cff.py | 407 ++++++++--------- .../Configuration/python/HLT_Fake1_cff.py | 6 +- .../Configuration/python/HLT_Fake2_cff.py | 7 +- .../Configuration/python/HLT_Fake_cff.py | 6 +- .../Configuration/python/HLT_GRun_cff.py | 371 ++++++++-------- .../Configuration/python/HLT_HIon_cff.py | 256 ++++++----- .../Configuration/python/HLT_PIon_cff.py | 10 +- .../Configuration/python/HLT_PRef_cff.py | 274 ++++++------ .../Configuration/python/HLT_Special_cff.py | 274 ++++++------ .../python/HLTrigger_Datasets_GRun_cff.py | 2 +- .../python/HLTrigger_Datasets_HIon_cff.py | 2 +- .../python/HLTrigger_Datasets_PIon_cff.py | 2 +- .../python/HLTrigger_Datasets_PRef_cff.py | 2 +- .../python/HLTrigger_Datasets_Special_cff.py | 2 +- .../python/customizeHLTforCMSSW.py | 70 +-- HLTrigger/Configuration/tables/makeOnlineHIon | 4 +- HLTrigger/Configuration/tables/makeOnlinePRef | 4 +- .../Configuration/tables/makeOnlineSpecial | 2 +- HLTrigger/Configuration/tables/makeSubTables | 4 +- .../Configuration/test/OnLine_HLT_2024v14.py | 374 ++++++++-------- .../Configuration/test/OnLine_HLT_FULL.py | 410 ++++++++---------- .../Configuration/test/OnLine_HLT_Fake.py | 6 +- .../Configuration/test/OnLine_HLT_Fake1.py | 6 +- .../Configuration/test/OnLine_HLT_Fake2.py | 7 +- .../Configuration/test/OnLine_HLT_GRun.py | 374 ++++++++-------- .../Configuration/test/OnLine_HLT_HIon.py | 259 ++++++----- .../Configuration/test/OnLine_HLT_PIon.py | 13 +- .../Configuration/test/OnLine_HLT_PRef.py | 277 ++++++------ .../Configuration/test/OnLine_HLT_Special.py | 277 ++++++------ HLTrigger/Configuration/test/getFrozenHLT.sh | 8 +- HLTrigger/Configuration/test/getHLT.sh | 2 +- 32 files changed, 1891 insertions(+), 2198 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_2024v14_cff.py b/HLTrigger/Configuration/python/HLT_2024v14_cff.py index b8c54bbabdcb5..e7ad08948f86e 100644 --- a/HLTrigger/Configuration/python/HLT_2024v14_cff.py +++ b/HLTrigger/Configuration/python/HLT_2024v14_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /frozen/2024/2e34/v1.4/HLT --cff --data --type 2024v14 +# hltGetConfiguration /frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT --cff --data --type 2024v14 -# /frozen/2024/2e34/v1.4/HLT/V1 (CMSSW_14_0_11) +# /frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT/V5 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/frozen/2024/2e34/v1.4/HLT/V1") + tableName = cms.string("/frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT/V5") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -6080,6 +6080,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -6133,6 +6136,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -6247,34 +6251,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -6291,45 +6333,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -8426,18 +8430,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -8723,18 +8721,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -8986,18 +8978,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -10588,7 +10574,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -10612,7 +10598,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -11034,18 +11020,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -11062,45 +11086,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -11854,18 +11840,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12109,18 +12089,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12372,18 +12346,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -13860,7 +13828,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -13884,7 +13852,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -38479,6 +38447,9 @@ fragment.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -46486,13 +46457,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -46910,6 +46881,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -46922,8 +46894,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) fragment.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -61534,7 +61505,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -61567,8 +61538,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -73015,13 +72986,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -73397,7 +73368,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -73430,8 +73401,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -73792,6 +73763,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -73804,8 +73776,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) fragment.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 8b30e351bc04a..d2e79bd88d838 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/HLT --cff --data --type FULL +# hltGetConfiguration /dev/CMSSW_14_1_0/HLT --cff --data --type FULL -# /dev/CMSSW_14_0_0/HLT/V203 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/HLT/V32 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V203") + tableName = cms.string("/dev/CMSSW_14_1_0/HLT/V32") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -11709,6 +11709,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -11762,6 +11765,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -11876,34 +11880,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -11920,45 +11962,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -14186,18 +14190,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -14483,18 +14481,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -14746,18 +14738,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -16348,7 +16334,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -16372,7 +16358,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -16794,18 +16780,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -16822,45 +16846,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -17614,18 +17600,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -17869,18 +17849,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -18132,18 +18106,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -19620,7 +19588,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -19644,7 +19612,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -44587,6 +44555,9 @@ fragment.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -52594,13 +52565,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -53018,6 +52989,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -53030,8 +53002,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) fragment.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -67642,7 +67613,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -67675,8 +67646,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -79123,13 +79094,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -79505,7 +79476,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -79538,8 +79509,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -79900,6 +79871,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -79912,8 +79884,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) fragment.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), @@ -90266,18 +90237,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -90563,18 +90528,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index 7a7513515d516..de09842d1c74e 100644 --- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake1 --cff --data --type Fake1 +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake1 --cff --data --type Fake1 -# /dev/CMSSW_14_0_0/Fake1/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake1/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake1/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake1/V11") ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py index bd878d2512761..32b71cb8534b4 100644 --- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake2 --cff --data --type Fake2 +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake2 --cff --data --type Fake2 -# /dev/CMSSW_14_0_0/Fake2/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake2/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake2/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake2/V11") ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -109,6 +109,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 03d9c46fa2ca0..14112d7c45d92 100644 --- a/HLTrigger/Configuration/python/HLT_Fake_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake --cff --data --type Fake +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake --cff --data --type Fake -# /dev/CMSSW_14_0_0/Fake/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake/V11") ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index e5de10823b746..e1082ddb22c51 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/GRun --cff --data --type GRun +# hltGetConfiguration /dev/CMSSW_14_1_0/GRun --cff --data --type GRun -# /dev/CMSSW_14_0_0/GRun/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/GRun/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/GRun/V13") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -6080,6 +6080,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -6133,6 +6136,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -6247,34 +6251,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -6291,45 +6333,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -8426,18 +8430,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -8723,18 +8721,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -8986,18 +8978,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -10588,7 +10574,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -10612,7 +10598,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -11034,18 +11020,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -11062,45 +11086,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -11854,18 +11840,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12109,18 +12089,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12372,18 +12346,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -13860,7 +13828,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -13884,7 +13852,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -38479,6 +38447,9 @@ fragment.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -46486,13 +46457,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -46910,6 +46881,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -46922,8 +46894,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) fragment.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -61534,7 +61505,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -61567,8 +61538,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -73015,13 +72986,13 @@ sumRecHits = cms.bool( False ) ) fragment.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -73397,7 +73368,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) fragment.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -73430,8 +73401,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) fragment.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -73792,6 +73763,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) fragment.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -73804,8 +73776,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) fragment.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 22af65992788d..01ac65e452116 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/HIon --cff --data --type HIon +# hltGetConfiguration /dev/CMSSW_14_1_0/HIon --cff --data --type HIon -# /dev/CMSSW_14_0_0/HIon/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/HIon/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/HIon/V13") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -8107,6 +8107,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -8160,6 +8163,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -8274,34 +8278,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -8318,45 +8360,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -9277,18 +9281,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -9305,45 +9347,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltL1sDQMHIHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -9659,7 +9663,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -9683,7 +9687,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -9786,7 +9790,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -9810,7 +9814,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltPreDSTPhysics = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -11353,18 +11357,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -11650,18 +11648,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 8cb83cbafbb6f..940f25cb3a6ec 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/PIon --cff --data --type PIon +# hltGetConfiguration /dev/CMSSW_14_1_0/PIon --cff --data --type PIon -# /dev/CMSSW_14_0_0/PIon/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/PIon/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/PIon/V13") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -3415,6 +3415,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -3485,6 +3488,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 7d2b873adc9ad..541d4fd5cee70 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/PRef --cff --data --type PRef +# hltGetConfiguration /dev/CMSSW_14_1_0/PRef --cff --data --type PRef -# /dev/CMSSW_14_0_0/PRef/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/PRef/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/PRef/V13") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -3761,6 +3761,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -3814,6 +3817,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -3928,34 +3932,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -3972,45 +4014,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -4960,18 +4964,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -4988,45 +5030,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltL1sDQMHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -5342,7 +5346,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5366,7 +5370,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -5469,7 +5473,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5493,7 +5497,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltPreDSTPhysics = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -6672,18 +6676,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -6969,18 +6967,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7232,18 +7224,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/python/HLT_Special_cff.py b/HLTrigger/Configuration/python/HLT_Special_cff.py index 8c74c2d16711a..c7d52b546f8ba 100644 --- a/HLTrigger/Configuration/python/HLT_Special_cff.py +++ b/HLTrigger/Configuration/python/HLT_Special_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Special --cff --data --type Special +# hltGetConfiguration /dev/CMSSW_14_1_0/Special --cff --data --type Special -# /dev/CMSSW_14_0_0/Special/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Special/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Special/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/Special/V13") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -3877,6 +3877,9 @@ record = cms.string( "SiStripLorentzAngleRcd" ) ) ) +fragment.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) fragment.hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) @@ -3930,6 +3933,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -4044,34 +4048,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) fragment.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -4088,45 +4130,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -5076,18 +5080,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) fragment.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -5104,45 +5146,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) fragment.hltL1sDQMHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -5458,7 +5462,7 @@ ) fragment.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5482,7 +5486,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -5585,7 +5589,7 @@ ) fragment.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5609,7 +5613,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) fragment.hltPreDQMRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -6804,18 +6808,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7101,18 +7099,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7364,18 +7356,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py index 357b660119e69..9a478345a2ca6 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_14_0_0/GRun +# /dev/CMSSW_14_1_0/GRun import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py index 40a19df16d0a8..5d02a08c91659 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_14_0_0/HIon +# /dev/CMSSW_14_1_0/HIon import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py index 5d65e265b8a83..9da7e33e29aac 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_14_0_0/PIon +# /dev/CMSSW_14_1_0/PIon import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py index 8d1e5492d34ca..caf57c81f1949 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_14_0_0/PRef +# /dev/CMSSW_14_1_0/PRef import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py index 718c492d39b2a..6cf92c61111cd 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_14_0_0/Special +# /dev/CMSSW_14_1_0/Special import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 5e68d1176a31d..f44657dfa5f89 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -261,71 +261,6 @@ def checkHLTfor43774(process): return process -# Adding zdc Topology producer -def customizeHLTfor46062(process): - """Add topology producer for ZDC""" - - for esprod in esproducers_by_type(process, 'ZdcGeometryFromDBEP'): - process.load("Geometry.ForwardGeometry.zdcTopologyEP_cfi") - break - - return process - -def customizeHLTfor44576(process): - """Ensure TrackerAdditionalParametersPerDetRcd ESProducer is run when needed""" - for esprod in esproducers_by_type(process, 'TrackerGeometricDetESModule'): - process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") - break - return process - -def customizeHLTfor45063(process): - """Assigns value of MuonHLTSeedMVAClassifier mva input file, scales and mean values according to the value of isFromL1""" - for prod in producers_by_type(process, 'MuonHLTSeedMVAClassifier'): - if hasattr(prod, "isFromL1"): - if (prod.isFromL1 == True): - if hasattr(prod, "mvaFileBL1"): - prod.mvaFileB = prod.mvaFileBL1 - if hasattr(prod, "mvaFileEL1"): - prod.mvaFileE = prod.mvaFileEL1 - if hasattr(prod, "mvaScaleMeanBL1"): - prod.mvaScaleMeanB = prod.mvaScaleMeanBL1 - if hasattr(prod, "mvaScaleStdBL1"): - prod.mvaScaleStdB = prod.mvaScaleStdBL1 - if hasattr(prod, "mvaScaleMeanEL1"): - prod.mvaScaleMeanE = prod.mvaScaleMeanEL1 - if hasattr(prod, "mvaScaleStdEL1"): - prod.mvaScaleStdE = prod.mvaScaleStdEL1 - else: - if hasattr(prod, "mvaFileBL2"): - prod.mvaFileB = prod.mvaFileBL2 - if hasattr(prod, "mvaFileEL2"): - prod.mvaFileE = prod.mvaFileEL2 - if hasattr(prod, "mvaScaleMeanBL2"): - prod.mvaScaleMeanB = prod.mvaScaleMeanBL2 - if hasattr(prod, "mvaScaleStdBL2"): - prod.mvaScaleStdB = prod.mvaScaleStdBL2 - if hasattr(prod, "mvaScaleMeanEL2"): - prod.mvaScaleMeanE = prod.mvaScaleMeanEL2 - if hasattr(prod, "mvaScaleStdEL2"): - prod.mvaScaleStdE = prod.mvaScaleStdEL2 - - for prod in producers_by_type(process, 'MuonHLTSeedMVAClassifier'): - delattr(prod,"mvaFileBL1") - delattr(prod,"mvaFileEL1") - delattr(prod,"mvaScaleMeanBL1") - delattr(prod,"mvaScaleStdBL1") - delattr(prod,"mvaScaleMeanEL1") - delattr(prod,"mvaScaleStdEL1") - delattr(prod,"mvaFileBL2") - delattr(prod,"mvaFileEL2") - delattr(prod,"mvaScaleMeanBL2") - delattr(prod,"mvaScaleStdBL2") - delattr(prod,"mvaScaleMeanEL2") - delattr(prod,"mvaScaleStdEL2") - - return process - - # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -335,8 +270,5 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # process = customiseFor12718(process) process = checkHLTfor43774(process) - process = customizeHLTfor44576(process) - process = customizeHLTfor45063(process) - process = customizeHLTfor46062(process) - + return process diff --git a/HLTrigger/Configuration/tables/makeOnlineHIon b/HLTrigger/Configuration/tables/makeOnlineHIon index 9dccab7f8b14e..56d51fa6510ac 100755 --- a/HLTrigger/Configuration/tables/makeOnlineHIon +++ b/HLTrigger/Configuration/tables/makeOnlineHIon @@ -3,8 +3,8 @@ # generate HLT tables from master table in ConfDB # -MASTER="/dev/CMSSW_13_2_0/HLT" # no version, take the latest one -TARGET="/online/collisions/2023/HIon/v1.1/HLT" # where to store the online-compliant menu +MASTER="/dev/CMSSW_14_1_0/HLT" # no version, take the latest one +TARGET="/online/collisions/2024/HIon/v1.0/HLT" # where to store the online-compliant menu PREFIX="" TABLES="online_hion" diff --git a/HLTrigger/Configuration/tables/makeOnlinePRef b/HLTrigger/Configuration/tables/makeOnlinePRef index c4d4f9fc3eb73..bd83ab7cc7dd3 100755 --- a/HLTrigger/Configuration/tables/makeOnlinePRef +++ b/HLTrigger/Configuration/tables/makeOnlinePRef @@ -3,8 +3,8 @@ # generate HLT tables from master table in ConfDB # -MASTER="/dev/CMSSW_13_2_0/HLT" # no version, take the latest one -TARGET="/online/collisions/2023/PRef/v1.0/HLT" # where to store the online-compliant menu +MASTER="/dev/CMSSW_14_1_0/HLT" # no version, take the latest one +TARGET="/online/collisions/2024/PRef/v1.0/HLT" # where to store the online-compliant menu PREFIX="" TABLES="online_pref" diff --git a/HLTrigger/Configuration/tables/makeOnlineSpecial b/HLTrigger/Configuration/tables/makeOnlineSpecial index 9c704250dec87..7ab46d3cd963d 100755 --- a/HLTrigger/Configuration/tables/makeOnlineSpecial +++ b/HLTrigger/Configuration/tables/makeOnlineSpecial @@ -6,7 +6,7 @@ echo echo "Create online version of the combined Special subtable" echo -MASTER="/dev/CMSSW_14_0_0/HLT" # no version, take the latest one +MASTER="/dev/CMSSW_14_1_0/HLT" # no version, take the latest one TARGET="/online/special/2024/v1.5/TABLE" # where to store the online-compliant menu PREFIX="online_" TABLES="Special" diff --git a/HLTrigger/Configuration/tables/makeSubTables b/HLTrigger/Configuration/tables/makeSubTables index 9bd151ef251bf..a39573b228122 100755 --- a/HLTrigger/Configuration/tables/makeSubTables +++ b/HLTrigger/Configuration/tables/makeSubTables @@ -3,8 +3,8 @@ # generate HLT tables from master table in ConfDB # -MASTER="/dev/CMSSW_14_0_0/HLT" # no version, take the latest one -TARGET="/dev/CMSSW_14_0_0/TABLE" # directory where to store the sub-tables +MASTER="/dev/CMSSW_14_1_0/HLT" # no version, take the latest one +TARGET="/dev/CMSSW_14_1_0/TABLE" # directory where to store the sub-tables PREFIX="" TABLES="GRun HIon PIon PRef Special" # which sub-tables to create diff --git a/HLTrigger/Configuration/test/OnLine_HLT_2024v14.py b/HLTrigger/Configuration/test/OnLine_HLT_2024v14.py index 7e633ac57e5a6..7448d70bd3132 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_2024v14.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_2024v14.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /frozen/2024/2e34/v1.4/HLT --full --data --type 2024v14 --unprescale --process HLT2024v14 --globaltag auto:run3_hlt_2024v14 --input file:RelVal_Raw_2024v14_DATA.root +# hltGetConfiguration /frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT --full --data --type 2024v14 --unprescale --process HLT2024v14 --globaltag auto:run3_hlt_2024v14 --input file:RelVal_Raw_2024v14_DATA.root -# /frozen/2024/2e34/v1.4/HLT/V1 (CMSSW_14_0_11) +# /frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT/V5 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/frozen/2024/2e34/v1.4/HLT/V1") + tableName = cms.string("/frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT/V5") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -4480,6 +4480,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -6291,6 +6294,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -6418,6 +6424,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -6532,34 +6539,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -6576,45 +6621,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -8711,18 +8718,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -9008,18 +9009,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -9271,18 +9266,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -10873,7 +10862,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -10897,7 +10886,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -11319,18 +11308,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -11347,45 +11374,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -12139,18 +12128,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12394,18 +12377,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12657,18 +12634,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -14145,7 +14116,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -14169,7 +14140,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -38764,6 +38735,9 @@ process.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -46771,13 +46745,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -47195,6 +47169,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -47207,8 +47182,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) process.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -61819,7 +61793,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -61852,8 +61826,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -73300,13 +73274,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -73682,7 +73656,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -73715,8 +73689,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -74077,6 +74051,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -74089,8 +74064,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) process.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 124c1dfd15041..6f89efa2c53a1 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_14_0_0/HLT/V203 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/HLT/V32 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V203") + tableName = cms.string("/dev/CMSSW_14_1_0/HLT/V32") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -10109,6 +10109,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -11920,6 +11923,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -12045,6 +12051,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -12159,34 +12166,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -12203,45 +12248,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -14469,18 +14476,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -14766,18 +14767,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -15029,18 +15024,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -16631,7 +16620,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -16655,7 +16644,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -17077,18 +17066,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -17105,45 +17132,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -17897,18 +17886,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -18152,18 +18135,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -18415,18 +18392,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -19903,7 +19874,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -19927,7 +19898,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -44870,6 +44841,9 @@ process.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -52877,13 +52851,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -53301,6 +53275,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -53313,8 +53288,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) process.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -67925,7 +67899,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -67958,8 +67932,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -79406,13 +79380,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -79788,7 +79762,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -79821,8 +79795,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -80183,6 +80157,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -80195,8 +80170,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) process.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), @@ -90549,18 +90523,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -90846,18 +90814,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index eb4f2a7f2feb0..4c0ff6933dc35 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake --full --data --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake --full --data --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_14_0_0/Fake/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake/V11") ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py index 9224cf61f4c91..c124ce7da0c23 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake1 --full --data --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake1 --full --data --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_14_0_0/Fake1/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake1/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake1/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake1/V11") ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py index 5208f791e17fe..b588b82ed466b 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -1,13 +1,13 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Fake2 --full --data --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/Fake2 --full --data --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_14_0_0/Fake2/V16 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Fake2/V11 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Fake2/V16") + tableName = cms.string("/dev/CMSSW_14_1_0/Fake2/V11") ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -213,6 +213,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index 1c0e19c2cb50a..a25dc2c2355af 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_14_0_0/GRun/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/GRun/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/GRun/V13") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -4480,6 +4480,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -6291,6 +6294,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -6416,6 +6422,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -6530,34 +6537,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -6574,45 +6619,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -8709,18 +8716,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -9006,18 +9007,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -9269,18 +9264,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -10871,7 +10860,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -10895,7 +10884,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowClusterHF = cms.EDProducer( "PFClusterProducer", recHitsSource = cms.InputTag( "hltParticleFlowRecHitHF" ), @@ -11317,18 +11306,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -11345,45 +11372,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltHcalDigisSoASerialSync = cms.EDProducer( "alpaka_serial_sync::HcalDigisSoAProducer", hbheDigisLabel = cms.InputTag( "hltHcalDigis" ), @@ -12137,18 +12126,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12392,18 +12375,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -12655,18 +12632,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -14143,7 +14114,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -14167,7 +14138,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltLightPFTracksSerialSync = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), @@ -38762,6 +38733,9 @@ process.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", estimator = cms.string( "generic" ), tracks = cms.InputTag( "hltMergedTracks" ), + UseDeDxHits = cms.bool( False ), + pixelDeDxHits = cms.InputTag( "" ), + stripDeDxHits = cms.InputTag( "" ), UsePixel = cms.bool( False ), UseStrip = cms.bool( True ), MeVperADCPixel = cms.double( 3.61E-6 ), @@ -46769,13 +46743,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08Region = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltTauPFJetsRecoTauChargedHadrons = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -47193,6 +47167,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltPFTaus" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -47205,8 +47180,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltPFTaus" ) + FailValue = cms.double( 0.0 ) ) process.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -61817,7 +61791,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefs = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -61850,8 +61824,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTaus" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducer = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefs" ) @@ -73298,13 +73272,13 @@ sumRecHits = cms.bool( False ) ) process.hltTauPFJets08RegionDispl = cms.EDProducer( "RecoTauJetRegionProducer", - src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), deltaR = cms.double( 0.8 ), - pfCandAssocMapSrc = cms.InputTag( "" ), - verbosity = cms.int32( 0 ), - maxJetAbsEta = cms.double( 99.0 ), + src = cms.InputTag( "hltAK4PFJetsForDisplTaus" ), minJetPt = cms.double( -1.0 ), - pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ) + maxJetAbsEta = cms.double( 99.0 ), + pfCandSrc = cms.InputTag( "hltParticleFlowForDisplTaus" ), + pfCandAssocMapSrc = cms.InputTag( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutralsDispl = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -73680,7 +73654,7 @@ requireTauChargedHadronsToBeChargedPFCands = cms.bool( False ) ) process.hltHpsPFTauProducerSansRefsDispl = cms.EDProducer( "RecoTauCleaner", - outputSelection = cms.string( "" ), + src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ), cleaners = cms.VPSet( cms.PSet( name = cms.string( "HPS_Select" ), plugin = cms.string( "RecoTauDiscriminantCleanerPlugin" ), @@ -73713,8 +73687,8 @@ selectionPassFunction = cms.string( "isolationPFChargedHadrCandsPtSum() + isolationPFGammaCandsEtSum()" ) ) ), - verbosity = cms.int32( 0 ), - src = cms.InputTag( "hltHpsCombinatoricRecoTausDispl" ) + outputSelection = cms.string( "" ), + verbosity = cms.int32( 0 ) ) process.hltHpsPFTauProducerDispl = cms.EDProducer( "RecoTauPiZeroUnembedder", src = cms.InputTag( "hltHpsPFTauProducerSansRefsDispl" ) @@ -74075,6 +74049,7 @@ particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ) ) process.hltHpsDisplPFTauMediumAbsOrRelChargedIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", + PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ), Prediscriminants = cms.PSet( BooleanOperator = cms.string( "or" ), discr1 = cms.PSet( @@ -74087,8 +74062,7 @@ ) ), PassValue = cms.double( 1.0 ), - FailValue = cms.double( 0.0 ), - PFTauProducer = cms.InputTag( "hltHpsPFTauProducerDispl" ) + FailValue = cms.double( 0.0 ) ) process.hltHpsSelectedPFTausTrackPt1MediumChargedIsolationGlobDispl = cms.EDFilter( "PFTauSelector", src = cms.InputTag( "hltHpsPFTauProducerDispl" ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 6091b79a1d928..a75df2149f87f 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_14_0_0/HIon/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/HIon/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/HIon/V13") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -6507,6 +6507,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -8318,6 +8321,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -8443,6 +8449,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -8557,34 +8564,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -8601,45 +8646,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -9560,18 +9567,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -9588,45 +9633,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltL1sDQMHIHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -9942,7 +9949,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -9966,7 +9973,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -10069,7 +10076,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -10093,7 +10100,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltPreDSTPhysics = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -11636,18 +11643,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -11933,18 +11934,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidatesPPOnAA" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index 21e88547c3984..9409ea16bc630 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_14_0_0/PIon/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/PIon/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/PIon/V13") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -1815,6 +1815,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -3626,6 +3629,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -3768,6 +3774,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index b0b92d388ab98..0bce626a55a24 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_14_0_0/PRef/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/PRef/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/PRef/V13") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -2161,6 +2161,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -3972,6 +3975,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -4097,6 +4103,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -4211,34 +4218,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -4255,45 +4300,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -5243,18 +5250,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -5271,45 +5316,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltL1sDQMHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -5625,7 +5632,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5649,7 +5656,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -5752,7 +5759,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5776,7 +5783,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltPreDSTPhysics = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -6955,18 +6962,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7252,18 +7253,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7515,18 +7510,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Special.py b/HLTrigger/Configuration/test/OnLine_HLT_Special.py index f6a2d6904cdbf..d09f6113fc008 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Special.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Special.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_14_0_0/Special --full --data --type Special --unprescale --process HLTSpecial --globaltag auto:run3_hlt_Special --input file:RelVal_Raw_Special_DATA.root +# hltGetConfiguration /dev/CMSSW_14_1_0/Special --full --data --type Special --unprescale --process HLTSpecial --globaltag auto:run3_hlt_Special --input file:RelVal_Raw_Special_DATA.root -# /dev/CMSSW_14_0_0/Special/V182 (CMSSW_14_0_11) +# /dev/CMSSW_14_1_0/Special/V13 (CMSSW_14_1_0) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Special/V182") + tableName = cms.string("/dev/CMSSW_14_1_0/Special/V13") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -2277,6 +2277,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -4088,6 +4091,9 @@ process.trackerTopology = cms.ESProducer( "TrackerTopologyEP", appendToDataLabel = cms.string( "" ) ) +process.zdcTopologyEP = cms.ESProducer( "ZdcTopologyEP", + appendToDataLabel = cms.string( "" ) +) process.FastTimerService = cms.Service( "FastTimerService", printEventSummary = cms.untracked.bool( False ), @@ -4213,6 +4219,7 @@ RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), useMuonShowers = cms.bool( True ), + produceAXOL1TLScore = cms.bool( False ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), ProduceL1GtDaqRecord = cms.bool( True ), @@ -4327,34 +4334,72 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalDetIdToBeRecovered = cms.EDProducer( "EcalDetIdToBeRecoveredProducer", + ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), + ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), + ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), ebIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebDetIdToBeRecovered = cms.string( "ebDetId" ), - integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), eeIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - ebFEToBeRecovered = cms.string( "ebFE" ), - ebIntegrityGainErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainErrors' ), - eeDetIdToBeRecovered = cms.string( "eeDetId" ), eeIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), eeIntegrityChIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityChIdErrors' ), - ebIntegrityGainSwitchErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityGainSwitchErrors' ), - ebSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ), - eeFEToBeRecovered = cms.string( "eeFE" ), + integrityTTIdErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityTTIdErrors' ), integrityBlockSizeErrors = cms.InputTag( 'hltEcalDigisLegacy','EcalIntegrityBlockSizeErrors' ), - eeSrFlagCollection = cms.InputTag( "hltEcalDigisLegacy" ) + ebDetIdToBeRecovered = cms.string( "ebDetId" ), + eeDetIdToBeRecovered = cms.string( "eeDetId" ), + ebFEToBeRecovered = cms.string( "ebFE" ), + eeFEToBeRecovered = cms.string( "eeFE" ) ) process.hltEcalRecHit = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -4371,45 +4416,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHit','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltEcalPreshowerDigis = cms.EDProducer( "ESRawToDigi", sourceTag = cms.InputTag( "rawDataCollector" ), @@ -5359,18 +5366,56 @@ recHitsLabelCPUEE = cms.string( "EcalUncalibRecHitsEE" ) ) process.hltEcalRecHitSerialSync = cms.EDProducer( "EcalRecHitProducer", - recoverEEVFE = cms.bool( False ), EErechitCollection = cms.string( "EcalRecHitsEE" ), + EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), + EBrechitCollection = cms.string( "EcalRecHitsEB" ), + ChannelStatusToBeExcluded = cms.vstring( ), + killDeadChannels = cms.bool( True ), + algo = cms.string( "EcalRecHitWorkerSimple" ), + EBLaserMIN = cms.double( 0.5 ), + EELaserMIN = cms.double( 0.5 ), + EBLaserMAX = cms.double( 3.0 ), + EELaserMAX = cms.double( 8.0 ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), + skipTimeCalib = cms.bool( False ), + laserCorrection = cms.bool( True ), + flagsMapDBReco = cms.PSet( + kDead = cms.vstring( 'kNoDataNoTP' ), + kGood = cms.vstring( 'kOk', + 'kDAC', + 'kNoLaser', + 'kNoisy' ), + kTowerRecovered = cms.vstring( 'kDeadFE' ), + kNoisy = cms.vstring( 'kNNoisy', + 'kFixedG6', + 'kFixedG1' ), + kNeighboursRecovered = cms.vstring( 'kFixedG0', + 'kNonRespondingIsolated', + 'kDeadVFE' ) + ), + algoRecover = cms.string( "EcalRecHitWorkerRecover" ), recoverEBIsolatedChannels = cms.bool( False ), + recoverEEIsolatedChannels = cms.bool( False ), recoverEBVFE = cms.bool( False ), - laserCorrection = cms.bool( True ), - EBLaserMIN = cms.double( 0.5 ), - killDeadChannels = cms.bool( True ), - dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), - EEuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEE' ), + recoverEEVFE = cms.bool( False ), + recoverEBFE = cms.bool( False ), + recoverEEFE = cms.bool( False ), dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ), - EELaserMIN = cms.double( 0.5 ), + dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ), + logWarningEtThreshold_EB_FE = cms.double( 50.0 ), + logWarningEtThreshold_EE_FE = cms.double( 50.0 ), + ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), + eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ), + eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), + singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), + singleChannelRecoveryThreshold = cms.double( 8.0 ), + sum8ChannelRecoveryThreshold = cms.double( 0.0 ), + bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), + bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), + triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), cleaningConfig = cms.PSet( cThreshold_endcap = cms.double( 15.0 ), tightenCrack_e1_double = cms.double( 2.0 ), @@ -5387,45 +5432,7 @@ e4e1_a_endcap = cms.double( 0.02 ), e4e1_b_endcap = cms.double( -0.0125 ), ignoreOutOfTimeThresh = cms.double( 1.0E9 ) - ), - logWarningEtThreshold_EE_FE = cms.double( 50.0 ), - eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ), - recoverEBFE = cms.bool( False ), - eeFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeFE' ), - ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ), - singleChannelRecoveryThreshold = cms.double( 8.0 ), - sum8ChannelRecoveryThreshold = cms.double( 0.0 ), - bdtWeightFileNoCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_noCracks_ZskimData2017_v1.xml" ), - bdtWeightFileCracks = cms.FileInPath( "RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml" ), - ChannelStatusToBeExcluded = cms.vstring( ), - EBrechitCollection = cms.string( "EcalRecHitsEB" ), - triggerPrimitiveDigiCollection = cms.InputTag( 'hltEcalDigisLegacy','EcalTriggerPrimitives' ), - recoverEEFE = cms.bool( False ), - singleChannelRecoveryMethod = cms.string( "NeuralNetworks" ), - EBLaserMAX = cms.double( 3.0 ), - flagsMapDBReco = cms.PSet( - kDead = cms.vstring( 'kNoDataNoTP' ), - kGood = cms.vstring( 'kOk', - 'kDAC', - 'kNoLaser', - 'kNoisy' ), - kTowerRecovered = cms.vstring( 'kDeadFE' ), - kNoisy = cms.vstring( 'kNNoisy', - 'kFixedG6', - 'kFixedG1' ), - kNeighboursRecovered = cms.vstring( 'kFixedG0', - 'kNonRespondingIsolated', - 'kDeadVFE' ) - ), - EBuncalibRecHitCollection = cms.InputTag( 'hltEcalUncalibRecHitSerialSync','EcalUncalibRecHitsEB' ), - algoRecover = cms.string( "EcalRecHitWorkerRecover" ), - algo = cms.string( "EcalRecHitWorkerSimple" ), - EELaserMAX = cms.double( 8.0 ), - logWarningEtThreshold_EB_FE = cms.double( 50.0 ), - recoverEEIsolatedChannels = cms.bool( False ), - timeCalibTag = cms.ESInputTag( "","" ), - timeOffsetTag = cms.ESInputTag( "","" ), - skipTimeCalib = cms.bool( False ) + ) ) process.hltL1sDQMHcalReconstruction = cms.EDFilter( "HLTL1TSeed", saveTags = cms.bool( True ), @@ -5741,7 +5748,7 @@ ) process.hltParticleFlowClusterHCAL = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHE" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5765,7 +5772,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltParticleFlowRecHitHBHESoASerialSync = cms.EDProducer( "alpaka_serial_sync::PFRecHitSoAProducerHCAL", producers = cms.VPSet( @@ -5868,7 +5875,7 @@ ) process.hltParticleFlowClusterHCALSerialSync = cms.EDProducer( "PFMultiDepthClusterProducer", clustersSource = cms.InputTag( "hltParticleFlowClusterHBHESerialSync" ), - usePFThresholdsFromDB = cms.bool( True ), + energyCorrector = cms.PSet( ), pfClusterBuilder = cms.PSet( allCellsPositionCalc = cms.PSet( minAllowedNormalization = cms.double( 1.0E-9 ), @@ -5892,7 +5899,7 @@ nSigmaEta = cms.double( 2.0 ) ), positionReCalc = cms.PSet( ), - energyCorrector = cms.PSet( ) + usePFThresholdsFromDB = cms.bool( True ) ) process.hltPreDQMRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), @@ -7087,18 +7094,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( False ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( ), - mvaScaleStdBL1 = cms.vdouble( ), - mvaScaleMeanEL1 = cms.vdouble( ), - mvaScaleStdEL1 = cms.vdouble( ), - mvaScaleMeanBL2 = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), - mvaScaleStdBL2 = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), - mvaScaleMeanEL2 = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), - mvaScaleStdEL2 = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 4.332629261558539E-4, 4.689795312031938E-6, 7.644844964566431E-6, 6.580623848546099E-4, 0.00523266117445817, 5.6968993532947E-4, 0.20322471101222087, -0.005575351463397025, 0.18247595248098955, 1.5342398341020196E-4 ), + mvaScaleStdB = cms.vdouble( 7.444819891335438E-4, 0.0014335177986615237, 0.003503839482232683, 0.07764362324530726, 0.8223406268068466, 0.6392468338330071, 0.2405783807668161, 0.2904161358810494, 0.21887441827342669, 0.27045195352036544 ), + mvaScaleMeanE = cms.vdouble( 3.120747098810717E-4, 4.5298701434656295E-6, 1.2002076996572005E-5, 0.007900535887258366, -0.022166389143849694, 7.12338927507459E-4, 0.22819667672872926, -0.0039375694144792705, 0.19304371973554835, -1.2936058928324214E-5 ), + mvaScaleStdE = cms.vdouble( 6.302274350028021E-4, 0.0013138279991871378, 0.004880335178644773, 0.32509543981045624, 0.9449952711981982, 0.279802349646327, 0.3193063648341999, 0.3334815828876066, 0.22528017441813106, 0.2822750719936266 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7384,18 +7385,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_barrel_v3.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0_PatatrackSeeds_endcap_v3.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), - mvaScaleStdBL1 = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), - mvaScaleMeanEL1 = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), - mvaScaleStdEL1 = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_barrel_v3.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter0FromL1_PatatrackSeeds_endcap_v3.xml" ), + mvaScaleMeanB = cms.vdouble( 3.999966523561405E-4, 1.5340202670472034E-5, 2.6710290157638425E-5, 5.978116313043455E-4, 0.0049135275917734636, 3.4305653488182246E-5, 0.24525118734715307, -0.0024635178849904426 ), + mvaScaleStdB = cms.vdouble( 7.666933596884494E-4, 0.015685297920984408, 0.026294325262867256, 0.07665283880432934, 0.834879854164998, 0.5397258722194461, 0.2807075832224741, 0.32820882609116625 ), + mvaScaleMeanE = cms.vdouble( 3.017047347441654E-4, 9.077959353128816E-5, 2.7101609045025927E-4, 0.004557390407735609, -0.020781128525626812, 9.286198943080588E-4, 0.26674085200387376, -0.002971698676536822 ), + mvaScaleStdE = cms.vdouble( 8.125341035878315E-4, 0.19268436761240013, 0.579019516987623, 0.3222327708969556, 1.0567488273501275, 0.2648980106841699, 0.30889713721141826, 0.3593729790466801 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), @@ -7647,18 +7642,12 @@ L2Muon = cms.InputTag( "hltL2MuonCandidates" ), rejectAll = cms.bool( False ), isFromL1 = cms.bool( True ), - mvaFileBL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), - mvaFileEL1 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), - mvaFileBL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_barrel.xml" ), - mvaFileEL2 = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter2Seeds_endcap.xml" ), - mvaScaleMeanBL1 = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), - mvaScaleStdBL1 = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), - mvaScaleMeanEL1 = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), - mvaScaleStdEL1 = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), - mvaScaleMeanBL2 = cms.vdouble( ), - mvaScaleStdBL2 = cms.vdouble( ), - mvaScaleMeanEL2 = cms.vdouble( ), - mvaScaleStdEL2 = cms.vdouble( ), + mvaFileB = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_barrel_v1.xml" ), + mvaFileE = cms.FileInPath( "RecoMuon/TrackerSeedGenerator/data/xgb_Run3_Iter3FromL1_DoubletSeeds_endcap_v1.xml" ), + mvaScaleMeanB = cms.vdouble( 0.006826621711798213, 1.340471761359199E-5, 2.5827749083302998E-6, 3.8329754175309627E-4, -0.006327854398161656, 0.0017211841076523692, 0.2760538806332439, -0.010429922003892818 ), + mvaScaleStdB = cms.vdouble( 0.006225819995879627, 7.4048803387083885E-6, 3.6347963283736586E-6, 0.062213478665703675, 0.828854421408699, 0.3714730344087147, 0.42155116686695293, 0.38566415759730355 ), + mvaScaleMeanE = cms.vdouble( 0.0013243955281318262, 7.150658575633707E-6, 1.0493070182976E-5, -0.004802713888821372, -0.022186379498012398, 8.335525228198972E-4, 0.2915475574025415, -0.01200308471140653 ), + mvaScaleStdE = cms.vdouble( 0.0013768261827517547, 7.80116971559064E-6, 8.819635719472336E-5, 0.27824938208607475, 1.798678366076454, 0.16556388679148643, 0.48300543536161705, 0.401204958844809 ), doSort = cms.bool( False ), nSeedsMaxB = cms.int32( 99999 ), nSeedsMaxE = cms.int32( 99999 ), diff --git a/HLTrigger/Configuration/test/getFrozenHLT.sh b/HLTrigger/Configuration/test/getFrozenHLT.sh index 2e191ecfe64df..0aa53bc38b9ef 100755 --- a/HLTrigger/Configuration/test/getFrozenHLT.sh +++ b/HLTrigger/Configuration/test/getFrozenHLT.sh @@ -9,10 +9,10 @@ # Configuration/HLT/python/autoCondHLT.py , and # HLTrigger/Configuration/python/Tools/options.py declare -A TABLES=( - ["Fake"]="/dev/CMSSW_14_0_0/Fake" - ["Fake1"]="/dev/CMSSW_14_0_0/Fake1" - ["Fake2"]="/dev/CMSSW_14_0_0/Fake2" - ["2024v14"]="/frozen/2024/2e34/v1.4/HLT" + ["Fake"]="/dev/CMSSW_14_1_0/Fake" + ["Fake1"]="/dev/CMSSW_14_1_0/Fake1" + ["Fake2"]="/dev/CMSSW_14_1_0/Fake2" + ["2024v14"]="/frozen/2024/2e34/v1.4/CMSSW_14_1_X/HLT" ) # command-line arguments diff --git a/HLTrigger/Configuration/test/getHLT.sh b/HLTrigger/Configuration/test/getHLT.sh index 4bd6a004e0d50..5c3eb7238fcce 100755 --- a/HLTrigger/Configuration/test/getHLT.sh +++ b/HLTrigger/Configuration/test/getHLT.sh @@ -1,7 +1,7 @@ #!/bin/bash # ConfDB directory hosting the HLT configurations -CONFDBDIR="/dev/CMSSW_14_0_0" +CONFDBDIR="/dev/CMSSW_14_1_0" # ConfDB configurations to use # - if no explicit version, the most recent one is taken