From 72b8a84de2f102dac85fda83bf3198a5b5beea59 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 15 Apr 2017 10:36:15 +0200 Subject: [PATCH 1/2] Update the cff files for PhiSymmetry ALCARECO --- .../python/ALCARECOHcalCalMinBiasHI_cff.py | 134 ++++++++++--- .../python/ALCARECOHcalCalMinBias_cff.py | 186 +++++++++++++----- .../python/ALCARECOHcalCalPedestal_cff.py | 77 +++++++- 3 files changed, 315 insertions(+), 82 deletions(-) diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py index 3dcdd442ef494..cfebde53bf41d 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py @@ -6,18 +6,17 @@ import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi hcalDigiAlCaMB = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi -hbherecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi -hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi -hfrecoMBspecial = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi -horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() + +hcalDigiAlCaMB.firstSample = 0 +hcalDigiAlCaMB.lastSample = 9 +hcalDigiAlCaMB.InputLabel = 'rawDataCollector' + #add GT digi: import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi gtDigisAlCaMB = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone() +gtDigisAlCaMB.DaqGtInputTag = 'source' + import HLTrigger.HLTfilters.hltHighLevel_cfi hcalminbiasHLT = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone( # HLTPaths = ['HLT_HcalPhiSym'], @@ -25,37 +24,114 @@ throw = False #dont throw except on unknown path name ) -seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoNoise*hfrecoNoise*hfrecoMBspecial*horecoNoise) +import RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi +hbherecoNoise = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( + digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), + digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), + tsFromDB = cms.bool(False), + dropZSmarkedPassed = cms.bool(False), + algorithm = dict( + useM2 = cms.bool(False), + useM3 = cms.bool(False) + ), + processQIE11 = cms.bool(False), + setNegativeFlagsQIE8 = cms.bool(False), + setNegativeFlagsQIE11 = cms.bool(False), + setNoiseFlagsQIE8 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(False), + setPulseShapeFlagsQIE8 = cms.bool(False), + setPulseShapeFlagsQIE11 = cms.bool(False), + setLegacyFlagsQIE8 = cms.bool(False), + setLegacyFlagsQIE11 = cms.bool(False), +) -gtDigisAlCaMB.DaqGtInputTag = 'source' +hbherecoNoise.algorithm.firstSample = 0 +hbherecoNoise.algorithm.samplesToAdd = 4 -hcalDigiAlCaMB.firstSample = 0 -hcalDigiAlCaMB.lastSample = 9 -hcalDigiAlCaMB.InputLabel = 'rawDataCollector' - -hbherecoNoise.firstSample = 0 -hbherecoNoise.samplesToAdd = 4 -hbherecoNoise.digiLabel = 'hcalDigiAlCaMB' +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi +hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() +hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() hfrecoNoise.firstSample = 0 hfrecoNoise.samplesToAdd = 2 hfrecoNoise.digiLabel = 'hcalDigiAlCaMB' +hfrecoNoise.tsFromDB = cms.bool(False) +hfrecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoMBspecial.firstSample = 2 -hfrecoMBspecial.samplesToAdd = 2 -hfrecoMBspecial.digiLabel = 'hcalDigiAlCaMB' +hfrecoMBNZS.firstSample = 2 +hfrecoMBNZS.samplesToAdd = 2 +hfrecoMBNZS.digiLabel = 'hcalDigiAlCaMB' +hfrecoMBNZS.tsFromDB = cms.bool(False) +hfrecoMBNZS.dropZSmarkedPassed = cms.bool(False) + +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi +horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() horecoNoise.firstSample = 0 horecoNoise.samplesToAdd = 4 horecoNoise.digiLabel = 'hcalDigiAlCaMB' - -#switch off "ZS in reco": -hbherecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoNoise.dropZSmarkedPassed = cms.bool(False) -horecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoMBspecial.dropZSmarkedPassed = cms.bool(False) -hbherecoNoise.tsFromDB = cms.bool(False) -hfrecoNoise.tsFromDB = cms.bool(False) -hfrecoMBspecial.tsFromDB = cms.bool(False) horecoNoise.tsFromDB = cms.bool(False) +horecoNoise.dropZSmarkedPassed = cms.bool(False) + +seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) + +import RecoLocalCalo.HcalRecProducers.hfprereco_cfi +hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( + digiLabel = cms.InputTag("hcalDigiAlaMB"), + dropZSmarkedPassed = cms.bool(False), + tsFromDB = cms.bool(False), + sumAllTimeSlices = cms.bool(False), + forceSOI = cms.int32(0) +) +hfprerecoMBNZS = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( + digiLabel = cms.InputTag("hcalDigiAlaMB"), + dropZSmarkedPassed = cms.bool(False), + tsFromDB = cms.bool(False), + sumAllTimeSlices = cms.bool(True), + forceSOI = cms.int32(1) +) + +import RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi +_phase1_hfrecoNoise = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoNoise"), + setNoiseFlags = cms.bool(False), + algorithm = dict( + Class = cms.string("HFSimpleTimeCheck"), + rejectAllFailures = cms.bool(False) + ), +) +_phase1_hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoMBNZS"), + setNoiseFlags = cms.bool(False), + algorithm = dict( + Class = cms.string("HFSimpleTimeCheck"), + rejectAllFailures = cms.bool(False) + ), +) + +_phase1_seqALCARECOHcalCalMinBias = seqALCARECOHcalCalMinBias.copy() +_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoMBNZS) +_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoNoise) + +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +run2_HF_2017.toReplaceWith( seqALCARECOHcalCalMinBias, _phase1_seqALCARECOHcalCalMinBias ) +run2_HF_2017.toReplaceWith( hfrecoNoise, _phase1_hfrecoNoise ) +run2_HF_2017.toReplaceWith( hfrecoMBNZS, _phase1_hfrecoMBNZS ) + +import RecoLocalCalo.HcalRecProducers.hbheplan1_cfi +hbheplan1Noise = RecoLocalCalo.HcalRecProducers.hbheplan1_cfi.hbheplan1.clone( + hbheInput = cms.InputTag("hbheprerecoNoise") +) + +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( hbherecoNoise, + processQIE11 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(True), +) +_plan1_seqALCARECOHcalCalMinBias = _phase1_seqALCARECOHcalCalMinBias.copy() +hbheprerecoNoise = hbherecoNoise.clone() +_plan1_seqALCARECOHcalCalMinBias.insert(0,hbheprerecoNoise) +from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017 +run2_HEPlan1_2017.toReplaceWith(hbherecoNoise, hbheplan1Noise) +run2_HEPlan1_2017.toReplaceWith(seqALCARECOHcalCalMinBias, _plan1_seqALCARECOHcalCalMinBias) diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py index 2572ae171face..d41a1f2117565 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py @@ -6,23 +6,17 @@ import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi hcalDigiAlCaMB = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi -hbherecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi -horecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi -hbherecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi -hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi -hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi -horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() + +hcalDigiAlCaMB.firstSample = 0 +hcalDigiAlCaMB.lastSample = 9 +hcalDigiAlCaMB.InputLabel = 'rawDataCollector' #add GT digi: import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi gtDigisAlCaMB = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone() +gtDigisAlCaMB.DaqGtInputTag = 'source' + import HLTrigger.HLTfilters.hltHighLevel_cfi hcalminbiasHLT = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone( # HLTPaths = ['HLT_HcalPhiSym'], @@ -30,51 +24,155 @@ throw = False #dont throw except on unknown path name ) -seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) -seqALCARECOHcalCalMinBiasNoHLT = cms.Sequence(hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) +import RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi +hbherecoMBNZS = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( + digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), + digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), + tsFromDB = cms.bool(False), + dropZSmarkedPassed = cms.bool(False), + algorithm = dict( + useM2 = cms.bool(False), + useM3 = cms.bool(False) + ), + processQIE11 = cms.bool(False), + setNegativeFlagsQIE8 = cms.bool(False), + setNegativeFlagsQIE11 = cms.bool(False), + setNoiseFlagsQIE8 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(False), + setPulseShapeFlagsQIE8 = cms.bool(False), + setPulseShapeFlagsQIE11 = cms.bool(False), + setLegacyFlagsQIE8 = cms.bool(False), + setLegacyFlagsQIE11 = cms.bool(False), +) -gtDigisAlCaMB.DaqGtInputTag = 'source' +hbherecoMBNZS.algorithm.firstSample = 4 +hbherecoMBNZS.algorithm.samplesToAdd = 4 + +hbherecoNoise = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( + digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), + digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), + tsFromDB = cms.bool(False), + dropZSmarkedPassed = cms.bool(False), + algorithm = dict( + useM2 = cms.bool(False), + useM3 = cms.bool(False) + ), + processQIE11 = cms.bool(False), + setNegativeFlagsQIE8 = cms.bool(False), + setNegativeFlagsQIE11 = cms.bool(False), + setNoiseFlagsQIE8 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(False), + setPulseShapeFlagsQIE8 = cms.bool(False), + setPulseShapeFlagsQIE11 = cms.bool(False), + setLegacyFlagsQIE8 = cms.bool(False), + setLegacyFlagsQIE11 = cms.bool(False), +) -hcalDigiAlCaMB.firstSample = 0 -hcalDigiAlCaMB.lastSample = 9 -hcalDigiAlCaMB.InputLabel = 'rawDataCollector' +hbherecoNoise.algorithm.firstSample = 0 +hbherecoNoise.algorithm.samplesToAdd = 4 -hbherecoMBNZS.firstSample = 0 -hbherecoMBNZS.samplesToAdd = 4 -hbherecoMBNZS.digiLabel = 'hcalDigiAlCaMB' +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi +horecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() +horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() -horecoMBNZS.firstSample = 0 +horecoMBNZS.firstSample = 4 horecoMBNZS.samplesToAdd = 4 horecoMBNZS.digiLabel = 'hcalDigiAlCaMB' +horecoMBNZS.tsFromDB = cms.bool(False) +horecoMBNZS.dropZSmarkedPassed = cms.bool(False) +horecoNoise.firstSample = 0 +horecoNoise.samplesToAdd = 4 +horecoNoise.digiLabel = 'hcalDigiAlCaMB' +horecoNoise.tsFromDB = cms.bool(False) +horecoNoise.dropZSmarkedPassed = cms.bool(False) -hbherecoNoise.firstSample = 0 -hbherecoNoise.samplesToAdd = 4 -hbherecoNoise.digiLabel = 'hcalDigiAlCaMB' +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi +hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() +hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() + +hfrecoMBNZS.firstSample = 2 +hfrecoMBNZS.samplesToAdd = 2 +hfrecoMBNZS.digiLabel = 'hcalDigiAlCaMB' +hfrecoMBNZS.tsFromDB = cms.bool(False) +hfrecoMBNZS.dropZSmarkedPassed = cms.bool(False) hfrecoNoise.firstSample = 0 hfrecoNoise.samplesToAdd = 2 hfrecoNoise.digiLabel = 'hcalDigiAlCaMB' +hfrecoNoise.tsFromDB = cms.bool(False) +hfrecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoMBNZS.firstSample = 2 -hfrecoMBNZS.samplesToAdd = 2 -hfrecoMBNZS.digiLabel = 'hcalDigiAlCaMB' +seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) +seqALCARECOHcalCalMinBiasNoHLT = cms.Sequence(hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) -horecoNoise.firstSample = 0 -horecoNoise.samplesToAdd = 4 -horecoNoise.digiLabel = 'hcalDigiAlCaMB' +import RecoLocalCalo.HcalRecProducers.hfprereco_cfi +hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( + digiLabel = cms.InputTag("hcalDigiAlaMB"), + dropZSmarkedPassed = cms.bool(False), + tsFromDB = cms.bool(False), + sumAllTimeSlices = cms.bool(False), + forceSOI = cms.int32(0) +) +hfprerecoMBNZS = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( + digiLabel = cms.InputTag("hcalDigiAlaMB"), + dropZSmarkedPassed = cms.bool(False), + tsFromDB = cms.bool(False), + sumAllTimeSlices = cms.bool(True), + forceSOI = cms.int32(1) +) -#switch off "ZS in reco": -hbherecoMBNZS.dropZSmarkedPassed = cms.bool(False) -horecoMBNZS.dropZSmarkedPassed = cms.bool(False) -hbherecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoNoise.dropZSmarkedPassed = cms.bool(False) -horecoNoise.dropZSmarkedPassed = cms.bool(False) -hfrecoMBNZS.dropZSmarkedPassed = cms.bool(False) -hbherecoMBNZS.tsFromDB = cms.bool(False) -horecoMBNZS.tsFromDB = cms.bool(False) -hbherecoNoise.tsFromDB = cms.bool(False) -hfrecoNoise.tsFromDB = cms.bool(False) -hfrecoMBNZS.tsFromDB = cms.bool(False) -horecoNoise.tsFromDB = cms.bool(False) +import RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi +_phase1_hfrecoNoise = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoNoise"), + setNoiseFlags = cms.bool(False), + algorithm = dict( + Class = cms.string("HFSimpleTimeCheck"), + rejectAllFailures = cms.bool(False) + ), +) +_phase1_hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoMBNZS"), + setNoiseFlags = cms.bool(False), + algorithm = dict( + Class = cms.string("HFSimpleTimeCheck"), + rejectAllFailures = cms.bool(False) + ), +) + +_phase1_seqALCARECOHcalCalMinBias = seqALCARECOHcalCalMinBias.copy() +_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoMBNZS) +_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoNoise) + +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +run2_HF_2017.toReplaceWith( seqALCARECOHcalCalMinBias, _phase1_seqALCARECOHcalCalMinBias ) +run2_HF_2017.toReplaceWith( hfrecoNoise, _phase1_hfrecoNoise ) +run2_HF_2017.toReplaceWith( hfrecoMBNZS, _phase1_hfrecoMBNZS ) + +import RecoLocalCalo.HcalRecProducers.hbheplan1_cfi +hbheplan1MBNZS = RecoLocalCalo.HcalRecProducers.hbheplan1_cfi.hbheplan1.clone( + hbheInput = cms.InputTag("hbheprerecoMBNZS") +) +hbheplan1Noise = RecoLocalCalo.HcalRecProducers.hbheplan1_cfi.hbheplan1.clone( + hbheInput = cms.InputTag("hbheprerecoNoise") +) + +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( hbherecoMBNZS, + processQIE11 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(True), +) +run2_HCAL_2017.toModify( hbherecoNoise, + processQIE11 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(True), +) +_plan1_seqALCARECOHcalCalMinBias = _phase1_seqALCARECOHcalCalMinBias.copy() +hbheprerecoMBNZS = hbherecoMBNZS.clone() +hbheprerecoNoise = hbherecoNoise.clone() +_plan1_seqALCARECOHcalCalMinBias.insert(0,hbheprerecoNoise) +_plan1_seqALCARECOHcalCalMinBias.insert(0,hbheprerecoMBNZS) +from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017 +run2_HEPlan1_2017.toReplaceWith(hbherecoMBNZS, hbheplan1MBNZS) +run2_HEPlan1_2017.toReplaceWith(hbherecoNoise, hbheplan1Noise) +run2_HEPlan1_2017.toReplaceWith(seqALCARECOHcalCalMinBias, _plan1_seqALCARECOHcalCalMinBias) diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py index 8b643ac1f8119..b347be435c5d5 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py @@ -25,27 +25,42 @@ qie10Digis.InputLabel = cms.InputTag('hltHcalCalibrationRaw') qie10Digis.FEDs = cms.untracked.vint32(1132) -import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi -hbherecoPedestal = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone() -hbherecoPedestal.digiLabel = cms.InputTag('hcalDigiAlCaPedestal') -hbherecoPedestal.firstSample = cms.int32(0) -hbherecoPedestal.samplesToAdd = cms.int32(4) +import RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi +hbherecoPedestal = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( + digiLabelQIE8 = cms.InputTag("hcalDigiAlCaPedestal"), + digiLabelQIE11 = cms.InputTag("hcalDigiAlCaPedestal"), + tsFromDB = cms.bool(False), + dropZSmarkedPassed = cms.bool(False), + algorithm = dict( + useM2 = cms.bool(False), + useM3 = cms.bool(False) + ), + processQIE11 = cms.bool(False), + setNegativeFlagsQIE8 = cms.bool(False), + setNegativeFlagsQIE11 = cms.bool(False), + setNoiseFlagsQIE8 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(False), + setPulseShapeFlagsQIE8 = cms.bool(False), + setPulseShapeFlagsQIE11 = cms.bool(False), + setLegacyFlagsQIE8 = cms.bool(False), + setLegacyFlagsQIE11 = cms.bool(False), +) + +hbherecoPedestal.algorithm.firstSample = 0 +hbherecoPedestal.algorithm.samplesToAdd = 4 import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi hfrecoPedestal = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() hfrecoPedestal.digiLabel = cms.InputTag('hcalDigiAlCaPedestal') hfrecoPedestal.firstSample = cms.int32(0) hfrecoPedestal.samplesToAdd = cms.int32(2) +hfrecoPedestal.dropZSmarkedPassed = cms.bool(False) import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi horecoPedestal = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() horecoPedestal.digiLabel = cms.InputTag('hcalDigiAlCaPedestal') horecoPedestal.firstSample = cms.int32(0) horecoPedestal.samplesToAdd = cms.int32(4) - -# switch off "Hcal ZS in reco": -hbherecoPedestal.dropZSmarkedPassed = cms.bool(False) -hfrecoPedestal.dropZSmarkedPassed = cms.bool(False) horecoPedestal.dropZSmarkedPassed = cms.bool(False) hcalLocalRecoSequencePedestal = cms.Sequence(hbherecoPedestal*hfrecoPedestal*horecoPedestal) @@ -55,3 +70,47 @@ qie10Digis* gtDigisAlCaPedestal* hcalLocalRecoSequencePedestal) + +import RecoLocalCalo.HcalRecProducers.hfprereco_cfi +hfprerecoPedestal = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( + digiLabel = cms.InputTag("hcalDigiAlaMB"), + dropZSmarkedPassed = cms.bool(False), + tsFromDB = cms.bool(False), + sumAllTimeSlices = cms.bool(False), + forceSOI = cms.int32(0) +) + +import RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi +_phase1_hfrecoPedestal = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoPedestal"), + setNoiseFlags = cms.bool(False), + algorithm = dict( + Class = cms.string("HFSimpleTimeCheck"), + rejectAllFailures = cms.bool(False) + ), +) + +_phase1_seqALCARECOHcalCalPedestal = seqALCARECOHcalCalPedestal.copy() +_phase1_seqALCARECOHcalCalPedestal.insert(0,hfprerecoPedestal) + +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +run2_HF_2017.toReplaceWith( seqALCARECOHcalCalPedestal, _phase1_seqALCARECOHcalCalPedestal ) +run2_HF_2017.toReplaceWith( hfrecoPedestal, _phase1_hfrecoPedestal ) + +import RecoLocalCalo.HcalRecProducers.hbheplan1_cfi +hbheplan1Pedestal = RecoLocalCalo.HcalRecProducers.hbheplan1_cfi.hbheplan1.clone( + hbheInput = cms.InputTag("hbheprerecoPedestal") +) + +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( hbherecoPedestal, + processQIE11 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(True), +) + +_plan1_seqALCARECOHcalCalPedestal = _phase1_seqALCARECOHcalCalPedestal.copy() +hbheprerecoPedestal = hbherecoPedestal.clone() +_plan1_seqALCARECOHcalCalPedestal.insert(0,hbheprerecoPedestal) +from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017 +run2_HEPlan1_2017.toReplaceWith(hbherecoPedestal, hbheplan1Pedestal) +run2_HEPlan1_2017.toReplaceWith(seqALCARECOHcalCalPedestal, _plan1_seqALCARECOHcalCalPedestal) From a45b71292844e3613b6096c0cdffa6e04c15a299 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 20 Apr 2017 10:53:32 +0200 Subject: [PATCH 2/2] Try to have part of the common specification in ALCARECOHcalCalMinBiasNoise_cff --- .../python/ALCARECOHcalCalMinBiasHI_cff.py | 69 +++---------------- .../python/ALCARECOHcalCalMinBiasNoise_cff.py | 62 +++++++++++++++++ .../python/ALCARECOHcalCalMinBias_cff.py | 50 +------------- 3 files changed, 74 insertions(+), 107 deletions(-) create mode 100644 Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasNoise_cff.py diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py index cfebde53bf41d..e6e1e0d14fb48 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py @@ -4,18 +4,7 @@ #AlCaReco filtering for HCAL minbias: #------------------------------------------------ -import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi -hcalDigiAlCaMB = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone() - -hcalDigiAlCaMB.firstSample = 0 -hcalDigiAlCaMB.lastSample = 9 -hcalDigiAlCaMB.InputLabel = 'rawDataCollector' - -#add GT digi: -import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi -gtDigisAlCaMB = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone() - -gtDigisAlCaMB.DaqGtInputTag = 'source' +from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBiasNoise_cff import * import HLTrigger.HLTfilters.hltHighLevel_cfi hcalminbiasHLT = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone( @@ -25,39 +14,10 @@ ) import RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi -hbherecoNoise = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( - digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), - digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), - tsFromDB = cms.bool(False), - dropZSmarkedPassed = cms.bool(False), - algorithm = dict( - useM2 = cms.bool(False), - useM3 = cms.bool(False) - ), - processQIE11 = cms.bool(False), - setNegativeFlagsQIE8 = cms.bool(False), - setNegativeFlagsQIE11 = cms.bool(False), - setNoiseFlagsQIE8 = cms.bool(True), - setNoiseFlagsQIE11 = cms.bool(False), - setPulseShapeFlagsQIE8 = cms.bool(False), - setPulseShapeFlagsQIE11 = cms.bool(False), - setLegacyFlagsQIE8 = cms.bool(False), - setLegacyFlagsQIE11 = cms.bool(False), -) - -hbherecoNoise.algorithm.firstSample = 0 -hbherecoNoise.algorithm.samplesToAdd = 4 import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi -hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -hfrecoNoise.firstSample = 0 -hfrecoNoise.samplesToAdd = 2 -hfrecoNoise.digiLabel = 'hcalDigiAlCaMB' -hfrecoNoise.tsFromDB = cms.bool(False) -hfrecoNoise.dropZSmarkedPassed = cms.bool(False) - hfrecoMBNZS.firstSample = 2 hfrecoMBNZS.samplesToAdd = 2 hfrecoMBNZS.digiLabel = 'hcalDigiAlCaMB' @@ -65,43 +25,36 @@ hfrecoMBNZS.dropZSmarkedPassed = cms.bool(False) import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi -horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() - -horecoNoise.firstSample = 0 -horecoNoise.samplesToAdd = 4 -horecoNoise.digiLabel = 'hcalDigiAlCaMB' -horecoNoise.tsFromDB = cms.bool(False) -horecoNoise.dropZSmarkedPassed = cms.bool(False) seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) import RecoLocalCalo.HcalRecProducers.hfprereco_cfi -hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( +hfprerecoMBNZS = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( digiLabel = cms.InputTag("hcalDigiAlaMB"), dropZSmarkedPassed = cms.bool(False), tsFromDB = cms.bool(False), - sumAllTimeSlices = cms.bool(False), - forceSOI = cms.int32(0) + sumAllTimeSlices = cms.bool(True), + forceSOI = cms.int32(1) ) -hfprerecoMBNZS = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( +hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( digiLabel = cms.InputTag("hcalDigiAlaMB"), dropZSmarkedPassed = cms.bool(False), tsFromDB = cms.bool(False), - sumAllTimeSlices = cms.bool(True), - forceSOI = cms.int32(1) + sumAllTimeSlices = cms.bool(False), + forceSOI = cms.int32(0) ) import RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi -_phase1_hfrecoNoise = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( - inputLabel = cms.InputTag("hfprerecoNoise"), +_phase1_hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoMBNZS"), setNoiseFlags = cms.bool(False), algorithm = dict( Class = cms.string("HFSimpleTimeCheck"), rejectAllFailures = cms.bool(False) ), ) -_phase1_hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( - inputLabel = cms.InputTag("hfprerecoMBNZS"), +_phase1_hfrecoNoise = RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi.hfreco.clone( + inputLabel = cms.InputTag("hfprerecoNoise"), setNoiseFlags = cms.bool(False), algorithm = dict( Class = cms.string("HFSimpleTimeCheck"), diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasNoise_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasNoise_cff.py new file mode 100644 index 0000000000000..eb70adaeb3bb9 --- /dev/null +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasNoise_cff.py @@ -0,0 +1,62 @@ +import FWCore.ParameterSet.Config as cms + +#------------------------------------------------ +#AlCaReco filtering for HCAL minbias: +#------------------------------------------------ + +import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi +hcalDigiAlCaMB = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone() + +hcalDigiAlCaMB.firstSample = 0 +hcalDigiAlCaMB.lastSample = 9 +hcalDigiAlCaMB.InputLabel = 'rawDataCollector' + +#add GT digi: +import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi +gtDigisAlCaMB = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone() + +gtDigisAlCaMB.DaqGtInputTag = 'source' + +import RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi +hbherecoNoise = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( + digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), + digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), + tsFromDB = cms.bool(False), + dropZSmarkedPassed = cms.bool(False), + algorithm = dict( + useM2 = cms.bool(False), + useM3 = cms.bool(False) + ), + processQIE11 = cms.bool(False), + setNegativeFlagsQIE8 = cms.bool(False), + setNegativeFlagsQIE11 = cms.bool(False), + setNoiseFlagsQIE8 = cms.bool(True), + setNoiseFlagsQIE11 = cms.bool(False), + setPulseShapeFlagsQIE8 = cms.bool(False), + setPulseShapeFlagsQIE11 = cms.bool(False), + setLegacyFlagsQIE8 = cms.bool(False), + setLegacyFlagsQIE11 = cms.bool(False), +) + +hbherecoNoise.algorithm.firstSample = 0 +hbherecoNoise.algorithm.samplesToAdd = 4 + +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi +horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() + +horecoNoise.firstSample = 0 +horecoNoise.samplesToAdd = 4 +horecoNoise.digiLabel = 'hcalDigiAlCaMB' +horecoNoise.tsFromDB = cms.bool(False) +horecoNoise.dropZSmarkedPassed = cms.bool(False) + +import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi +hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() + +hfrecoNoise.firstSample = 0 +hfrecoNoise.samplesToAdd = 2 +hfrecoNoise.digiLabel = 'hcalDigiAlCaMB' +hfrecoNoise.tsFromDB = cms.bool(False) +hfrecoNoise.dropZSmarkedPassed = cms.bool(False) + + diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py index d41a1f2117565..3e4dd7208373d 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py @@ -4,18 +4,7 @@ #AlCaReco filtering for HCAL minbias: #------------------------------------------------ -import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi -hcalDigiAlCaMB = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone() - -hcalDigiAlCaMB.firstSample = 0 -hcalDigiAlCaMB.lastSample = 9 -hcalDigiAlCaMB.InputLabel = 'rawDataCollector' - -#add GT digi: -import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi -gtDigisAlCaMB = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone() - -gtDigisAlCaMB.DaqGtInputTag = 'source' +from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBiasNoise_cff import * import HLTrigger.HLTfilters.hltHighLevel_cfi hcalminbiasHLT = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone( @@ -48,32 +37,8 @@ hbherecoMBNZS.algorithm.firstSample = 4 hbherecoMBNZS.algorithm.samplesToAdd = 4 -hbherecoNoise = RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi.hbheprereco.clone( - digiLabelQIE8 = cms.InputTag("hcalDigiAlCaMB"), - digiLabelQIE11 = cms.InputTag("hcalDigiAlCaMB"), - tsFromDB = cms.bool(False), - dropZSmarkedPassed = cms.bool(False), - algorithm = dict( - useM2 = cms.bool(False), - useM3 = cms.bool(False) - ), - processQIE11 = cms.bool(False), - setNegativeFlagsQIE8 = cms.bool(False), - setNegativeFlagsQIE11 = cms.bool(False), - setNoiseFlagsQIE8 = cms.bool(True), - setNoiseFlagsQIE11 = cms.bool(False), - setPulseShapeFlagsQIE8 = cms.bool(False), - setPulseShapeFlagsQIE11 = cms.bool(False), - setLegacyFlagsQIE8 = cms.bool(False), - setLegacyFlagsQIE11 = cms.bool(False), -) - -hbherecoNoise.algorithm.firstSample = 0 -hbherecoNoise.algorithm.samplesToAdd = 4 - import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi horecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() -horecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone() horecoMBNZS.firstSample = 4 horecoMBNZS.samplesToAdd = 4 @@ -81,15 +46,8 @@ horecoMBNZS.tsFromDB = cms.bool(False) horecoMBNZS.dropZSmarkedPassed = cms.bool(False) -horecoNoise.firstSample = 0 -horecoNoise.samplesToAdd = 4 -horecoNoise.digiLabel = 'hcalDigiAlCaMB' -horecoNoise.tsFromDB = cms.bool(False) -horecoNoise.dropZSmarkedPassed = cms.bool(False) - import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi hfrecoMBNZS = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() -hfrecoNoise = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone() hfrecoMBNZS.firstSample = 2 hfrecoMBNZS.samplesToAdd = 2 @@ -97,12 +55,6 @@ hfrecoMBNZS.tsFromDB = cms.bool(False) hfrecoMBNZS.dropZSmarkedPassed = cms.bool(False) -hfrecoNoise.firstSample = 0 -hfrecoNoise.samplesToAdd = 2 -hfrecoNoise.digiLabel = 'hcalDigiAlCaMB' -hfrecoNoise.tsFromDB = cms.bool(False) -hfrecoNoise.dropZSmarkedPassed = cms.bool(False) - seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) seqALCARECOHcalCalMinBiasNoHLT = cms.Sequence(hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)