-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42579 from perrotta/ecalRecProducersParameterUpda…
…teAndCleaning Updated ParameterDescription in EcalUncalibRecHitWorkerMultiFit.cc, and clean up some other configs
- Loading branch information
Showing
11 changed files
with
32 additions
and
211 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 2 additions & 9 deletions
11
RecoLocalCalo/EcalRecProducers/python/ecalAnalFitUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalAnalFitUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| # producer of rechits starting from digis | ||
| ecalAnalFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEhitCollection = cms.string('EcalUncalibRecHitsEE'), | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| algo = cms.string("EcalUncalibRecHitWorkerAnalFit"), | ||
| algoPSet = cms.PSet() | ||
| ) | ||
| ecalAnalFitUncalibRecHit = _mod.ecalAnalFitUncalibRecHitProducer.clone() |
21 changes: 3 additions & 18 deletions
21
RecoLocalCalo/EcalRecProducers/python/ecalFixedAlphaBetaFitUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,5 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalFixedAlphaBetaFitUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| # producer of rechits starting from digis | ||
| ecalFixedAlphaBetaFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEhitCollection = cms.string("EcalUncalibRecHitsEE"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| algo = cms.string("EcalUncalibRecHitWorkerFixedAlphaBetaFit"), | ||
| algoPSet = cms.PSet( | ||
| betaEB = cms.double(1.655), | ||
| betaEE = cms.double(1.400), | ||
| AlphaBetaFilename = cms.untracked.string("NOFILE"), | ||
| MinAmplEndcap = cms.double(14.0), | ||
| MinAmplBarrel = cms.double(8.0), | ||
| UseDynamicPedestal = cms.bool(True), | ||
| alphaEB = cms.double(1.138), | ||
| alphaEE = cms.double(1.890) | ||
| ) | ||
| ) | ||
| ecalFixedAlphaBetaFitUncalibRecHit = _mod.ecalFixedAlphaBetaFitUncalibRecHitProducer.clone() | ||
|
|
49 changes: 3 additions & 46 deletions
49
RecoLocalCalo/EcalRecProducers/python/ecalGlobalUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| ecalGlobalUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| EEhitCollection = cms.string('EcalUncalibRecHitsEE'), | ||
| algo = cms.string("EcalUncalibRecHitWorkerGlobal"), | ||
| algoPSet = cms.PSet( | ||
| # for ratio method | ||
| EBtimeFitParameters = cms.vdouble(-2.015452e+00, 3.130702e+00, -1.234730e+01, 4.188921e+01, -8.283944e+01, 9.101147e+01, -5.035761e+01, 1.105621e+01), | ||
| EEtimeFitParameters = cms.vdouble(-2.390548e+00, 3.553628e+00, -1.762341e+01, 6.767538e+01, -1.332130e+02, 1.407432e+02, -7.541106e+01, 1.620277e+01), | ||
| EBamplitudeFitParameters = cms.vdouble(1.138,1.652), | ||
| EEamplitudeFitParameters = cms.vdouble(1.890,1.400), | ||
| EBtimeFitLimits_Lower = cms.double(0.2), | ||
| EBtimeFitLimits_Upper = cms.double(1.4), | ||
| EEtimeFitLimits_Lower = cms.double(0.2), | ||
| EEtimeFitLimits_Upper = cms.double(1.4), | ||
| # for kOutOfTime flag | ||
| EBtimeConstantTerm= cms.double(.6), | ||
| EBtimeNconst = cms.double(28.5), | ||
| EEtimeConstantTerm= cms.double(1.0), | ||
| EEtimeNconst = cms.double(31.8), | ||
| outOfTimeThresholdGain12pEB = cms.double(5), # times estimated precision | ||
| outOfTimeThresholdGain12mEB = cms.double(5), # times estimated precision | ||
| outOfTimeThresholdGain61pEB = cms.double(5), # times estimated precision | ||
| outOfTimeThresholdGain61mEB = cms.double(5), # times estimated precision | ||
| outOfTimeThresholdGain12pEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain12mEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain61pEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain61mEE = cms.double(1000), # times estimated precision | ||
| amplitudeThresholdEB = cms.double(10), | ||
| amplitudeThresholdEE = cms.double(10), | ||
|
|
||
| ebSpikeThreshold = cms.double(1.042), | ||
|
|
||
| ebPulseShape = cms.vdouble( 5.2e-05,-5.26e-05 , 6.66e-05, 0.1168, 0.7575, 1., 0.8876, 0.6732, 0.4741, 0.3194 ), | ||
| eePulseShape = cms.vdouble( 5.2e-05,-5.26e-05 , 6.66e-05, 0.1168, 0.7575, 1., 0.8876, 0.6732, 0.4741, 0.3194 ), | ||
|
|
||
| kPoorRecoFlagEB = cms.bool(True), | ||
| kPoorRecoFlagEE = cms.bool(False), | ||
| chi2ThreshEB_ = cms.double(36.0), | ||
| chi2ThreshEE_ = cms.double(95.0), | ||
| EBchi2Parameters = cms.vdouble(2.122, 0.022, 2.122, 0.022), | ||
| EEchi2Parameters = cms.vdouble(2.122, 0.022, 2.122, 0.022), | ||
| ) | ||
| ) | ||
| # producer of rechits starting from digis | ||
| ecalGlobalUncalibRecHit = _mod.ecalGlobalUncalibRecHitProducer.clone() |
12 changes: 3 additions & 9 deletions
12
RecoLocalCalo/EcalRecProducers/python/ecalMaxSampleUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalMaxSampleUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| ecalMaxSampleUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalEBunpacker","ebDigis"), | ||
| EEhitCollection = cms.string("EcalUncalibRecHitsEE"), | ||
| EEdigiCollection = cms.InputTag("ecalEBunpacker","eeDigis"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| algo = cms.string("EcalUncalibRecHitWorkerMaxSample"), | ||
| algoPSet = cms.PSet() | ||
| ) | ||
| # producer of rechits starting from digis | ||
| ecalMaxSampleUncalibRecHit = _mod.ecalMaxSampleUncalibRecHitProducer.clone() |
74 changes: 3 additions & 71 deletions
74
RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,5 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalMultiFitUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| from RecoLocalCalo.EcalRecProducers.ecalPulseShapeParameters_cff import * | ||
| # producer of rechits starting from digis | ||
| ecalMultiFitUncalibRecHit = _mod.ecalMultiFitUncalibRecHitProducer.clone() | ||
|
|
||
| ecalMultiFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| EEhitCollection = cms.string('EcalUncalibRecHitsEE'), | ||
| algo = cms.string("EcalUncalibRecHitWorkerMultiFit"), | ||
| algoPSet = cms.PSet( | ||
| # for multifit method | ||
| activeBXs = cms.vint32(-5,-4,-3,-2,-1,0,1,2,3,4), | ||
| ampErrorCalculation = cms.bool(True), | ||
| useLumiInfoRunHeader = cms.bool(True), | ||
|
|
||
| doPrefitEB = cms.bool(False), | ||
| doPrefitEE = cms.bool(False), | ||
| prefitMaxChiSqEB = cms.double(25.), | ||
| prefitMaxChiSqEE = cms.double(10.), | ||
|
|
||
| dynamicPedestalsEB = cms.bool(False), | ||
| dynamicPedestalsEE = cms.bool(False), | ||
| mitigateBadSamplesEB = cms.bool(False), | ||
| mitigateBadSamplesEE = cms.bool(False), | ||
| gainSwitchUseMaxSampleEB = cms.bool(True), | ||
| gainSwitchUseMaxSampleEE = cms.bool(False), | ||
| selectiveBadSampleCriteriaEB = cms.bool(False), | ||
| selectiveBadSampleCriteriaEE = cms.bool(False), | ||
| simplifiedNoiseModelForGainSwitch = cms.bool(True), | ||
| addPedestalUncertaintyEB = cms.double(0.), | ||
| addPedestalUncertaintyEE = cms.double(0.), | ||
|
|
||
| # decide which algorithm to be use to calculate the jitter | ||
| timealgo = cms.string("crossCorrelationMethod"), | ||
|
|
||
| # for ratio method | ||
| EBtimeFitParameters = cms.vdouble(-2.015452e+00, 3.130702e+00, -1.234730e+01, 4.188921e+01, -8.283944e+01, 9.101147e+01, -5.035761e+01, 1.105621e+01), | ||
| EEtimeFitParameters = cms.vdouble(-2.390548e+00, 3.553628e+00, -1.762341e+01, 6.767538e+01, -1.332130e+02, 1.407432e+02, -7.541106e+01, 1.620277e+01), | ||
| EBamplitudeFitParameters = cms.vdouble(1.138,1.652), | ||
| EEamplitudeFitParameters = cms.vdouble(1.890,1.400), | ||
| EBtimeFitLimits_Lower = cms.double(0.2), | ||
| EBtimeFitLimits_Upper = cms.double(1.4), | ||
| EEtimeFitLimits_Lower = cms.double(0.2), | ||
| EEtimeFitLimits_Upper = cms.double(1.4), | ||
| # for time error | ||
| EBtimeConstantTerm= cms.double(.6), | ||
| EEtimeConstantTerm= cms.double(1.0), | ||
|
|
||
| # for kOutOfTime flag | ||
| EBtimeNconst = cms.double(28.5), | ||
| EEtimeNconst = cms.double(31.8), | ||
| outOfTimeThresholdGain12pEB = cms.double(2.5), # times estimated precision | ||
| outOfTimeThresholdGain12mEB = cms.double(2.5), # times estimated precision | ||
| outOfTimeThresholdGain61pEB = cms.double(2.5), # times estimated precision | ||
| outOfTimeThresholdGain61mEB = cms.double(2.5), # times estimated precision | ||
| outOfTimeThresholdGain12pEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain12mEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain61pEE = cms.double(1000), # times estimated precision | ||
| outOfTimeThresholdGain61mEE = cms.double(1000), # times estimated precision | ||
| amplitudeThresholdEB = cms.double(10), | ||
| amplitudeThresholdEE = cms.double(10), | ||
|
|
||
| # for crossCorrelationMethod | ||
| crossCorrelationStartTime = cms.double(-25), | ||
| crossCorrelationStopTime = cms.double(25), | ||
| crossCorrelationTargetTimePrecision = cms.double(0.01), | ||
| crossCorrelationTargetTimePrecisionForDelayedPulses = cms.double(0.05), | ||
| crossCorrelationTimeShiftWrtRations = cms.double(0.0), | ||
| crossCorrelationMinTimeToBeLateMin = cms.double(2), | ||
| crossCorrelationMinTimeToBeLateMax = cms.double(5) | ||
| ) | ||
| ) |
23 changes: 3 additions & 20 deletions
23
RecoLocalCalo/EcalRecProducers/python/ecalRatioUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalRatioUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| ecalRatioUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBhitCollection = cms.string("EcalUncalibRecHitsEB"), | ||
| EEhitCollection = cms.string('EcalUncalibRecHitsEE'), | ||
| algo = cms.string("EcalUncalibRecHitWorkerRatio"), | ||
| algoPSet = cms.PSet( | ||
| EBtimeFitParameters = cms.vdouble(-2.015452e+00, 3.130702e+00, -1.234730e+01, 4.188921e+01, -8.283944e+01, 9.101147e+01, -5.035761e+01, 1.105621e+01), | ||
| EEtimeFitParameters = cms.vdouble(-2.390548e+00, 3.553628e+00, -1.762341e+01, 6.767538e+01, -1.332130e+02, 1.407432e+02, -7.541106e+01, 1.620277e+01), | ||
| EBamplitudeFitParameters = cms.vdouble(1.138,1.652), | ||
| EEamplitudeFitParameters = cms.vdouble(1.890,1.400), | ||
| EBtimeFitLimits_Lower = cms.double(0.2), | ||
| EBtimeFitLimits_Upper = cms.double(1.4), | ||
| EEtimeFitLimits_Lower = cms.double(0.2), | ||
| EEtimeFitLimits_Upper = cms.double(1.4), | ||
| EBtimeConstantTerm = cms.double(.26), | ||
| EEtimeConstantTerm = cms.double(.18), | ||
| ) | ||
| ) | ||
| # producer of rechits starting from digis | ||
| ecalRatioUncalibRecHit = _mod.ecalRatioUncalibRecHitProducer.clone() |
11 changes: 2 additions & 9 deletions
11
RecoLocalCalo/EcalRecProducers/python/ecalWeightUncalibRecHit_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
| import RecoLocalCalo.EcalRecProducers.ecalWeightsUncalibRecHitProducer_cfi as _mod | ||
|
|
||
| # producer of rechits starting from digis | ||
| ecalWeightUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", | ||
| EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"), | ||
| EEhitCollection = cms.string('EcalUncalibRecHitsEE'), | ||
| EEdigiCollection = cms.InputTag("ecalDigis","eeDigis"), | ||
| EBhitCollection = cms.string('EcalUncalibRecHitsEB'), | ||
| algo = cms.string("EcalUncalibRecHitWorkerWeights"), | ||
| algoPSet = cms.PSet() | ||
| ) | ||
| ecalWeightUncalibRecHit = _mod.ecalWeightsUncalibRecHitProducer.clone() |