Skip to content

Commit

Permalink
filldesc default
Browse files Browse the repository at this point in the history
  • Loading branch information
@afiqaize
afiqaize committed Jun 8, 2021
1 parent dbfd317 commit 5ad8a10
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 295 deletions.
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ void ElectronSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& desc
desc.add<edm::InputTag>("endcapSuperClusters",
{"particleFlowSuperClusterECAL", "particleFlowSuperClusterECALEndcapWithPreshower"});

descriptions.add("ecalDrivenElectronSeeds", desc);
descriptions.add("ecalDrivenElectronSeedsDefault", desc);
}

#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronProducers/plugins/GsfElectronProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void GsfElectronProducer::fillDescriptions(edm::ConfigurationDescriptions& descr
"RecoEgamma/ElectronIdentification/data/TMVA_BDTSoftElectrons_7Feb2014.weights.xml",
});

descriptions.add("gsfElectronProducer", desc);
descriptions.add("gsfElectronProducerDefault", desc);
}

namespace {
Expand Down
46 changes: 6 additions & 40 deletions RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,10 @@

from RecoEgamma.EgammaIsolationAlgos.egammaHBHERecHitThreshold_cff import egammaHBHERecHit

ecalDrivenElectronSeeds = cms.EDProducer('ElectronSeedProducer',
initialSeedsVector = cms.VInputTag(),
useRecoVertex = cms.bool(False),
vertices = cms.InputTag('offlinePrimaryVerticesWithBS'),
beamSpot = cms.InputTag('offlineBeamSpot'),
dynamicPhiRoad = cms.bool(True),
SCEtCut = cms.double(0),
applyHOverECut = cms.bool(True),
hOverEConeSize = cms.double(0.15),
maxHOverEBarrel = cms.double(0.15),
maxHOverEEndcaps = cms.double(0.15),
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity,
allowHGCal = cms.bool(False),
HGCalConfig = cms.PSet(
HGCEEInput = cms.InputTag('HGCalRecHit', 'HGCEERecHits'),
HGCFHInput = cms.InputTag('HGCalRecHit', 'HGCHEFRecHits'),
HGCBHInput = cms.InputTag('HGCalRecHit', 'HGCHEBRecHits')
),
nSigmasDeltaZ1 = cms.double(5),
deltaZ1WithVertex = cms.double(25),
z2MaxB = cms.double(0.09),
r2MaxF = cms.double(0.15),
rMaxI = cms.double(0.2),
LowPtThreshold = cms.double(5),
HighPtThreshold = cms.double(35),
SizeWindowENeg = cms.double(0.675),
DeltaPhi1Low = cms.double(0.23),
DeltaPhi1High = cms.double(0.08),
DeltaPhi2B = cms.double(0.008),
DeltaPhi2F = cms.double(0.012),
ePhiMin1 = cms.double(-0.125),
ePhiMax1 = cms.double(0.075),
PhiMax2B = cms.double(0.002),
PhiMax2F = cms.double(0.003),
barrelSuperClusters = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowSuperClusterECALBarrel'),
endcapSuperClusters = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowSuperClusterECALEndcapWithPreshower'),
mightGet = cms.optional.untracked.vstring
import RecoEgamma.EgammaElectronProducers.ecalDrivenElectronSeedsDefault_cfi as _ecalSeeds
ecalDrivenElectronSeeds = _ecalSeeds.ecalDrivenElectronSeedsDefault.clone(
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity
)
206 changes: 6 additions & 200 deletions RecoEgamma/EgammaElectronProducers/python/gsfElectronProducer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,204 +2,10 @@

from RecoEgamma.EgammaIsolationAlgos.egammaHBHERecHitThreshold_cff import egammaHBHERecHit

gsfElectronProducer = cms.EDProducer('GsfElectronProducer',
gsfElectronCoresTag = cms.InputTag('ecalDrivenGsfElectronCores'),
vtxTag = cms.InputTag('offlinePrimaryVertices'),
conversionsTag = cms.InputTag('allConversions'),
gsfPfRecTracksTag = cms.InputTag('pfTrackElec'),
barrelRecHitCollectionTag = cms.InputTag('ecalRecHit', 'EcalRecHitsEB'),
endcapRecHitCollectionTag = cms.InputTag('ecalRecHit', 'EcalRecHitsEE'),
seedsTag = cms.InputTag('ecalDrivenElectronSeeds'),
beamSpotTag = cms.InputTag('offlineBeamSpot'),
egmPFCandidatesTag = cms.InputTag('particleFlowEGamma'),
useDefaultEnergyCorrection = cms.bool(True),
useCombinationRegression = cms.bool(False),
ecalDrivenEcalEnergyFromClassBasedParameterization = cms.bool(True),
ecalDrivenEcalErrorFromClassBasedParameterization = cms.bool(True),
applyPreselection = cms.bool(False),
useEcalRegression = cms.bool(False),
applyAmbResolution = cms.bool(False),
ignoreNotPreselected = cms.bool(True),
useGsfPfRecTracks = cms.bool(True),
pureTrackerDrivenEcalErrorFromSimpleParameterization = cms.bool(True),
ambSortingStrategy = cms.uint32(1),
ambClustersOverlapStrategy = cms.uint32(1),
fillConvVtxFitProb = cms.bool(True),
resetMvaValuesUsingPFCandidates = cms.bool(False),
recHitFlagsToBeExcludedBarrel = cms.required.vstring,
recHitFlagsToBeExcludedEndcaps = cms.required.vstring,
recHitSeverityToBeExcludedBarrel = cms.required.vstring,
recHitSeverityToBeExcludedEndcaps = cms.required.vstring,
checkHcalStatus = cms.bool(True),
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity,
hcalRun2EffDepth = cms.bool(False),
trkIsol03Cfg = cms.PSet(
barrelCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
),
endcapCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
)
),
trkIsol04Cfg = cms.PSet(
barrelCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
),
endcapCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
)
),
trkIsolHEEP03Cfg = cms.PSet(
barrelCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
),
endcapCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
)
),
trkIsolHEEP04Cfg = cms.PSet(
barrelCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
),
endcapCuts = cms.PSet(
minPt = cms.double(1),
maxDR = cms.double(0.3),
minDR = cms.double(0),
minDEta = cms.double(0.005),
maxDZ = cms.double(0.1),
maxDPtPt = cms.double(-1),
minHits = cms.int32(8),
minPixelHits = cms.int32(1),
allowedQualities = cms.required.vstring,
algosToReject = cms.required.vstring
)
),
useNumCrystals = cms.bool(True),
etMinBarrel = cms.double(0),
etMinEndcaps = cms.double(0.11),
etMinHcal = cms.double(0),
eMinBarrel = cms.double(0.095),
eMinEndcaps = cms.double(0),
intRadiusEcalBarrel = cms.double(3),
intRadiusEcalEndcaps = cms.double(3),
intRadiusHcal = cms.double(0.15),
jurassicWidth = cms.double(1.5),
vetoClustered = cms.bool(False),
ctfTracksCheck = cms.bool(True),
ctfTracksTag = cms.InputTag('generalTracks'),
MaxElePtForOnlyMVA = cms.double(50),
PreSelectMVA = cms.double(-0.1),
preselection = cms.PSet(
minSCEtBarrel = cms.double(4),
minSCEtEndcaps = cms.double(4),
minEOverPBarrel = cms.double(0),
minEOverPEndcaps = cms.double(0),
maxEOverPBarrel = cms.double(999999999),
maxEOverPEndcaps = cms.double(999999999),
maxDeltaEtaBarrel = cms.double(0.02),
maxDeltaEtaEndcaps = cms.double(0.02),
maxDeltaPhiBarrel = cms.double(0.15),
maxDeltaPhiEndcaps = cms.double(0.15),
hOverEConeSize = cms.double(0.15),
maxHOverEBarrelCone = cms.double(0.15),
maxHOverEEndcapsCone = cms.double(0.15),
maxHBarrelCone = cms.double(0),
maxHEndcapsCone = cms.double(0),
maxHOverEBarrelBc = cms.double(0.15),
maxHOverEEndcapsBc = cms.double(0.15),
maxHBarrelBc = cms.double(0),
maxHEndcapsBc = cms.double(0),
maxSigmaIetaIetaBarrel = cms.double(999999999),
maxSigmaIetaIetaEndcaps = cms.double(999999999),
maxFbremBarrel = cms.double(999999999),
maxFbremEndcaps = cms.double(999999999),
isBarrel = cms.bool(False),
isEndcaps = cms.bool(False),
isFiducial = cms.bool(False),
seedFromTEC = cms.bool(True),
maxTIP = cms.double(999999999),
multThresEB = cms.double(1),
multThresEE = cms.double(1.25)
),
crackCorrectionFunction = cms.string('EcalClusterCrackCorrection'),
ecalWeightsFromDB = cms.bool(True),
ecalRefinedRegressionWeightFiles = cms.vstring(),
combinationWeightsFromDB = cms.bool(True),
combinationRegressionWeightFile = cms.vstring(),
ecalRefinedRegressionWeightLabels = cms.vstring(),
combinationRegressionWeightLabels = cms.vstring(),
ElecMVAFilesString = cms.vstring(
'RecoEgamma/ElectronIdentification/data/TMVA_Category_BDTSimpleCat_10_17Feb2011.weights.xml',
'RecoEgamma/ElectronIdentification/data/TMVA_Category_BDTSimpleCat_12_17Feb2011.weights.xml',
'RecoEgamma/ElectronIdentification/data/TMVA_Category_BDTSimpleCat_20_17Feb2011.weights.xml',
'RecoEgamma/ElectronIdentification/data/TMVA_Category_BDTSimpleCat_22_17Feb2011.weights.xml'
),
SoftElecMVAFilesString = cms.vstring('RecoEgamma/ElectronIdentification/data/TMVA_BDTSoftElectrons_7Feb2014.weights.xml'),
mightGet = cms.optional.untracked.vstring
import RecoEgamma.EgammaElectronProducers.gsfElectronProducerDefault_cfi as _gsfProd
gsfElectronProducer = _gsfProd.gsfElectronProducerDefault.clone(
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity
)
58 changes: 6 additions & 52 deletions RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,10 @@
import FWCore.ParameterSet.Config as cms
from RecoEgamma.EgammaIsolationAlgos.egammaHBHERecHitThreshold_cff import egammaHBHERecHit

conversionTrackCandidates = cms.EDProducer('ConversionTrackCandidateProducer',
bcBarrelCollection = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowBasicClusterECALBarrel'),
bcEndcapCollection = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowBasicClusterECALEndcap'),
scHybridBarrelProducer = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowSuperClusterECALBarrel'),
scIslandEndcapProducer = cms.InputTag('particleFlowSuperClusterECAL', 'particleFlowSuperClusterECALEndcapWithPreshower'),
outInTrackCandidateSCAssociationCollection = cms.string('outInTrackCandidateSCAssociationCollection'),
inOutTrackCandidateSCAssociationCollection = cms.string('inOutTrackCandidateSCAssociationCollection'),
outInTrackCandidateCollection = cms.string('outInTracksFromConversions'),
inOutTrackCandidateCollection = cms.string('inOutTracksFromConversions'),
barrelEcalRecHitCollection = cms.InputTag('ecalRecHit', 'EcalRecHitsEB'),
endcapEcalRecHitCollection = cms.InputTag('ecalRecHit', 'EcalRecHitsEE'),
MeasurementTrackerName = cms.string(''),
OutInRedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'),
InOutRedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'),
useHitsSplitting = cms.bool(False),
maxNumOfSeedsOutIn = cms.int32(50),
maxNumOfSeedsInOut = cms.int32(50),
bcEtCut = cms.double(1.5),
bcECut = cms.double(1.5),
useEtCut = cms.bool(True),
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity,
minSCEt = cms.double(20),
hOverEConeSize = cms.double(0.15),
maxHOverE = cms.double(0.15),
isoInnerConeR = cms.double(3.5),
isoConeR = cms.double(0.4),
isoEtaSlice = cms.double(2.5),
isoEtMin = cms.double(0),
isoEMin = cms.double(0.08),
vetoClusteredHits = cms.bool(False),
useNumXstals = cms.bool(True),
ecalIsoCut_offset = cms.double(999999999),
ecalIsoCut_slope = cms.double(0),
RecHitFlagToBeExcludedEB = cms.vstring(),
RecHitSeverityToBeExcludedEB = cms.vstring(),
RecHitFlagToBeExcludedEE = cms.vstring(),
RecHitSeverityToBeExcludedEE = cms.vstring(),
fractionShared = cms.double(0.5),
TrajectoryBuilder = cms.string('TrajectoryBuilderForConversions'),
TrajectoryBuilderPSet = cms.PSet(),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string('alongMomElePropagator'),
numberMeasurementsForFit = cms.int32(4),
propagatorOppositeTISE = cms.string('oppositeToMomElePropagator')
),
allowSharedFirstHit = cms.bool(True),
ValidHitBonus = cms.double(5),
MissingHitPenalty = cms.double(20),
mightGet = cms.optional.untracked.vstring
import RecoEgamma.EgammaPhotonProducers.conversionTrackCandidatesDefault_cfi as _convTrkCand
conversionTrackCandidates = _convTrkCand.conversionTrackCandidatesDefault.clone(
hbheRecHits = egammaHBHERecHit.hbheRecHits,
recHitEThresholdHB = egammaHBHERecHit.recHitEThresholdHB,
recHitEThresholdHE = egammaHBHERecHit.recHitEThresholdHE,
maxHcalRecHitSeverity = egammaHBHERecHit.maxHcalRecHitSeverity
)
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ void ConversionTrackCandidateProducer::fillDescriptions(edm::ConfigurationDescri
desc.add<double>("ValidHitBonus", 5.0);
desc.add<double>("MissingHitPenalty", 20.0);

descriptions.add("conversionTrackCandidates", desc);
descriptions.add("conversionTrackCandidatesDefault", desc);
// or use the following to generate the label from the module's C++ type
//descriptions.addWithDefaultLabel(desc);
}

0 comments on commit 5ad8a10

Please sign in to comment.