From 1482e38285ff52b170363485c0440796e54f5d52 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 17 Sep 2014 00:24:10 +0900 Subject: [PATCH 1/6] fix HLT_GRun_cff.py for SLHC --- .../Configuration/python/HLT_GRun_cff.py | 811 ++++++++++++++---- 1 file changed, 645 insertions(+), 166 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 9e4fa9f97abd8..01c583ee64ebc 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1988,6 +1988,8 @@ pseudoMultiplicityMin = cms.uint32( 2 ), categoryVariableName = cms.string( "vertexCategory" ), trackSelection = cms.PSet( + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), qualityClass = cms.string( "any" ), @@ -2015,6 +2017,8 @@ pseudoVertexV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.05 ) ), trackMultiplicityMin = cms.uint32( 3 ), trackPseudoSelection = cms.PSet( + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), qualityClass = cms.string( "any" ), @@ -5668,6 +5672,7 @@ hscpParameters = cms.PSet( ) ) hltTowerMakerForPF = cms.EDProducer( "CaloTowersCreator", + HcalPhase = cms.int32(2), EBSumThreshold = cms.double( 0.2 ), MomHBDepth = cms.double( 0.2 ), UseEtEBTreshold = cms.bool( False ), @@ -6149,7 +6154,7 @@ CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableGEMMeasurement = cms.bool( False ), + EnableGEMMeasurement = cms.bool( True ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) @@ -6206,7 +6211,7 @@ EnableDTMeasurement = cms.bool( True ), RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ), Propagator = cms.string( "hltESPFastSteppingHelixPropagatorAny" ), - EnableGEMMeasurement = cms.bool( False ), + EnableGEMMeasurement = cms.bool( True ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ) ), @@ -6240,7 +6245,7 @@ EnableDTMeasurement = cms.bool( True ), RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ), Propagator = cms.string( "hltESPFastSteppingHelixPropagatorAny" ), - EnableGEMMeasurement = cms.bool( False ), + EnableGEMMeasurement = cms.bool( True ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ) ), @@ -6470,6 +6475,8 @@ MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), RefitDirection = cms.string( "insideOut" ), CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), + GEMRecHitLabel = cms.InputTag("gemRecHits"), + Chi2CutGEM = cms.double(150.0), Chi2CutCSC = cms.double( 150.0 ), Chi2CutDT = cms.double( 10.0 ), RefitRPCHits = cms.bool( True ), @@ -6721,6 +6728,8 @@ MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), RefitDirection = cms.string( "insideOut" ), CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), + GEMRecHitLabel = cms.InputTag("gemRecHits"), + Chi2CutGEM = cms.double(150.0), Chi2CutCSC = cms.double( 150.0 ), Chi2CutDT = cms.double( 10.0 ), RefitRPCHits = cms.bool( True ), @@ -6964,6 +6973,8 @@ MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), RefitDirection = cms.string( "insideOut" ), CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), + GEMRecHitLabel = cms.InputTag("gemRecHits"), + Chi2CutGEM = cms.double(150.0), Chi2CutCSC = cms.double( 150.0 ), Chi2CutDT = cms.double( 10.0 ), RefitRPCHits = cms.bool( True ), @@ -8385,27 +8396,53 @@ ptThresholdToFillCandidateP4WithGlobalFit = cms.double( 200.0 ), minNumberOfMatches = cms.int32( 1 ) ) -hltParticleFlowRecHitECAL = cms.EDProducer( "PFRecHitProducerECAL", - crossBarrelEndcapBorder = cms.bool( False ), - verbose = cms.untracked.bool( False ), - ecalRecHitsEE = cms.InputTag( 'hltEcalRecHitAll','EcalRecHitsEE' ), - ecalRecHitsEB = cms.InputTag( 'hltEcalRecHitAll','EcalRecHitsEB' ), - thresh_Cleaning_EB = cms.double( 2.0 ), - timing_Cleaning = cms.bool( True ), - thresh_Barrel = cms.double( 0.08 ), - thresh_Cleaning_EE = cms.double( 1.0E9 ), - topological_Cleaning = cms.bool( True ), - thresh_Endcap = cms.double( 0.3 ) -) -hltParticleFlowRecHitHCAL = cms.EDProducer( "PFRecHitProducerHCAL", +## updated from 7_2_X +hltParticleFlowRecHitECAL = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.08 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ), + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) + ) + ), + name = cms.string( "PFEBRecHitCreator" ) + ), + cms.PSet( src = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.3 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ), + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) + ) + ), + name = cms.string( "PFEERecHitCreator" ) + ) + ), + navigator = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( ), + name = cms.string( "PFRecHitECALNavigator" ) + ) +) +hltParticleFlowRecHitHCAL = cms.EDProducer( "PFCTRecHitProducer", ECAL_Compensate = cms.bool( False ), ECAL_Dead_Code = cms.uint32( 10 ), MinLongTiming_Cut = cms.double( -5.0 ), - verbose = cms.untracked.bool( False ), ECAL_Compensation = cms.double( 0.5 ), MaxLongTiming_Cut = cms.double( 5.0 ), weight_HFhad = cms.double( 1.0 ), - ApplyPulseDPG = cms.bool( True ), + ApplyPulseDPG = cms.bool( False ), + navigator = cms.PSet( name = cms.string( "PFRecHitCaloTowerNavigator" ) ), ECAL_Threshold = cms.double( 10.0 ), ApplyTimeDPG = cms.bool( False ), caloTowers = cms.InputTag( "hltTowerMakerForPF" ), @@ -8420,7 +8457,7 @@ LongFibre_Cut = cms.double( 120.0 ), EM_Depth = cms.double( 22.0 ), weight_HFem = cms.double( 1.0 ), - LongShortFibre_Cut = cms.double( 30.0 ), + LongShortFibre_Cut = cms.double( 1.0E9 ), MinShortTiming_Cut = cms.double( -5.0 ), HCAL_Calib = cms.bool( True ), thresh_HF = cms.double( 0.4 ), @@ -8435,162 +8472,552 @@ ShortFibre_Fraction = cms.double( 0.01 ), HCAL_Calib_29 = cms.double( 1.35 ) ) -hltParticleFlowRecHitPS = cms.EDProducer( "PFRecHitProducerPS", - ecalRecHitsES = cms.InputTag( 'hltESRecHitAll','EcalRecHitsES' ), - thresh_Barrel = cms.double( 7.0E-6 ), - verbose = cms.untracked.bool( False ), - thresh_Endcap = cms.double( 7.0E-6 ) + +hltParticleFlowRecHitPS = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 7.0E-6 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ) + ), + name = cms.string( "PFPSRecHitCreator" ) + ) + ), + navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) ) +## hltParticleFlowRecHitPS = cms.EDProducer( "PFRecHitProducerPS", +## ecalRecHitsES = cms.InputTag( 'hltESRecHitAll','EcalRecHitsES' ), +## thresh_Barrel = cms.double( 7.0E-6 ), +## verbose = cms.untracked.bool( False ), +## thresh_Endcap = cms.double( 7.0E-6 ) +## ) + hltParticleFlowClusterECAL = cms.EDProducer( "PFClusterProducer", - posCalcNCrystal = cms.int32( 9 ), - verbose = cms.untracked.bool( False ), - showerSigma = cms.double( 1.5 ), - thresh_DoubleSpike_Barrel = cms.double( 10.0 ), - thresh_Pt_Barrel = cms.double( 0.0 ), - thresh_Clean_Barrel = cms.double( 4.0 ), - PFRecHits = cms.InputTag( "hltParticleFlowRecHitECAL" ), - cleanRBXandHPDs = cms.bool( False ), - depthCor_B = cms.double( 7.4 ), - depthCor_A = cms.double( 0.89 ), - nNeighbours = cms.int32( 8 ), - thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), - minS4S1_Clean_Barrel = cms.vdouble( 0.04, -0.024 ), - thresh_Pt_Seed_Barrel = cms.double( 0.0 ), - thresh_Pt_Endcap = cms.double( 0.0 ), - thresh_Barrel = cms.double( 0.08 ), - thresh_Clean_Endcap = cms.double( 15.0 ), - thresh_Seed_Barrel = cms.double( 0.23 ), - depthCor_Mode = cms.int32( 1 ), - depthCor_B_preshower = cms.double( 4.0 ), - useCornerCells = cms.bool( True ), - depthCor_A_preshower = cms.double( 0.89 ), - thresh_Endcap = cms.double( 0.3 ), - thresh_Pt_Seed_Endcap = cms.double( 0.15 ), - minS4S1_Clean_Endcap = cms.vdouble( 0.02, -0.0125 ), - thresh_Seed_Endcap = cms.double( 0.6 ), - minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), - minS6S2_DoubleSpike_Barrel = cms.double( 0.04 ) -) + pfClusterBuilder = cms.PSet( + positionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.08 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( 9 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ), + minFracTot = cms.double( 1.0E-20 ), + positionCalcForConvergence = cms.PSet( + minFractionInCalc = cms.double( 0.0 ), + W0 = cms.double( 4.2 ), + minAllowedNormalization = cms.double( 0.0 ), + T0_EB = cms.double( 7.4 ), + X0 = cms.double( 0.89 ), + T0_ES = cms.double( 1.2 ), + T0_EE = cms.double( 3.1 ), + algoName = cms.string( "ECAL2DPositionCalcWithDepthCorr" ) + ), + maxIterations = cms.uint32( 50 ), + stoppingTolerance = cms.double( 1.0E-8 ), + minFractionToKeep = cms.double( 1.0E-7 ), + excludeOtherSeeds = cms.bool( True ), + showerSigma = cms.double( 1.5 ), + recHitEnergyNorms = cms.VPSet( + cms.PSet( detector = cms.string( "ECAL_BARREL" ), + recHitEnergyNorm = cms.double( 0.08 ) + ), + cms.PSet( detector = cms.string( "ECAL_ENDCAP" ), + recHitEnergyNorm = cms.double( 0.3 ) + ) + ), + algoName = cms.string( "Basic2DGenericPFlowClusterizer" ), + allCellsPositionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.08 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( -1 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ) + ), + positionReCalc = cms.PSet( + minFractionInCalc = cms.double( 0.0 ), + W0 = cms.double( 4.2 ), + minAllowedNormalization = cms.double( 0.0 ), + T0_EB = cms.double( 7.4 ), + X0 = cms.double( 0.89 ), + T0_ES = cms.double( 1.2 ), + T0_EE = cms.double( 3.1 ), + algoName = cms.string( "ECAL2DPositionCalcWithDepthCorr" ) + ), + initialClusteringStep = cms.PSet( + thresholdsByDetector = cms.VPSet( + cms.PSet( gatheringThreshold = cms.double( 0.08 ), + detector = cms.string( "ECAL_BARREL" ), + gatheringThresholdPt = cms.double( 0.0 ) + ), + cms.PSet( gatheringThreshold = cms.double( 0.3 ), + detector = cms.string( "ECAL_ENDCAP" ), + gatheringThresholdPt = cms.double( 0.0 ) + ) + ), + useCornerCells = cms.bool( True ), + algoName = cms.string( "Basic2DGenericTopoClusterizer" ) + ), + energyCorrector = cms.PSet( ), + recHitCleaners = cms.VPSet( + cms.PSet( cleaningByDetector = cms.VPSet( + cms.PSet( doubleSpikeS6S2 = cms.double( 0.04 ), + fractionThresholdModifier = cms.double( 3.0 ), + doubleSpikeThresh = cms.double( 10.0 ), + minS4S1_b = cms.double( -0.024 ), + singleSpikeThresh = cms.double( 4.0 ), + detector = cms.string( "ECAL_BARREL" ), + minS4S1_a = cms.double( 0.04 ), + energyThresholdModifier = cms.double( 2.0 ) + ), + cms.PSet( doubleSpikeS6S2 = cms.double( -1.0 ), + fractionThresholdModifier = cms.double( 3.0 ), + doubleSpikeThresh = cms.double( 1.0E9 ), + minS4S1_b = cms.double( -0.0125 ), + singleSpikeThresh = cms.double( 15.0 ), + detector = cms.string( "ECAL_ENDCAP" ), + minS4S1_a = cms.double( 0.02 ), + energyThresholdModifier = cms.double( 2.0 ) + ) +), + algoName = cms.string( "SpikeAndDoubleSpikeCleaner" ) + ) + ), + seedFinder = cms.PSet( + nNeighbours = cms.int32( 8 ), + thresholdsByDetector = cms.VPSet( + cms.PSet( seedingThreshold = cms.double( 0.6 ), + seedingThresholdPt = cms.double( 0.15 ), + detector = cms.string( "ECAL_ENDCAP" ) + ), + cms.PSet( seedingThreshold = cms.double( 0.23 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "ECAL_BARREL" ) + ) + ), + algoName = cms.string( "LocalMaximumSeedFinder" ) + ), + recHitsSource = cms.InputTag( "hltParticleFlowRecHitECALUnseeded" ) +) +## hltParticleFlowClusterECAL = cms.EDProducer( "PFClusterProducer", +## posCalcNCrystal = cms.int32( 9 ), +## verbose = cms.untracked.bool( False ), +## showerSigma = cms.double( 1.5 ), +## thresh_DoubleSpike_Barrel = cms.double( 10.0 ), +## thresh_Pt_Barrel = cms.double( 0.0 ), +## thresh_Clean_Barrel = cms.double( 4.0 ), +## PFRecHits = cms.InputTag( "hltParticleFlowRecHitECAL" ), +## cleanRBXandHPDs = cms.bool( False ), +## depthCor_B = cms.double( 7.4 ), +## depthCor_A = cms.double( 0.89 ), +## nNeighbours = cms.int32( 8 ), +## thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), +## minS4S1_Clean_Barrel = cms.vdouble( 0.04, -0.024 ), +## thresh_Pt_Seed_Barrel = cms.double( 0.0 ), +## thresh_Pt_Endcap = cms.double( 0.0 ), +## thresh_Barrel = cms.double( 0.08 ), +## thresh_Clean_Endcap = cms.double( 15.0 ), +## thresh_Seed_Barrel = cms.double( 0.23 ), +## depthCor_Mode = cms.int32( 1 ), +## depthCor_B_preshower = cms.double( 4.0 ), +## useCornerCells = cms.bool( True ), +## depthCor_A_preshower = cms.double( 0.89 ), +## thresh_Endcap = cms.double( 0.3 ), +## thresh_Pt_Seed_Endcap = cms.double( 0.15 ), +## minS4S1_Clean_Endcap = cms.vdouble( 0.02, -0.0125 ), +## thresh_Seed_Endcap = cms.double( 0.6 ), +## minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), +## minS6S2_DoubleSpike_Barrel = cms.double( 0.04 ), +## recHitsSource = cms.InputTag( "hltParticleFlowRecHitECALUnseeded" ) +## ) + +## hltParticleFlowClusterHCAL = cms.EDProducer( "PFClusterProducer", +## posCalcNCrystal = cms.int32( 5 ), +## verbose = cms.untracked.bool( False ), +## showerSigma = cms.double( 10.0 ), +## thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), +## thresh_Pt_Barrel = cms.double( 0.0 ), +## thresh_Clean_Barrel = cms.double( 100000.0 ), +## PFRecHits = cms.InputTag( "hltParticleFlowRecHitHCAL" ), +## cleanRBXandHPDs = cms.bool( True ), +## depthCor_B = cms.double( 7.4 ), +## depthCor_A = cms.double( 0.89 ), +## nNeighbours = cms.int32( 4 ), +## thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), +## minS4S1_Clean_Barrel = cms.vdouble( 0.032, -0.045 ), +## thresh_Pt_Seed_Barrel = cms.double( 0.0 ), +## thresh_Pt_Endcap = cms.double( 0.0 ), +## thresh_Barrel = cms.double( 0.8 ), +## thresh_Clean_Endcap = cms.double( 100000.0 ), +## thresh_Seed_Barrel = cms.double( 0.8 ), +## depthCor_Mode = cms.int32( 0 ), +## depthCor_B_preshower = cms.double( 4.0 ), +## useCornerCells = cms.bool( True ), +## depthCor_A_preshower = cms.double( 0.89 ), +## thresh_Endcap = cms.double( 0.8 ), +## thresh_Pt_Seed_Endcap = cms.double( 0.0 ), +## minS4S1_Clean_Endcap = cms.vdouble( 0.032, -0.045 ), +## thresh_Seed_Endcap = cms.double( 1.1 ), +## minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), +## minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) +## ) hltParticleFlowClusterHCAL = cms.EDProducer( "PFClusterProducer", - posCalcNCrystal = cms.int32( 5 ), - verbose = cms.untracked.bool( False ), - showerSigma = cms.double( 10.0 ), - thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), - thresh_Pt_Barrel = cms.double( 0.0 ), - thresh_Clean_Barrel = cms.double( 100000.0 ), - PFRecHits = cms.InputTag( "hltParticleFlowRecHitHCAL" ), - cleanRBXandHPDs = cms.bool( True ), - depthCor_B = cms.double( 7.4 ), - depthCor_A = cms.double( 0.89 ), - nNeighbours = cms.int32( 4 ), - thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), - minS4S1_Clean_Barrel = cms.vdouble( 0.032, -0.045 ), - thresh_Pt_Seed_Barrel = cms.double( 0.0 ), - thresh_Pt_Endcap = cms.double( 0.0 ), - thresh_Barrel = cms.double( 0.8 ), - thresh_Clean_Endcap = cms.double( 100000.0 ), - thresh_Seed_Barrel = cms.double( 0.8 ), - depthCor_Mode = cms.int32( 0 ), - depthCor_B_preshower = cms.double( 4.0 ), - useCornerCells = cms.bool( True ), - depthCor_A_preshower = cms.double( 0.89 ), - thresh_Endcap = cms.double( 0.8 ), - thresh_Pt_Seed_Endcap = cms.double( 0.0 ), - minS4S1_Clean_Endcap = cms.vdouble( 0.032, -0.045 ), - thresh_Seed_Endcap = cms.double( 1.1 ), - minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), - minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) + pfClusterBuilder = cms.PSet( + positionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( 5 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ), + minFracTot = cms.double( 1.0E-20 ), + maxIterations = cms.uint32( 50 ), + stoppingTolerance = cms.double( 1.0E-8 ), + minFractionToKeep = cms.double( 1.0E-7 ), + excludeOtherSeeds = cms.bool( True ), + showerSigma = cms.double( 10.0 ), + recHitEnergyNorms = cms.VPSet( + cms.PSet( detector = cms.string( "HCAL_BARREL1" ), + recHitEnergyNorm = cms.double( 0.8 ) + ), + cms.PSet( detector = cms.string( "HCAL_ENDCAP" ), + recHitEnergyNorm = cms.double( 0.8 ) + ) + ), + algoName = cms.string( "Basic2DGenericPFlowClusterizer" ), + allCellsPositionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( -1 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ) + ), + positionReCalc = cms.PSet( ), + initialClusteringStep = cms.PSet( + thresholdsByDetector = cms.VPSet( + cms.PSet( gatheringThreshold = cms.double( 0.8 ), + detector = cms.string( "HCAL_BARREL1" ), + gatheringThresholdPt = cms.double( 0.0 ) + ), + cms.PSet( gatheringThreshold = cms.double( 0.8 ), + detector = cms.string( "HCAL_ENDCAP" ), + gatheringThresholdPt = cms.double( 0.0 ) + ) + ), + useCornerCells = cms.bool( True ), + algoName = cms.string( "Basic2DGenericTopoClusterizer" ) + ), + energyCorrector = cms.PSet( ), + recHitCleaners = cms.VPSet( + cms.PSet( algoName = cms.string( "RBXAndHPDCleaner" ) ) + ), + seedFinder = cms.PSet( + nNeighbours = cms.int32( 4 ), + thresholdsByDetector = cms.VPSet( + cms.PSet( seedingThreshold = cms.double( 0.8 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "HCAL_BARREL1" ) + ), + cms.PSet( seedingThreshold = cms.double( 1.1 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "HCAL_ENDCAP" ) + ) + ), + algoName = cms.string( "LocalMaximumSeedFinder" ) + ), + recHitsSource = cms.InputTag( "hltParticleFlowRecHitHCAL" ) ) + +## hltParticleFlowClusterHFEM = cms.EDProducer( "PFClusterProducer", +## posCalcNCrystal = cms.int32( 5 ), +## verbose = cms.untracked.bool( False ), +## showerSigma = cms.double( 10.0 ), +## thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), +## thresh_Pt_Barrel = cms.double( 0.0 ), +## thresh_Clean_Barrel = cms.double( 80.0 ), +## PFRecHits = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFEM' ), +## cleanRBXandHPDs = cms.bool( False ), +## depthCor_B = cms.double( 7.4 ), +## depthCor_A = cms.double( 0.89 ), +## nNeighbours = cms.int32( 0 ), +## thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), +## minS4S1_Clean_Barrel = cms.vdouble( 0.11, -0.19 ), +## thresh_Pt_Seed_Barrel = cms.double( 0.0 ), +## thresh_Pt_Endcap = cms.double( 0.0 ), +## thresh_Barrel = cms.double( 0.8 ), +## thresh_Clean_Endcap = cms.double( 80.0 ), +## thresh_Seed_Barrel = cms.double( 1.4 ), +## depthCor_Mode = cms.int32( 0 ), +## depthCor_B_preshower = cms.double( 4.0 ), +## useCornerCells = cms.bool( False ), +## depthCor_A_preshower = cms.double( 0.89 ), +## thresh_Endcap = cms.double( 0.8 ), +## thresh_Pt_Seed_Endcap = cms.double( 0.0 ), +## minS4S1_Clean_Endcap = cms.vdouble( 0.11, -0.19 ), +## thresh_Seed_Endcap = cms.double( 1.4 ), +## minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), +## minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) +## ) hltParticleFlowClusterHFEM = cms.EDProducer( "PFClusterProducer", - posCalcNCrystal = cms.int32( 5 ), - verbose = cms.untracked.bool( False ), - showerSigma = cms.double( 10.0 ), - thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), - thresh_Pt_Barrel = cms.double( 0.0 ), - thresh_Clean_Barrel = cms.double( 80.0 ), - PFRecHits = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFEM' ), - cleanRBXandHPDs = cms.bool( False ), - depthCor_B = cms.double( 7.4 ), - depthCor_A = cms.double( 0.89 ), - nNeighbours = cms.int32( 0 ), - thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), - minS4S1_Clean_Barrel = cms.vdouble( 0.11, -0.19 ), - thresh_Pt_Seed_Barrel = cms.double( 0.0 ), - thresh_Pt_Endcap = cms.double( 0.0 ), - thresh_Barrel = cms.double( 0.8 ), - thresh_Clean_Endcap = cms.double( 80.0 ), - thresh_Seed_Barrel = cms.double( 1.4 ), - depthCor_Mode = cms.int32( 0 ), - depthCor_B_preshower = cms.double( 4.0 ), - useCornerCells = cms.bool( False ), - depthCor_A_preshower = cms.double( 0.89 ), - thresh_Endcap = cms.double( 0.8 ), - thresh_Pt_Seed_Endcap = cms.double( 0.0 ), - minS4S1_Clean_Endcap = cms.vdouble( 0.11, -0.19 ), - thresh_Seed_Endcap = cms.double( 1.4 ), - minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), - minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) + pfClusterBuilder = cms.PSet( + positionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( 5 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ), + minFracTot = cms.double( 1.0E-20 ), + maxIterations = cms.uint32( 50 ), + stoppingTolerance = cms.double( 1.0E-8 ), + minFractionToKeep = cms.double( 1.0E-7 ), + excludeOtherSeeds = cms.bool( True ), + showerSigma = cms.double( 10.0 ), + recHitEnergyNorms = cms.VPSet( + cms.PSet( detector = cms.string( "HF_EM" ), + recHitEnergyNorm = cms.double( 0.8 ) + ) + ), + algoName = cms.string( "Basic2DGenericPFlowClusterizer" ), + allCellsPositionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( -1 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ) + ), + positionReCalc = cms.PSet( ), + initialClusteringStep = cms.PSet( + thresholdsByDetector = cms.VPSet( + cms.PSet( gatheringThreshold = cms.double( 0.8 ), + detector = cms.string( "HF_EM" ), + gatheringThresholdPt = cms.double( 0.0 ) + ) + ), + useCornerCells = cms.bool( False ), + algoName = cms.string( "Basic2DGenericTopoClusterizer" ) + ), + energyCorrector = cms.PSet( ), + recHitCleaners = cms.VPSet( + cms.PSet( cleaningByDetector = cms.VPSet( + cms.PSet( doubleSpikeS6S2 = cms.double( -1.0 ), + fractionThresholdModifier = cms.double( 1.0 ), + doubleSpikeThresh = cms.double( 1.0E9 ), + minS4S1_b = cms.double( -0.19 ), + singleSpikeThresh = cms.double( 80.0 ), + detector = cms.string( "HF_EM" ), + minS4S1_a = cms.double( 0.11 ), + energyThresholdModifier = cms.double( 1.0 ) + ) +), + algoName = cms.string( "SpikeAndDoubleSpikeCleaner" ) + ) + ), + seedFinder = cms.PSet( + nNeighbours = cms.int32( 0 ), + thresholdsByDetector = cms.VPSet( + cms.PSet( seedingThreshold = cms.double( 1.4 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "HF_EM" ) + ) + ), + algoName = cms.string( "LocalMaximumSeedFinder" ) + ), + recHitsSource = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFEM' ) ) + +## hltParticleFlowClusterHFHAD = cms.EDProducer( "PFClusterProducer", +## posCalcNCrystal = cms.int32( 5 ), +## verbose = cms.untracked.bool( False ), +## showerSigma = cms.double( 10.0 ), +## thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), +## thresh_Pt_Barrel = cms.double( 0.0 ), +## thresh_Clean_Barrel = cms.double( 120.0 ), +## PFRecHits = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFHAD' ), +## cleanRBXandHPDs = cms.bool( False ), +## depthCor_B = cms.double( 7.4 ), +## depthCor_A = cms.double( 0.89 ), +## nNeighbours = cms.int32( 0 ), +## thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), +## minS4S1_Clean_Barrel = cms.vdouble( 0.045, -0.08 ), +## thresh_Pt_Seed_Barrel = cms.double( 0.0 ), +## thresh_Pt_Endcap = cms.double( 0.0 ), +## thresh_Barrel = cms.double( 0.8 ), +## thresh_Clean_Endcap = cms.double( 120.0 ), +## thresh_Seed_Barrel = cms.double( 1.4 ), +## depthCor_Mode = cms.int32( 0 ), +## depthCor_B_preshower = cms.double( 4.0 ), +## useCornerCells = cms.bool( False ), +## depthCor_A_preshower = cms.double( 0.89 ), +## thresh_Endcap = cms.double( 0.8 ), +## thresh_Pt_Seed_Endcap = cms.double( 0.0 ), +## minS4S1_Clean_Endcap = cms.vdouble( 0.045, -0.08 ), +## thresh_Seed_Endcap = cms.double( 1.4 ), +## minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), +## minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) +## ) hltParticleFlowClusterHFHAD = cms.EDProducer( "PFClusterProducer", - posCalcNCrystal = cms.int32( 5 ), - verbose = cms.untracked.bool( False ), - showerSigma = cms.double( 10.0 ), - thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), - thresh_Pt_Barrel = cms.double( 0.0 ), - thresh_Clean_Barrel = cms.double( 120.0 ), - PFRecHits = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFHAD' ), - cleanRBXandHPDs = cms.bool( False ), - depthCor_B = cms.double( 7.4 ), - depthCor_A = cms.double( 0.89 ), - nNeighbours = cms.int32( 0 ), - thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), - minS4S1_Clean_Barrel = cms.vdouble( 0.045, -0.08 ), - thresh_Pt_Seed_Barrel = cms.double( 0.0 ), - thresh_Pt_Endcap = cms.double( 0.0 ), - thresh_Barrel = cms.double( 0.8 ), - thresh_Clean_Endcap = cms.double( 120.0 ), - thresh_Seed_Barrel = cms.double( 1.4 ), - depthCor_Mode = cms.int32( 0 ), - depthCor_B_preshower = cms.double( 4.0 ), - useCornerCells = cms.bool( False ), - depthCor_A_preshower = cms.double( 0.89 ), - thresh_Endcap = cms.double( 0.8 ), - thresh_Pt_Seed_Endcap = cms.double( 0.0 ), - minS4S1_Clean_Endcap = cms.vdouble( 0.045, -0.08 ), - thresh_Seed_Endcap = cms.double( 1.4 ), - minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), - minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) + pfClusterBuilder = cms.PSet( + positionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( 5 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ), + minFracTot = cms.double( 1.0E-20 ), + maxIterations = cms.uint32( 50 ), + stoppingTolerance = cms.double( 1.0E-8 ), + minFractionToKeep = cms.double( 1.0E-7 ), + excludeOtherSeeds = cms.bool( True ), + showerSigma = cms.double( 10.0 ), + recHitEnergyNorms = cms.VPSet( + cms.PSet( detector = cms.string( "HF_HAD" ), + recHitEnergyNorm = cms.double( 0.8 ) + ) + ), + algoName = cms.string( "Basic2DGenericPFlowClusterizer" ), + allCellsPositionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 0.8 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( -1 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ) + ), + positionReCalc = cms.PSet( ), + initialClusteringStep = cms.PSet( + thresholdsByDetector = cms.VPSet( + cms.PSet( gatheringThreshold = cms.double( 0.8 ), + detector = cms.string( "HF_HAD" ), + gatheringThresholdPt = cms.double( 0.0 ) + ) + ), + useCornerCells = cms.bool( False ), + algoName = cms.string( "Basic2DGenericTopoClusterizer" ) + ), + energyCorrector = cms.PSet( ), + recHitCleaners = cms.VPSet( + cms.PSet( cleaningByDetector = cms.VPSet( + cms.PSet( doubleSpikeS6S2 = cms.double( -1.0 ), + fractionThresholdModifier = cms.double( 1.0 ), + doubleSpikeThresh = cms.double( 1.0E9 ), + minS4S1_b = cms.double( -0.08 ), + singleSpikeThresh = cms.double( 120.0 ), + detector = cms.string( "HF_HAD" ), + minS4S1_a = cms.double( 0.045 ), + energyThresholdModifier = cms.double( 1.0 ) + ) +), + algoName = cms.string( "SpikeAndDoubleSpikeCleaner" ) + ) + ), + seedFinder = cms.PSet( + nNeighbours = cms.int32( 0 ), + thresholdsByDetector = cms.VPSet( + cms.PSet( seedingThreshold = cms.double( 1.4 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "HF_HAD" ) + ) + ), + algoName = cms.string( "LocalMaximumSeedFinder" ) + ), + recHitsSource = cms.InputTag( 'hltParticleFlowRecHitHCAL','HFHAD' ) ) + +## hltParticleFlowClusterPS = cms.EDProducer( "PFClusterProducer", +## posCalcNCrystal = cms.int32( -1 ), +## verbose = cms.untracked.bool( False ), +## showerSigma = cms.double( 0.2 ), +## thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), +## thresh_Pt_Barrel = cms.double( 0.0 ), +## thresh_Clean_Barrel = cms.double( 100000.0 ), +## PFRecHits = cms.InputTag( "hltParticleFlowRecHitPS" ), +## cleanRBXandHPDs = cms.bool( False ), +## depthCor_B = cms.double( 7.4 ), +## depthCor_A = cms.double( 0.89 ), +## nNeighbours = cms.int32( 8 ), +## thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), +## minS4S1_Clean_Barrel = cms.vdouble( 0.0, 0.0 ), +## thresh_Pt_Seed_Barrel = cms.double( 0.0 ), +## thresh_Pt_Endcap = cms.double( 0.0 ), +## thresh_Barrel = cms.double( 6.0E-5 ), +## thresh_Clean_Endcap = cms.double( 100000.0 ), +## thresh_Seed_Barrel = cms.double( 1.2E-4 ), +## depthCor_Mode = cms.int32( 0 ), +## depthCor_B_preshower = cms.double( 4.0 ), +## useCornerCells = cms.bool( False ), +## depthCor_A_preshower = cms.double( 0.89 ), +## thresh_Endcap = cms.double( 6.0E-5 ), +## thresh_Pt_Seed_Endcap = cms.double( 0.0 ), +## minS4S1_Clean_Endcap = cms.vdouble( 0.0, 0.0 ), +## thresh_Seed_Endcap = cms.double( 1.2E-4 ), +## minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), +## minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) +## ) hltParticleFlowClusterPS = cms.EDProducer( "PFClusterProducer", - posCalcNCrystal = cms.int32( -1 ), - verbose = cms.untracked.bool( False ), - showerSigma = cms.double( 0.2 ), - thresh_DoubleSpike_Barrel = cms.double( 1.0E9 ), - thresh_Pt_Barrel = cms.double( 0.0 ), - thresh_Clean_Barrel = cms.double( 100000.0 ), - PFRecHits = cms.InputTag( "hltParticleFlowRecHitPS" ), - cleanRBXandHPDs = cms.bool( False ), - depthCor_B = cms.double( 7.4 ), - depthCor_A = cms.double( 0.89 ), - nNeighbours = cms.int32( 8 ), - thresh_DoubleSpike_Endcap = cms.double( 1.0E9 ), - minS4S1_Clean_Barrel = cms.vdouble( 0.0, 0.0 ), - thresh_Pt_Seed_Barrel = cms.double( 0.0 ), - thresh_Pt_Endcap = cms.double( 0.0 ), - thresh_Barrel = cms.double( 6.0E-5 ), - thresh_Clean_Endcap = cms.double( 100000.0 ), - thresh_Seed_Barrel = cms.double( 1.2E-4 ), - depthCor_Mode = cms.int32( 0 ), - depthCor_B_preshower = cms.double( 4.0 ), - useCornerCells = cms.bool( False ), - depthCor_A_preshower = cms.double( 0.89 ), - thresh_Endcap = cms.double( 6.0E-5 ), - thresh_Pt_Seed_Endcap = cms.double( 0.0 ), - minS4S1_Clean_Endcap = cms.vdouble( 0.0, 0.0 ), - thresh_Seed_Endcap = cms.double( 1.2E-4 ), - minS6S2_DoubleSpike_Endcap = cms.double( -1.0 ), - minS6S2_DoubleSpike_Barrel = cms.double( -1.0 ) + pfClusterBuilder = cms.PSet( + minFracTot = cms.double( 1.0E-20 ), + positionCalc = cms.PSet( + minFractionInCalc = cms.double( 1.0E-9 ), + logWeightDenominator = cms.double( 6.0E-5 ), + minAllowedNormalization = cms.double( 1.0E-9 ), + posCalcNCrystals = cms.int32( -1 ), + algoName = cms.string( "Basic2DGenericPFlowPositionCalc" ) + ), + maxIterations = cms.uint32( 50 ), + stoppingTolerance = cms.double( 1.0E-8 ), + minFractionToKeep = cms.double( 1.0E-7 ), + excludeOtherSeeds = cms.bool( True ), + showerSigma = cms.double( 0.3 ), + recHitEnergyNorms = cms.VPSet( + cms.PSet( detector = cms.string( "PS1" ), + recHitEnergyNorm = cms.double( 6.0E-5 ) + ), + cms.PSet( detector = cms.string( "PS2" ), + recHitEnergyNorm = cms.double( 6.0E-5 ) + ) + ), + algoName = cms.string( "Basic2DGenericPFlowClusterizer" ) + ), + positionReCalc = cms.PSet( ), + initialClusteringStep = cms.PSet( + thresholdsByDetector = cms.VPSet( + cms.PSet( gatheringThreshold = cms.double( 6.0E-5 ), + detector = cms.string( "PS1" ), + gatheringThresholdPt = cms.double( 0.0 ) + ), + cms.PSet( gatheringThreshold = cms.double( 6.0E-5 ), + detector = cms.string( "PS2" ), + gatheringThresholdPt = cms.double( 0.0 ) + ) + ), + useCornerCells = cms.bool( False ), + algoName = cms.string( "Basic2DGenericTopoClusterizer" ) + ), + energyCorrector = cms.PSet( ), + recHitCleaners = cms.VPSet( + ), + seedFinder = cms.PSet( + nNeighbours = cms.int32( 4 ), + thresholdsByDetector = cms.VPSet( + cms.PSet( seedingThreshold = cms.double( 1.2E-4 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "PS1" ) + ), + cms.PSet( seedingThreshold = cms.double( 1.2E-4 ), + seedingThresholdPt = cms.double( 0.0 ), + detector = cms.string( "PS2" ) + ) + ), + algoName = cms.string( "LocalMaximumSeedFinder" ) + ), + recHitsSource = cms.InputTag( "hltParticleFlowRecHitPSUnseeded" ) ) + hltLightPFTracks = cms.EDProducer( "LightPFTrackProducer", TrackQuality = cms.string( "none" ), UseQuality = cms.bool( False ), @@ -8635,6 +9062,7 @@ useKDTree = cms.bool(True) ), cms.PSet( linkerName = cms.string("ECALAndHCALLinker"), linkType = cms.string("ECAL:HCAL"), + trackerEtaBoundary = cms.double(3.8), useKDTree = cms.bool(False) ), cms.PSet( linkerName = cms.string("HFEMAndHFHADLinker"), linkType = cms.string("HFEM:HFHAD"), @@ -8846,6 +9274,7 @@ offset = cms.uint32( 0 ) ) hltTowerMakerForAll = cms.EDProducer( "CaloTowersCreator", + HcalPhase = cms.int32(2), EBSumThreshold = cms.double( 0.2 ), MomHBDepth = cms.double( 0.2 ), UseEtEBTreshold = cms.bool( False ), @@ -9070,6 +9499,7 @@ lazyGetterTag = cms.InputTag( "hltEcalRawToRecHitFacility" ) ) hltTowerMakerForJets = cms.EDProducer( "CaloTowersCreator", + HcalPhase = cms.int32(2), EBSumThreshold = cms.double( 0.2 ), MomHBDepth = cms.double( 0.2 ), UseEtEBTreshold = cms.bool( False ), @@ -10156,6 +10586,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeL25TagInfosbbPhiL1FastJetFastPV = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -10258,6 +10690,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeL3TagInfosbbPhiL1FastJetFastPV = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -10629,6 +11063,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeL25TagInfosHbbVBF = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -10731,6 +11167,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeL3TagInfosHbbVBF = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -10882,6 +11320,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeFastL25TagInfosHbbVBF = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -10931,7 +11371,9 @@ useExternalSV = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), usePVError = cms.bool( True ), - trackSelection = cms.PSet( + trackSelection = cms.PSet( + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), totalHitsMin = cms.uint32( 2 ), jetDeltaRMax = cms.double( 0.3 ), qualityClass = cms.string( "any" ), @@ -11039,6 +11481,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeFastL3TagInfosHbbVBF = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -11089,6 +11533,8 @@ minimumTrackWeight = cms.double( 0.5 ), usePVError = cms.bool( True ), trackSelection = cms.PSet( + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), totalHitsMin = cms.uint32( 2 ), jetDeltaRMax = cms.double( 0.3 ), qualityClass = cms.string( "any" ), @@ -11436,6 +11882,7 @@ offset = cms.uint32( 0 ) ) hltStoppedHSCPTowerMakerForAll = cms.EDProducer( "CaloTowersCreator", + HcalPhase = cms.int32(2), EBSumThreshold = cms.double( 0.2 ), MomHBDepth = cms.double( 0.2 ), UseEtEBTreshold = cms.bool( False ), @@ -11817,6 +12264,8 @@ pvSrc = cms.InputTag( "offlinePrimaryVertices" ) ) hltDisplacedHT300L1FastJetL25TagInfos = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.1 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -11919,6 +12368,8 @@ pvSrc = cms.InputTag( "offlinePrimaryVertices" ) ) hltDisplacedHT300L1FastJetL3TagInfos = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.1 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -12017,6 +12468,7 @@ useKDTree = cms.bool(True) ), cms.PSet( linkerName = cms.string("ECALAndHCALLinker"), linkType = cms.string("ECAL:HCAL"), + trackerEtaBoundary = cms.double(3.8), useKDTree = cms.bool(False) ), cms.PSet( linkerName = cms.string("HFEMAndHFHADLinker"), linkType = cms.string("HFEM:HFHAD"), @@ -13222,6 +13674,8 @@ pvSrc = cms.InputTag( "" ) ) hltFastPixelBLifetimeL3TagInfosHbb = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -13272,6 +13726,8 @@ minimumTrackWeight = cms.double( 0.5 ), usePVError = cms.bool( True ), trackSelection = cms.PSet( + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), totalHitsMin = cms.uint32( 2 ), jetDeltaRMax = cms.double( 0.3 ), qualityClass = cms.string( "any" ), @@ -14683,6 +15139,7 @@ lazyGetterTag = cms.InputTag( "hltEcalRawToRecHitFacility" ) ) hltTowerMakerForMuons = cms.EDProducer( "CaloTowersCreator", + HcalPhase = cms.int32(2), EBSumThreshold = cms.double( 0.2 ), MomHBDepth = cms.double( 0.2 ), UseEtEBTreshold = cms.bool( False ), @@ -23222,6 +23679,8 @@ hltL1SeededStartUpElectronPixelSeeds = cms.EDProducer( "ElectronSeedProducer", endcapSuperClusters = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), SeedConfiguration = cms.PSet( + SCEtCutBarrel = cms.double(4.0), + SCEtCutEndcap = cms.double(9.0), searchInTIDTEC = cms.bool( True ), HighPtThreshold = cms.double( 35.0 ), r2MinF = cms.double( -0.15 ), @@ -24319,6 +24778,8 @@ hltActivityStartUpElectronPixelSeeds = cms.EDProducer( "ElectronSeedProducer", endcapSuperClusters = cms.InputTag( "hltCorrectedMulti5x5SuperClustersWithPreshowerActivity" ), SeedConfiguration = cms.PSet( + SCEtCutBarrel = cms.double(4.0), + SCEtCutEndcap = cms.double(9.0), searchInTIDTEC = cms.bool( True ), HighPtThreshold = cms.double( 35.0 ), r2MinF = cms.double( -0.15 ), @@ -27987,6 +28448,7 @@ useKDTree = cms.bool(True) ), cms.PSet( linkerName = cms.string("ECALAndHCALLinker"), linkType = cms.string("ECAL:HCAL"), + trackerEtaBoundary = cms.double(3.8), useKDTree = cms.bool(False) ), cms.PSet( linkerName = cms.string("HFEMAndHFHADLinker"), linkType = cms.string("HFEM:HFHAD"), @@ -32592,6 +33054,7 @@ useKDTree = cms.bool(True) ), cms.PSet( linkerName = cms.string("ECALAndHCALLinker"), linkType = cms.string("ECAL:HCAL"), + trackerEtaBoundary = cms.double(3.8), useKDTree = cms.bool(False) ), cms.PSet( linkerName = cms.string("HFEMAndHFHADLinker"), linkType = cms.string("HFEM:HFHAD"), @@ -34724,6 +35187,8 @@ pvSrc = cms.InputTag( "hltPixelVertices" ) ) hltMu17BLifetimeL3PFNoPUTagInfosSingleTop = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -34862,6 +35327,8 @@ pvSrc = cms.InputTag( "hltPixelVertices" ) ) hltMu17BLifetimeL3PFNoPUTagInfosSingleTopNoIso = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -35282,6 +35749,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetime3DL25TagInfosJet20HbbL1FastJet = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -35388,6 +35857,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeDiBTagIP3D1stTrkL3TagInfosJet20HbbL1FastJet = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -35507,6 +35978,8 @@ pvSrc = cms.InputTag( "" ) ) hltBLifetimeBTagIP3D1stTrkL3TagInfosJet20HbbL1FastJet = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 3 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -37410,6 +37883,8 @@ pvSrc = cms.InputTag( "hltPixelVertices" ) ) hltEleBLifetimeL3PFNoPUTagInfosSingleTop = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -49621,6 +50096,8 @@ pvSrc = cms.InputTag( "hltPixelVertices" ) ) hltMu20BLifetimeL3PFNoPUTagInfosSingleTop = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), @@ -50683,6 +51160,8 @@ pvSrc = cms.InputTag( "hltPixelVertices" ) ) hltEle36CentralPFNoPUJet50BLifetimeL3PFNoPUTagInfosSingleTop = cms.EDProducer( "TrackIPProducer", + maxPixelBarrelLayer = cms.uint32(4), + maxPixelEndcapLayer = cms.uint32(3), maximumTransverseImpactParameter = cms.double( 0.2 ), minimumNumberOfHits = cms.int32( 8 ), minimumTransverseMomentum = cms.double( 1.0 ), From 2ceb29add7b7f035e8725eef454fec1853dbfea3 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 19 Sep 2014 15:07:55 +0900 Subject: [PATCH 2/6] HLT_GRun_cff.py fix --- HLTrigger/Configuration/python/HLT_GRun_cff.py | 2 +- SimTracker/TrackAssociation/python/allTrackMCMatch_cfi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 01c583ee64ebc..a38a0fe5011fa 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -5113,7 +5113,7 @@ hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter", toGet = cms.VPSet( ), - verbose = cms.untracked.bool( False ) + verbose = cms.untracked.bool( True ) ) hltGetRaw = cms.EDAnalyzer( "HLTGetRaw", RawDataCollection = cms.InputTag( "rawDataCollector" ) diff --git a/SimTracker/TrackAssociation/python/allTrackMCMatch_cfi.py b/SimTracker/TrackAssociation/python/allTrackMCMatch_cfi.py index 3bfa0e3d16567..65b5e11fe602d 100644 --- a/SimTracker/TrackAssociation/python/allTrackMCMatch_cfi.py +++ b/SimTracker/TrackAssociation/python/allTrackMCMatch_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -allTrackMCMatch = cms.EDFilter("GenParticleMatchMerger", +allTrackMCMatch = cms.EDProducer("GenParticleMatchMerger", src = cms.VInputTag(cms.InputTag("trackMCMatch"), cms.InputTag("standAloneMuonsMCMatch"), cms.InputTag("globalMuonsMCMatch")) ) From b675979f50f63747df25efded056ef43d0fdb165 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 11 Oct 2014 04:56:18 +0900 Subject: [PATCH 3/6] HLT_GRun_cff.py fix --- HLTrigger/Configuration/python/HLT_GRun_cff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index a38a0fe5011fa..9e7c78ba295db 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -8399,7 +8399,7 @@ ## updated from 7_2_X hltParticleFlowRecHitECAL = cms.EDProducer( "PFRecHitProducer", producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + cms.PSet( src = cms.InputTag( 'hltEcalRecHitAll','EcalRecHitsEB' ), qualityTests = cms.VPSet( cms.PSet( threshold = cms.double( 0.08 ), name = cms.string( "PFRecHitQTestThreshold" ) @@ -8413,7 +8413,7 @@ ), name = cms.string( "PFEBRecHitCreator" ) ), - cms.PSet( src = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + cms.PSet( src = cms.InputTag( 'hltEcalRecHitAll','EcalRecHitsEE' ), qualityTests = cms.VPSet( cms.PSet( threshold = cms.double( 0.3 ), name = cms.string( "PFRecHitQTestThreshold" ) @@ -8475,7 +8475,7 @@ hltParticleFlowRecHitPS = cms.EDProducer( "PFRecHitProducer", producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), + cms.PSet( src = cms.InputTag( 'hltESRecHitAll','EcalRecHitsES' ), qualityTests = cms.VPSet( cms.PSet( threshold = cms.double( 7.0E-6 ), name = cms.string( "PFRecHitQTestThreshold" ) @@ -8598,7 +8598,7 @@ ), algoName = cms.string( "LocalMaximumSeedFinder" ) ), - recHitsSource = cms.InputTag( "hltParticleFlowRecHitECALUnseeded" ) + recHitsSource = cms.InputTag( "hltParticleFlowRecHitECAL" ) ) ## hltParticleFlowClusterECAL = cms.EDProducer( "PFClusterProducer", ## posCalcNCrystal = cms.int32( 9 ), @@ -9015,7 +9015,7 @@ ), algoName = cms.string( "LocalMaximumSeedFinder" ) ), - recHitsSource = cms.InputTag( "hltParticleFlowRecHitPSUnseeded" ) + recHitsSource = cms.InputTag( "hltParticleFlowRecHitPS" ) ) hltLightPFTracks = cms.EDProducer( "LightPFTrackProducer", From f7e5fdbd0b42a8f6865bf7bc97d056a9b6914a94 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 10 Oct 2014 22:48:16 +0200 Subject: [PATCH 4/6] turn on GEM in muonCustoms.py --- HLTrigger/Configuration/python/HLT_GRun_cff.py | 6 +++--- SLHCUpgradeSimulations/Configuration/python/muonCustoms.py | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 9e7c78ba295db..73cbf980db885 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -6154,7 +6154,7 @@ CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableGEMMeasurement = cms.bool( True ), + EnableGEMMeasurement = cms.bool( False ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) @@ -6211,7 +6211,7 @@ EnableDTMeasurement = cms.bool( True ), RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ), Propagator = cms.string( "hltESPFastSteppingHelixPropagatorAny" ), - EnableGEMMeasurement = cms.bool( True ), + EnableGEMMeasurement = cms.bool( False ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ) ), @@ -6245,7 +6245,7 @@ EnableDTMeasurement = cms.bool( True ), RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ), Propagator = cms.string( "hltESPFastSteppingHelixPropagatorAny" ), - EnableGEMMeasurement = cms.bool( True ), + EnableGEMMeasurement = cms.bool( False ), GEMRecSegmentLabel = cms.InputTag("gemRecHits"), EnableCSCMeasurement = cms.bool( True ) ), diff --git a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py index ebfff3d660bed..284b923cf2c1f 100644 --- a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py @@ -307,5 +307,9 @@ def customise_csc_hlt(process): process.hltCsc2DRecHits.wireDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCWireDigi") process.hltCsc2DRecHits.stripDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCStripDigi") - + + process.hltL2OfflineMuonSeeds.EnableGEMMeasurement = cms.bool( True ) + process.hltL2Muons.L2TrajBuilderParameters.EnableGEMMeasurement = cms.bool( True ) + process.hltL2Muons.BWFilterParameters.EnableGEMMeasurement = cms.bool( True ) + return process From 38253c55050f26555b8a0e4466802e6cedef8586 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 10 Oct 2014 22:56:49 +0200 Subject: [PATCH 5/6] remove hltGetConditions --- SLHCUpgradeSimulations/Configuration/python/muonCustoms.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py index 284b923cf2c1f..f03c9dac71c16 100644 --- a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py @@ -312,4 +312,6 @@ def customise_csc_hlt(process): process.hltL2Muons.L2TrajBuilderParameters.EnableGEMMeasurement = cms.bool( True ) process.hltL2Muons.BWFilterParameters.EnableGEMMeasurement = cms.bool( True ) + ## remove hltGetConditions for mc + process.HLTriggerFirstPath.remove(process.hltGetConditions) return process From 1fe8a41632962aa4522efef3c81c85271cc45e82 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 10 Nov 2014 18:16:08 +0900 Subject: [PATCH 6/6] move hlt to gem customs --- SLHCUpgradeSimulations/Configuration/python/gemCustoms.py | 7 +++++++ SLHCUpgradeSimulations/Configuration/python/muonCustoms.py | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py b/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py index 7fa9abd552dec..7414e6ac73b6c 100644 --- a/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py @@ -17,6 +17,8 @@ def customise2019(process): process=customise_harvesting(process) if hasattr(process,'validation_step'): process=customise_Validation(process) + if hasattr(process,'HLTSchedule'): + process=customise_gem_hlt(process) return process def customise2023(process): @@ -114,3 +116,8 @@ def outputCustoms(process): return process +def customise_gem_hlt(process): + process.hltL2OfflineMuonSeeds.EnableGEMMeasurement = cms.bool( True ) + process.hltL2Muons.L2TrajBuilderParameters.EnableGEMMeasurement = cms.bool( True ) + process.hltL2Muons.BWFilterParameters.EnableGEMMeasurement = cms.bool( True ) + return process diff --git a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py index f03c9dac71c16..c6635db446d6c 100644 --- a/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/muonCustoms.py @@ -308,10 +308,6 @@ def customise_csc_hlt(process): process.hltCsc2DRecHits.wireDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCWireDigi") process.hltCsc2DRecHits.stripDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCStripDigi") - process.hltL2OfflineMuonSeeds.EnableGEMMeasurement = cms.bool( True ) - process.hltL2Muons.L2TrajBuilderParameters.EnableGEMMeasurement = cms.bool( True ) - process.hltL2Muons.BWFilterParameters.EnableGEMMeasurement = cms.bool( True ) - ## remove hltGetConditions for mc process.HLTriggerFirstPath.remove(process.hltGetConditions) return process