diff --git a/HLTrigger/Configuration/python/HLT_2023v12_cff.py b/HLTrigger/Configuration/python/HLT_2023v12_cff.py index 25f9d1dfd73b0..6db920f9755e4 100644 --- a/HLTrigger/Configuration/python/HLT_2023v12_cff.py +++ b/HLTrigger/Configuration/python/HLT_2023v12_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT --cff --data --type 2023v12 +# hltGetConfiguration /frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT --cff --data --type 2023v12 -# /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V8 (CMSSW_13_2_3) +# /frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT/V3 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V8') + tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT/V3') ) fragment.transferSystem = cms.PSet( @@ -4444,7 +4444,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -6235,6 +6238,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -6385,6 +6389,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -6486,6 +6492,8 @@ 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", @@ -10981,6 +10989,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -38239,6 +38249,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -58230,7 +58241,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -58244,6 +58266,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -64307,7 +64331,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -64324,6 +64359,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -67081,7 +67118,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -67322,7 +67359,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -68458,7 +68495,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -71017,7 +71054,7 @@ ) fragment.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -71317,7 +71354,7 @@ ) fragment.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -72236,7 +72273,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 2c66e39f685ca..624466e48aed5 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/HLT --cff --data --type FULL +# hltGetConfiguration /dev/CMSSW_13_3_0/HLT --cff --data --type FULL -# /dev/CMSSW_13_2_0/HLT/V95 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/HLT/V19 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/HLT/V95') + tableName = cms.string('/dev/CMSSW_13_3_0/HLT/V19') ) fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -9908,7 +9908,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -11734,6 +11737,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -11884,6 +11888,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -11985,6 +11991,8 @@ 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", @@ -15424,7 +15432,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -16772,6 +16780,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -18459,7 +18469,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheckCPUOnly = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventCPUOnly" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersLegacy" ), @@ -47287,6 +47297,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -68605,7 +68616,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -68619,6 +68641,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -74944,7 +74968,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -74961,6 +74996,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -77835,7 +77872,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -78076,7 +78113,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -79137,7 +79174,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -82173,7 +82210,7 @@ ) fragment.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -82473,7 +82510,7 @@ ) fragment.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -83449,7 +83486,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -95466,7 +95503,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -95716,7 +95753,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -95944,7 +95981,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -96275,7 +96312,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -96510,7 +96547,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventFullPPOnAA" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -101452,7 +101489,7 @@ ) fragment.hltPixelClusterCheckForUPCPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -104341,7 +104378,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -104564,7 +104601,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -104792,7 +104829,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -104996,7 +105033,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105198,7 +105235,7 @@ ) fragment.hltFullIter3PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105395,7 +105432,7 @@ ) fragment.hltFullIter7MixedClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105738,7 +105775,7 @@ ) fragment.hltFullIter8PixelLessClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105951,7 +105988,7 @@ ) fragment.hltFullIter9TobTecClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -106326,9 +106363,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) fragment.hltFullIter10CkfTrackCandidatesPPOnAA = cms.EDProducer( "CkfTrackCandidateMaker", @@ -110022,7 +110059,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -110257,7 +110294,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -110485,7 +110522,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -110689,7 +110726,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -110891,7 +110928,7 @@ ) fragment.hltFullIter3PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111078,7 +111115,7 @@ ) fragment.hltFullIter4PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111275,7 +111312,7 @@ ) fragment.hltFullIter5PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111416,7 +111453,7 @@ ) fragment.hltFullIter6PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111661,7 +111698,7 @@ ) fragment.hltFullIter7MixedClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112004,7 +112041,7 @@ ) fragment.hltFullIter8PixelLessClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112217,7 +112254,7 @@ ) fragment.hltFullIter9TobTecClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112592,9 +112629,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) fragment.hltFullIter10CkfTrackCandidatesPPRef = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index 786d160e34132..8f274ca27e13b 100644 --- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake1 --cff --data --type Fake1 +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake1 --cff --data --type Fake1 -# /dev/CMSSW_13_2_0/Fake1/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake1/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake1/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake1/V6') ) 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 0ab9c5c281a3b..1651f535c61dc 100644 --- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake2 --cff --data --type Fake2 +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake2 --cff --data --type Fake2 -# /dev/CMSSW_13_2_0/Fake2/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake2/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake2/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake2/V6') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -108,6 +108,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 07b8196077697..d9707589952d0 100644 --- a/HLTrigger/Configuration/python/HLT_Fake_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake --cff --data --type Fake +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake --cff --data --type Fake -# /dev/CMSSW_13_2_0/Fake/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake/V6') ) 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 4bfa96a374855..85ec1b547961a 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/GRun --cff --data --type GRun +# hltGetConfiguration /dev/CMSSW_13_3_0/GRun --cff --data --type GRun -# /dev/CMSSW_13_2_0/GRun/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/GRun/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/GRun/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/GRun/V11') ) fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -4405,7 +4405,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -6231,6 +6234,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -6381,6 +6385,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -6482,6 +6488,8 @@ 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", @@ -9790,7 +9798,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -11138,6 +11146,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -12825,7 +12835,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheckCPUOnly = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventCPUOnly" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersLegacy" ), @@ -38824,6 +38834,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -58815,7 +58826,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -58829,6 +58851,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -64892,7 +64916,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) fragment.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -64909,6 +64944,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) fragment.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -67666,7 +67703,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -67907,7 +67944,7 @@ ) fragment.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -69089,7 +69126,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -72137,7 +72174,7 @@ ) fragment.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -72437,7 +72474,7 @@ ) fragment.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -73356,7 +73393,7 @@ ) fragment.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 6e81f8164335d..af20933d27668 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/HIon --cff --data --type HIon +# hltGetConfiguration /dev/CMSSW_13_3_0/HIon --cff --data --type HIon -# /dev/CMSSW_13_2_0/HIon/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/HIon/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/HIon/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/HIon/V11') ) fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -6790,7 +6790,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -8616,6 +8619,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -8766,6 +8770,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -8867,6 +8873,8 @@ 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", @@ -12462,7 +12470,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -12712,7 +12720,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -12940,7 +12948,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -13271,7 +13279,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -13506,7 +13514,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventFullPPOnAA" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -18954,7 +18962,7 @@ ) fragment.hltPixelClusterCheckForUPCPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -21843,7 +21851,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -22066,7 +22074,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22294,7 +22302,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22498,7 +22506,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22700,7 +22708,7 @@ ) fragment.hltFullIter3PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22897,7 +22905,7 @@ ) fragment.hltFullIter7MixedClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23240,7 +23248,7 @@ ) fragment.hltFullIter8PixelLessClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23453,7 +23461,7 @@ ) fragment.hltFullIter9TobTecClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23828,9 +23836,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) fragment.hltFullIter10CkfTrackCandidatesPPOnAA = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 72d47d8b51b0d..cc582a2c9f8c3 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/PIon --cff --data --type PIon +# hltGetConfiguration /dev/CMSSW_13_3_0/PIon --cff --data --type PIon -# /dev/CMSSW_13_2_0/PIon/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/PIon/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/PIon/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/PIon/V11') ) fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -1836,7 +1836,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -3679,6 +3682,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 9c88601e9f10d..e22f999ebe26c 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/PRef --cff --data --type PRef +# hltGetConfiguration /dev/CMSSW_13_3_0/PRef --cff --data --type PRef -# /dev/CMSSW_13_2_0/PRef/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/PRef/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/PRef/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/PRef/V11') ) fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -2181,7 +2181,10 @@ ) fragment.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) fragment.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -4007,6 +4010,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -4157,6 +4161,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -4258,6 +4264,8 @@ 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", @@ -7728,7 +7736,7 @@ ) fragment.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -14397,7 +14405,7 @@ ) fragment.hltFullIter0PixelClusterCheckPreSplittingPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -14632,7 +14640,7 @@ ) fragment.hltFullIter0PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -14860,7 +14868,7 @@ ) fragment.hltFullIter1PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15064,7 +15072,7 @@ ) fragment.hltFullIter2PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15266,7 +15274,7 @@ ) fragment.hltFullIter3PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15453,7 +15461,7 @@ ) fragment.hltFullIter4PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15650,7 +15658,7 @@ ) fragment.hltFullIter5PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15791,7 +15799,7 @@ ) fragment.hltFullIter6PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16036,7 +16044,7 @@ ) fragment.hltFullIter7MixedClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16379,7 +16387,7 @@ ) fragment.hltFullIter8PixelLessClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16592,7 +16600,7 @@ ) fragment.hltFullIter9TobTecClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16967,9 +16975,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) fragment.hltFullIter10CkfTrackCandidatesPPRef = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py index 221e559481a16..83864ea97e8c4 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_13_2_0/GRun +# /dev/CMSSW_13_3_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 2346a451e9cd2..0085c9d40f821 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_13_2_0/HIon +# /dev/CMSSW_13_3_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 da02bba25cc3a..e1c95269a6c41 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_13_2_0/PIon +# /dev/CMSSW_13_3_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 dcb589b059065..3c306947949aa 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_13_2_0/PRef +# /dev/CMSSW_13_3_0/PRef import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 6f145fb14545c..9e6b7fe27d1a1 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -234,34 +234,6 @@ def customiseForOffline(process): return process -def customizeHLTfor42497(process): - for producer in esproducers_by_type(process, 'SiPixelQualityESProducer'): - producer.siPixelQualityFromDbLabel = cms.string('') - producer.appendToDataLabel = cms.string('') - for parName in [ - 'siPixelQualityLabel', - 'siPixelQualityLabel_RawToDigi', - ]: - if hasattr(producer, parName): - producer.__delattr__(parName) - - return process - -def customizeHLTfor42943(process): - - for prod in producers_by_type(process, 'ClusterCheckerEDProducer'): - if hasattr(prod, "MaxNumberOfCosmicClusters"): - prod.MaxNumberOfStripClusters = getattr(prod,"MaxNumberOfCosmicClusters") - prod.__delattr__("MaxNumberOfCosmicClusters") - - for prod in producers_by_type(process, 'SeedGeneratorFromRegionHitsEDProducer'): - if hasattr(prod, "ClusterCheckPSet"): - clustCheckPSet = getattr(prod,"ClusterCheckPSet") - prod.ClusterCheckPSet.MaxNumberOfStripClusters = getattr(clustCheckPSet,"MaxNumberOfCosmicClusters") - clustCheckPSet.__delattr__("MaxNumberOfCosmicClusters") - - return process - # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -270,7 +242,4 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - process = customizeHLTfor42497(process) - process = customizeHLTfor42943(process) - return process diff --git a/HLTrigger/Configuration/tables/makeSubTables b/HLTrigger/Configuration/tables/makeSubTables index bfebaedd8b837..8352e85bc05a6 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_13_2_0/HLT" # no version, take the latest one -TARGET="/dev/CMSSW_13_2_0/TABLE" # directory where to store the sub-tables +MASTER="/dev/CMSSW_13_3_0/HLT" # no version, take the latest one +TARGET="/dev/CMSSW_13_3_0/TABLE" # directory where to store the sub-tables TABLES="GRun HIon PIon PRef" # which sub-tables to create source subtables.sh diff --git a/HLTrigger/Configuration/test/OnLine_HLT_2023v12.py b/HLTrigger/Configuration/test/OnLine_HLT_2023v12.py index 6764846292f65..51b344612ed4d 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_2023v12.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_2023v12.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT --full --data --type 2023v12 --unprescale --process HLT2023v12 --globaltag auto:run3_hlt_2023v12 --input file:RelVal_Raw_2023v12_DATA.root +# hltGetConfiguration /frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT --full --data --type 2023v12 --unprescale --process HLT2023v12 --globaltag auto:run3_hlt_2023v12 --input file:RelVal_Raw_2023v12_DATA.root -# /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V8 (CMSSW_13_2_3) +# /frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT/V3 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V8') + tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT/V3') ) process.transferSystem = cms.PSet( @@ -4622,7 +4622,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -6343,8 +6346,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -6515,6 +6517,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -6665,6 +6668,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -6766,6 +6771,8 @@ 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", @@ -11261,6 +11268,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -38519,6 +38528,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -58510,7 +58520,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -58524,6 +58545,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -64587,7 +64610,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -64604,6 +64638,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -67361,7 +67397,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -67602,7 +67638,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -68738,7 +68774,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -71297,7 +71333,7 @@ ) process.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -71597,7 +71633,7 @@ ) process.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -72516,7 +72552,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClustersRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 8756da394ab02..6fa3b2d033ce2 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_13_2_0/HLT/V95 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/HLT/V19 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/HLT/V95') + tableName = cms.string('/dev/CMSSW_13_3_0/HLT/V19') ) process.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -10086,7 +10086,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -11842,8 +11845,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -12014,6 +12016,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -12164,6 +12167,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -12265,6 +12270,8 @@ 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", @@ -15704,7 +15711,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -17052,6 +17059,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -18739,7 +18748,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheckCPUOnly = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventCPUOnly" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersLegacy" ), @@ -47567,6 +47576,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -68885,7 +68895,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -68899,6 +68920,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -75224,7 +75247,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -75241,6 +75275,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -78115,7 +78151,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -78356,7 +78392,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -79417,7 +79453,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -82453,7 +82489,7 @@ ) process.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -82753,7 +82789,7 @@ ) process.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -83729,7 +83765,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -95746,7 +95782,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -95996,7 +96032,7 @@ ) process.hltFullIter0PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -96224,7 +96260,7 @@ ) process.hltFullIter1PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -96555,7 +96591,7 @@ ) process.hltFullIter2PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -96790,7 +96826,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventFullPPOnAA" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -101732,7 +101768,7 @@ ) process.hltPixelClusterCheckForUPCPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -104621,7 +104657,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -104844,7 +104880,7 @@ ) process.hltFullIter0PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105072,7 +105108,7 @@ ) process.hltFullIter1PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105276,7 +105312,7 @@ ) process.hltFullIter2PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105478,7 +105514,7 @@ ) process.hltFullIter3PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -105675,7 +105711,7 @@ ) process.hltFullIter7MixedClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -106018,7 +106054,7 @@ ) process.hltFullIter8PixelLessClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -106231,7 +106267,7 @@ ) process.hltFullIter9TobTecClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -106606,9 +106642,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) process.hltFullIter10CkfTrackCandidatesPPOnAA = cms.EDProducer( "CkfTrackCandidateMaker", @@ -110302,7 +110338,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -110537,7 +110573,7 @@ ) process.hltFullIter0PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -110765,7 +110801,7 @@ ) process.hltFullIter1PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -110969,7 +111005,7 @@ ) process.hltFullIter2PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111171,7 +111207,7 @@ ) process.hltFullIter3PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111358,7 +111394,7 @@ ) process.hltFullIter4PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111555,7 +111591,7 @@ ) process.hltFullIter5PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111696,7 +111732,7 @@ ) process.hltFullIter6PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -111941,7 +111977,7 @@ ) process.hltFullIter7MixedClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112284,7 +112320,7 @@ ) process.hltFullIter8PixelLessClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112497,7 +112533,7 @@ ) process.hltFullIter9TobTecClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -112872,9 +112908,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) process.hltFullIter10CkfTrackCandidatesPPRef = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index 84fed720efa9e..e1e4d5920545f 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake --full --data --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake --full --data --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_13_2_0/Fake/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake/V6') ) 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 465bcbae0ec77..9b57017d30345 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake1 --full --data --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake1 --full --data --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_13_2_0/Fake1/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake1/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake1/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake1/V6') ) 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 b3cfac0a53818..47d9aabb5f5f8 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/Fake2 --full --data --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/Fake2 --full --data --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_13_2_0/Fake2/V7 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/Fake2/V6 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -8,7 +8,7 @@ process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/Fake2/V7') + tableName = cms.string('/dev/CMSSW_13_3_0/Fake2/V6') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -212,6 +212,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index 0bda88df13ad5..c65a712e532b7 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_13_2_0/GRun/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/GRun/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/GRun/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/GRun/V11') ) process.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -4583,7 +4583,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -6339,8 +6342,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -6511,6 +6513,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -6661,6 +6664,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -6762,6 +6767,8 @@ 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", @@ -10070,7 +10077,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -11418,6 +11425,8 @@ 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.hltTowerMakerForAllCPUOnly = cms.EDProducer( "CaloTowersCreator", @@ -13105,7 +13114,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheckCPUOnly = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventCPUOnly" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersLegacy" ), @@ -39104,6 +39113,7 @@ minDEDx = cms.double( -1.0 ), minPT = cms.double( 50.0 ), minNOM = cms.double( -1.0 ), + minETA = cms.double( 0.0 ), maxETA = cms.double( 5.5 ), minNumValidHits = cms.double( 5.0 ), maxNHitMissIn = cms.double( 0.0 ), @@ -59095,7 +59105,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForBtag" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTags = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagInfos" ), @@ -59109,6 +59130,8 @@ 'probuds', 'probg', 'ptcorr' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTags = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -65172,7 +65195,18 @@ pf_candidates = cms.InputTag( "hltParticleFlow" ), jets = cms.InputTag( "hltPFJetForPNetAK8" ), puppi_value_map = cms.InputTag( "" ), - vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ) + vertex_associator = cms.InputTag( 'hltPrimaryVertexAssociation','original' ), + use_scouting_features = cms.bool( False ), + normchi2_value_map = cms.InputTag( "" ), + dz_value_map = cms.InputTag( "" ), + dxy_value_map = cms.InputTag( "" ), + dzsig_value_map = cms.InputTag( "" ), + dxysig_value_map = cms.InputTag( "" ), + lostInnerHits_value_map = cms.InputTag( "" ), + quality_value_map = cms.InputTag( "" ), + trkPt_value_map = cms.InputTag( "" ), + trkEta_value_map = cms.InputTag( "" ), + trkPhi_value_map = cms.InputTag( "" ) ) process.hltParticleNetONNXJetTagsAK8 = cms.EDProducer( "BoostedJetONNXJetTagsProducer", src = cms.InputTag( "hltParticleNetJetTagsInfosAK8" ), @@ -65189,6 +65223,8 @@ 'probQCD2hf', 'probQCD1hf', 'probQCD0hf' ), + jets = cms.InputTag( "" ), + produceValueMap = cms.untracked.bool( False ), debugMode = cms.untracked.bool( False ) ) process.hltParticleNetDiscriminatorsJetTagsAK8 = cms.EDProducer( "BTagProbabilityToDiscriminator", @@ -67946,7 +67982,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForGlbDisplacedMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -68187,7 +68223,7 @@ ) process.hltDisplacedhltIter4PixelLessClusterCheckForDisplacedTkMuons = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -69369,7 +69405,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheckForTau = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -72417,7 +72453,7 @@ ) process.hltIter1PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -72717,7 +72753,7 @@ ) process.hltIter2PFlowPixelClusterCheckForDisplaced = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), @@ -73636,7 +73672,7 @@ ) process.hltDisplacedhltIter4PFlowPixelLessClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 800000 ), + MaxNumberOfStripClusters = cms.uint32( 800000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventRegForDisplaced" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersRegForDisplaced" ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index bda72885c871d..dd0310ec21dd1 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_13_2_0/HIon/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/HIon/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/HIon/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/HIon/V11') ) process.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -6968,7 +6968,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -8724,8 +8727,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -8896,6 +8898,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -9046,6 +9049,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -9147,6 +9152,8 @@ 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", @@ -12742,7 +12749,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -12992,7 +12999,7 @@ ) process.hltFullIter0PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -13220,7 +13227,7 @@ ) process.hltFullIter1PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -13551,7 +13558,7 @@ ) process.hltFullIter2PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -13786,7 +13793,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventFullPPOnAA" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAA" ), @@ -19234,7 +19241,7 @@ ) process.hltPixelClusterCheckForUPCPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -22123,7 +22130,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersPPOnAA" ), @@ -22346,7 +22353,7 @@ ) process.hltFullIter0PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22574,7 +22581,7 @@ ) process.hltFullIter1PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22778,7 +22785,7 @@ ) process.hltFullIter2PixelClusterCheckPPOnAAForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -22980,7 +22987,7 @@ ) process.hltFullIter3PixelClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23177,7 +23184,7 @@ ) process.hltFullIter7MixedClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23520,7 +23527,7 @@ ) process.hltFullIter8PixelLessClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -23733,7 +23740,7 @@ ) process.hltFullIter9TobTecClusterCheckPPOnAA = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 120000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), @@ -24108,9 +24115,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPOnAAForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEventPPOnAA" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) process.hltFullIter10CkfTrackCandidatesPPOnAA = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index 75ac0fb42a0bb..28285f8ce77b5 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_13_2_0/PIon/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/PIon/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/PIon/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/PIon/V11') ) process.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -2014,7 +2014,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -3770,8 +3773,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -3959,6 +3961,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index b81e134992aee..ff5821ca1d83c 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,6 +1,6 @@ -# hltGetConfiguration /dev/CMSSW_13_2_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root +# hltGetConfiguration /dev/CMSSW_13_3_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_13_2_0/PRef/V73 (CMSSW_13_2_3) +# /dev/CMSSW_13_3_0/PRef/V11 (CMSSW_13_3_0) import FWCore.ParameterSet.Config as cms @@ -12,7 +12,7 @@ process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA() process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_13_2_0/PRef/V73') + tableName = cms.string('/dev/CMSSW_13_3_0/PRef/V11') ) process.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( @@ -2359,7 +2359,10 @@ ) process.ctppsInterpolatedOpticalFunctionsESSource = cms.ESProducer( "CTPPSInterpolatedOpticalFunctionsESSource", lhcInfoLabel = cms.string( "" ), + lhcInfoPerFillLabel = cms.string( "" ), + lhcInfoPerLSLabel = cms.string( "" ), opticsLabel = cms.string( "" ), + useNewLHCInfo = cms.bool( False ), appendToDataLabel = cms.string( "" ) ) process.ecalDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", @@ -4115,8 +4118,7 @@ appendToDataLabel = cms.string( "" ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - siPixelQualityLabel_RawToDigi = cms.string( "" ), + siPixelQualityFromDbLabel = cms.string( "" ), ListOfRecordToMerge = cms.VPSet( cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), tag = cms.string( "" ) @@ -4287,6 +4289,7 @@ AlgorithmTriggersUnprescaled = cms.bool( True ), RequireMenuToMatchAlgoBlkInput = cms.bool( True ), AlgorithmTriggersUnmasked = cms.bool( True ), + AXOL1TLModelVersion = cms.string( "" ), useMuonShowers = cms.bool( True ), resetPSCountersEachLumiSec = cms.bool( True ), semiRandomInitialPSCounters = cms.bool( False ), @@ -4437,6 +4440,8 @@ digisLabelEE = cms.InputTag( 'hltEcalDigisGPU','eeDigis' ), recHitsLabelEB = cms.string( "EcalUncalibRecHitsEB" ), recHitsLabelEE = cms.string( "EcalUncalibRecHitsEE" ), + timeCalibTag = cms.ESInputTag( "","" ), + timeOffsetTag = cms.ESInputTag( "","" ), EBtimeFitLimits_Lower = cms.double( 0.2 ), EBtimeFitLimits_Upper = cms.double( 1.4 ), EEtimeFitLimits_Lower = cms.double( 0.2 ), @@ -4538,6 +4543,8 @@ 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", @@ -8008,7 +8015,7 @@ ) process.hltDoubletRecoveryPFlowPixelClusterCheck = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), MaxNumberOfPixelClusters = cms.uint32( 40000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -14677,7 +14684,7 @@ ) process.hltFullIter0PixelClusterCheckPreSplittingPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltHITrackingSiStripRawToClustersFacilityZeroSuppression" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), @@ -14912,7 +14919,7 @@ ) process.hltFullIter0PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15140,7 +15147,7 @@ ) process.hltFullIter1PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15344,7 +15351,7 @@ ) process.hltFullIter2PixelClusterCheckPPRefForDmeson = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15546,7 +15553,7 @@ ) process.hltFullIter3PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15733,7 +15740,7 @@ ) process.hltFullIter4PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -15930,7 +15937,7 @@ ) process.hltFullIter5PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16071,7 +16078,7 @@ ) process.hltFullIter6PixelClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( True ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), + MaxNumberOfStripClusters = cms.uint32( 500000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 150000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16316,7 +16323,7 @@ ) process.hltFullIter7MixedClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16659,7 +16666,7 @@ ) process.hltFullIter8PixelLessClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -16872,7 +16879,7 @@ ) process.hltFullIter9TobTecClusterCheckPPRef = cms.EDProducer( "ClusterCheckerEDProducer", doClusterCheck = cms.bool( False ), - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripRawToClustersFacility" ), MaxNumberOfPixelClusters = cms.uint32( 10000 ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), @@ -17247,9 +17254,9 @@ MaxNumberOfPixelClusters = cms.uint32( 150000 ), cut = cms.string( "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)" ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClustersAfterSplittingPPRefForDmeson" ), - MaxNumberOfCosmicClusters = cms.uint32( 500000 ), doClusterCheck = cms.bool( True ), - ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ) + ClusterCollectionLabel = cms.InputTag( "hltMeasurementTrackerEvent" ), + MaxNumberOfStripClusters = cms.uint32( 500000 ) ) ) process.hltFullIter10CkfTrackCandidatesPPRef = cms.EDProducer( "CkfTrackCandidateMaker", diff --git a/HLTrigger/Configuration/test/getFrozenHLT.sh b/HLTrigger/Configuration/test/getFrozenHLT.sh index b6a7e5a0370d2..849cf0d5db9b7 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_13_2_0/Fake" - ["Fake1"]="/dev/CMSSW_13_2_0/Fake1" - ["Fake2"]="/dev/CMSSW_13_2_0/Fake2" - ["2023v12"]="/frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT" + ["Fake"]="/dev/CMSSW_13_3_0/Fake" + ["Fake1"]="/dev/CMSSW_13_3_0/Fake1" + ["Fake2"]="/dev/CMSSW_13_3_0/Fake2" + ["2023v12"]="/frozen/2023/2e34/v1.2/CMSSW_13_3_X/HLT" ) # command-line arguments diff --git a/HLTrigger/Configuration/test/getHLT.sh b/HLTrigger/Configuration/test/getHLT.sh index 150733780f737..0386fa1958b91 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_13_2_0" +CONFDBDIR="/dev/CMSSW_13_3_0" # ConfDB configurations to use # - if no explicit version, the most recent one is taken