Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Template migration and filter fix for Egamma #1424

Merged
merged 1 commit into from Nov 15, 2013
Merged

Template migration and filter fix for Egamma #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
147 changes: 126 additions & 21 deletions HLTrigger/Configuration/python/HLT_8E33v2_Famos_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

208 changes: 174 additions & 34 deletions HLTrigger/Configuration/python/HLT_8E33v2_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

220 changes: 180 additions & 40 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

147 changes: 126 additions & 21 deletions HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

208 changes: 174 additions & 34 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_0_0/HIon/V18 (CMSSW_7_0_0_pre6_HLT4)
# /dev/CMSSW_7_0_0/HIon/V19 (CMSSW_7_0_0_pre8)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_0_0/HIon/V18')
tableName = cms.string('/dev/CMSSW_7_0_0/HIon/V19')
)

streams = cms.PSet(
Expand Down Expand Up @@ -569,11 +569,11 @@
'HcalCellDead' )
)
hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer",
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
categoryVariableName = cms.string( "vertexCategory" ),
useTrackWeights = cms.bool( True ),
useCategories = cms.bool( True ),
pseudoMultiplicityMin = cms.uint32( 2 ),
categoryVariableName = cms.string( "vertexCategory" ),
correctVertexMass = cms.bool( True ),
trackSelection = cms.PSet(
totalHitsMin = cms.uint32( 0 ),
jetDeltaRMax = cms.double( 0.3 ),
Expand All @@ -595,7 +595,7 @@
calibrationRecords = cms.vstring( 'CombinedSVRecoVertex',
'CombinedSVPseudoVertex',
'CombinedSVNoVertex' ),
correctVertexMass = cms.bool( True ),
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
charmCut = cms.double( 1.5 ),
vertexFlip = cms.bool( False ),
minimumTrackWeight = cms.double( 0.5 ),
Expand Down Expand Up @@ -3677,6 +3677,7 @@
pixelRecHits = cms.string( "hltHISiPixelRecHits" )
)
hltPixelTracksForHITrackTrigger = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
doVariablePtMin = cms.bool( True ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
Expand All @@ -3686,7 +3687,6 @@
siPixelRecHits = cms.InputTag( "hltHISiPixelRecHits" ),
tipMax = cms.double( 1.0 )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down Expand Up @@ -6364,6 +6364,7 @@
pixelRecHits = cms.string( "hltHISiPixelRecHits" )
)
hltHIPixel3ProtoTracks = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
ComponentName = cms.string( "HIProtoTrackFilter" ),
Expand All @@ -6373,7 +6374,6 @@
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
siPixelRecHits = cms.InputTag( "hltHISiPixelRecHits" )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down Expand Up @@ -6472,6 +6472,7 @@
medianVertexCollection = cms.InputTag( "hltHIPixelMedianVertex" )
)
hltHIPixel3PrimTracks = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( True ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
ComponentName = cms.string( "HIPixelTrackFilter" ),
Expand All @@ -6483,7 +6484,6 @@
nSigmaLipMaxTolerance = cms.double( 0.0 ),
lipMax = cms.double( 0.3 )
),
useFilterWithES = cms.bool( True ),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down
61 changes: 48 additions & 13 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_0_0/PIon/V18 (CMSSW_7_0_0_pre6_HLT4)
# /dev/CMSSW_7_0_0/PIon/V19 (CMSSW_7_0_0_pre8)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_0_0/PIon/V18')
tableName = cms.string('/dev/CMSSW_7_0_0/PIon/V19')
)

streams = cms.PSet(
Expand Down Expand Up @@ -1009,11 +1009,11 @@
'HcalCellDead' )
)
hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer",
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
categoryVariableName = cms.string( "vertexCategory" ),
useTrackWeights = cms.bool( True ),
useCategories = cms.bool( True ),
pseudoMultiplicityMin = cms.uint32( 2 ),
categoryVariableName = cms.string( "vertexCategory" ),
correctVertexMass = cms.bool( True ),
trackSelection = cms.PSet(
totalHitsMin = cms.uint32( 0 ),
jetDeltaRMax = cms.double( 0.3 ),
Expand All @@ -1035,7 +1035,7 @@
calibrationRecords = cms.vstring( 'CombinedSVRecoVertex',
'CombinedSVPseudoVertex',
'CombinedSVNoVertex' ),
correctVertexMass = cms.bool( True ),
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
charmCut = cms.double( 1.5 ),
vertexFlip = cms.bool( False ),
minimumTrackWeight = cms.double( 0.5 ),
Expand Down Expand Up @@ -8127,6 +8127,7 @@
etMin = cms.double( 5.0 )
)
hltPixelTracks = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
nSigmaTipMaxTolerance = cms.double( 0.0 ),
Expand All @@ -8135,7 +8136,6 @@
ptMin = cms.double( 0.1 ),
tipMax = cms.double( 1.0 )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down Expand Up @@ -9704,15 +9704,18 @@
hltParticleFlow = cms.EDProducer( "PFProducer",
minPtForPostCleaning = cms.double( 20.0 ),
pf_nsigma_ECAL = cms.double( 0.0 ),
GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ),
sumPtTrackIsoForPhoton = cms.double( -1.0 ),
metFactorForFakes = cms.double( 4.0 ),
muon_HO = cms.vdouble( 0.9, 0.9 ),
electron_missinghits = cms.uint32( 1 ),
metSignificanceForCleaning = cms.double( 3.0 ),
usePFPhotons = cms.bool( False ),
maxDeltaPhiPt = cms.double( 7.0 ),
dptRel_DispVtx = cms.double( 10.0 ),
nTrackIsoForEgammaSC = cms.uint32( 2 ),
pf_nsigma_HCAL = cms.double( 1.0 ),
cosmicRejectionDistance = cms.double( 1.0 ),
useEGammaFilters = cms.bool( False ),
useEGammaElectrons = cms.bool( False ),
nsigma_TRACK = cms.double( 1.0 ),
useEGammaSupercluster = cms.bool( False ),
Expand All @@ -9721,8 +9724,10 @@
usePFDecays = cms.bool( False ),
rejectTracks_Step45 = cms.bool( False ),
eventFractionForRejection = cms.double( 0.8 ),
photon_MinEt = cms.double( 10.0 ),
usePFNuclearInteractions = cms.bool( False ),
maxSignificance = cms.double( 2.5 ),
electron_iso_mva_endcap = cms.double( -0.1075 ),
debug = cms.untracked.bool( False ),
pf_convID_mvaWeightFile = cms.string( "RecoParticleFlow/PFProducer/data/MVAnalysis_BDT.weights_pfConversionAug0411.txt" ),
calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ),
Expand All @@ -9732,6 +9737,9 @@
pf_conv_mvaCut = cms.double( 0.0 ),
useCalibrationsFromDB = cms.bool( True ),
usePFElectrons = cms.bool( False ),
electron_iso_combIso_endcap = cms.double( 10.0 ),
photon_combIso = cms.double( 10.0 ),
electron_iso_mva_barrel = cms.double( -0.1875 ),
postHFCleaning = cms.bool( False ),
factors_45 = cms.vdouble( 10.0, 100.0 ),
cleanedHF = cms.VInputTag( 'hltParticleFlowRecHitHCAL:Cleaned','hltParticleFlowClusterHFHAD:Cleaned','hltParticleFlowClusterHFEM:Cleaned' ),
Expand All @@ -9742,12 +9750,16 @@
maxDPtOPt = cms.double( 1.0 ),
useHO = cms.bool( False ),
pf_electron_output_col = cms.string( "electrons" ),
electron_noniso_mvaCut = cms.double( -0.1 ),
GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ),
useVerticesForNeutral = cms.bool( True ),
pf_Res_mvaWeightFile = cms.string( "RecoParticleFlow/PFProducer/data/TMVARegression_BDTG_PFRes.root" ),
PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ),
sumPtTrackIsoSlopeForPhoton = cms.double( -1.0 ),
coneTrackIsoForEgammaSC = cms.double( 0.3 ),
minDeltaMet = cms.double( 0.4 ),
pt_Error = cms.double( 1.0 ),
useProtectionsForJetMET = cms.bool( True ),
metFactorForRejection = cms.double( 4.0 ),
sumPtTrackIsoForEgammaSC_endcap = cms.double( 4.0 ),
calibHF_use = cms.bool( False ),
Expand All @@ -9773,26 +9785,49 @@
muons = cms.InputTag( "hltMuons" ),
metFactorForHighEta = cms.double( 25.0 ),
minHFCleaningPt = cms.double( 5.0 ),
calibPFSCEle_barrel = cms.vdouble( 1.004, -1.536, 22.88, -1.467, 0.3555, 0.6227, 14.65, 2051.0, 25.0, 0.9932, -0.5444, 0.0, 0.5438, 0.7109, 7.645, 0.2904, 0.0 ),
muon_HCAL = cms.vdouble( 3.0, 3.0 ),
pf_electron_mvaCut = cms.double( -0.1 ),
ptFactorForHighEta = cms.double( 2.0 ),
dptRel_DispVtx = cms.double( 10.0 ),
maxDeltaPhiPt = cms.double( 7.0 ),
pf_electronID_mvaWeightFile = cms.string( "RecoParticleFlow/PFProducer/data/MVAnalysis_BDT.weights_PfElectrons23Jan_IntToFloat.txt" ),
sumEtEcalIsoForEgammaSC_endcap = cms.double( 2.0 ),
calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ),
pf_GlobC_mvaWeightFile = cms.string( "RecoParticleFlow/PFProducer/data/TMVARegression_BDTG_PFGlobalCorr.root" ),
photon_HoE = cms.double( 0.1 ),
sumEtEcalIsoForEgammaSC_barrel = cms.double( 1.0 ),
calibPFSCEle_Fbrem_endcap = cms.vdouble( 0.9, 6.5, -0.0692932, 0.101776, 0.995338, -0.00236548, 0.874998, 1.653, -0.0750184, 0.147, 0.923165, 4.74665E-4, 1.10782 ),
punchThroughFactor = cms.double( 3.0 ),
algoType = cms.uint32( 0 ),
electron_iso_combIso_barrel = cms.double( 10.0 ),
postMuonCleaning = cms.bool( True ),
muon_HCAL = cms.vdouble( 3.0, 3.0 ),
calibPFSCEle_barrel = cms.vdouble( 1.004, -1.536, 22.88, -1.467, 0.3555, 0.6227, 14.65, 2051.0, 25.0, 0.9932, -0.5444, 0.0, 0.5438, 0.7109, 7.645, 0.2904, 0.0 ),
electron_protectionsForJetMET = cms.PSet(
maxE = cms.double( 50.0 ),
maxTrackPOverEele = cms.double( 1.0 ),
maxEcalEOverP_2 = cms.double( 0.2 ),
maxHcalEOverEcalE = cms.double( 0.1 ),
maxEcalEOverP_1 = cms.double( 0.5 ),
maxHcalEOverP = cms.double( 1.0 ),
maxEcalEOverPRes = cms.double( 0.2 ),
maxHcalE = cms.double( 10.0 ),
maxEeleOverPout = cms.double( 0.2 ),
maxNtracks = cms.double( 3.0 ),
maxEleHcalEOverEcalE = cms.double( 0.1 ),
maxDPhiIN = cms.double( 0.1 ),
maxEeleOverPoutRes = cms.double( 0.5 )
),
electron_iso_pt = cms.double( 10.0 ),
isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ),
vertexCollection = cms.InputTag( "hltPixelVertices" ),
X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ),
calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ),
blocks = cms.InputTag( "hltParticleFlowBlock" ),
punchThroughMETFactor = cms.double( 4.0 ),
metSignificanceForRejection = cms.double( 4.0 ),
photon_protectionsForJetMET = cms.PSet(
sumPtTrackIsoSlope = cms.double( 0.001 ),
sumPtTrackIso = cms.double( 2.0 )
),
usePhotonReg = cms.bool( False ),
dzPV = cms.double( 0.2 ),
calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ),
Expand Down Expand Up @@ -11560,6 +11595,7 @@
MinN_HFP = cms.int32( 2 )
)
hltPAPixelTracksForHighMult = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
nSigmaTipMaxTolerance = cms.double( 0.0 ),
Expand All @@ -11568,7 +11604,6 @@
ptMin = cms.double( 0.3 ),
tipMax = cms.double( 1.0 )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet tracks for vertexing" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down Expand Up @@ -11769,6 +11804,7 @@
offset = cms.uint32( 0 )
)
hltPAPixelTracksForHighPt = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
nSigmaTipMaxTolerance = cms.double( 0.0 ),
Expand All @@ -11777,7 +11813,6 @@
ptMin = cms.double( 0.0 ),
tipMax = cms.double( 1.0 )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet tracks for vertexing" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down Expand Up @@ -13262,6 +13297,7 @@
offset = cms.uint32( 0 )
)
hltPAPixelTracksForMinBias = cms.EDProducer( "PixelTrackProducer",
useFilterWithES = cms.bool( False ),
FilterPSet = cms.PSet(
chi2 = cms.double( 1000.0 ),
nSigmaTipMaxTolerance = cms.double( 0.0 ),
Expand All @@ -13270,7 +13306,6 @@
ptMin = cms.double( 0.4 ),
tipMax = cms.double( 1.0 )
),
useFilterWithES = cms.bool( False ),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
FitterPSet = cms.PSet(
ComponentName = cms.string( "PixelFitterByHelixProjections" ),
Expand Down