Fixing ALCARECOHcalCalPedestals

mmusich · Jul 8, 2015 · 54cfd3a · 54cfd3a
1 parent 05d53c5
commit 54cfd3a
Showing 1 changed file with 44 additions and 22 deletions.
diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py
@@ -3,33 +3,55 @@
 #------------------------------------------------
 #AlCaReco filtering for HCAL minbias:
 #------------------------------------------------
+import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi
+hcalDigiAlCaPedestals = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone()
+hcalDigiAlCaPedestals.InputLabel = 'hltHcalCalibrationRaw'
 
-from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBias_cff import *
-hcalDigiAlCaMB.InputLabel = 'hltHcalCalibrationRaw'
-#from EventFilter.HcalRawToDigi.HcalRawToDigi_cfi import *
-#hcalDigis.InputLabel = 'hltHcalCalibrationRaw'
-from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi
+hbherecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone()
 
-hbherecoMB.firstSample = 0
-hbherecoMB.samplesToAdd = 4
-hbherecoMB.digiLabel = 'hcalDigiAlCaMB'
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
+hfrecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone()
 
-hfrecoMB.firstSample = 0
-hfrecoMB.samplesToAdd = 2
-hfrecoMB.digiLabel = 'hcalDigiAlCaMB'
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
+horecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone()
 
-horecoMB.firstSample = 0
-horecoMB.samplesToAdd = 4
-horecoMB.digiLabel = 'hcalDigiAlCaMB'
+#add GT digi:
+import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi
+gtDigisAlCaPedestals = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone()
 
+hbherecoPedestals.firstSample = 0
+hbherecoPedestals.samplesToAdd = 4
+hbherecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+hfrecoPedestals.firstSample = 0
+hfrecoPedestals.samplesToAdd = 2
+hfrecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+horecoPedestals.firstSample = 0
+horecoPedestals.samplesToAdd = 4
+horecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+# switch off "Hcal ZS in reco":
+hbherecoPedestals.dropZSmarkedPassed = cms.bool(False)
+hfrecoPedestals.dropZSmarkedPassed = cms.bool(False)
+horecoPedestals.dropZSmarkedPassed = cms.bool(False)
+
+hcalLocalRecoSequencePedestals = cms.Sequence(hbherecoPedestals*hfrecoPedestals*horecoPedestals) 
 
 import EventFilter.HcalRawToDigi.HcalCalibTypeFilter_cfi
 hcalCalibPedestal = EventFilter.HcalRawToDigi.HcalCalibTypeFilter_cfi.hcalCalibTypeFilter.clone(
-#  InputLabel = cms.string('rawDataCollector'), 
-  InputLabel = cms.string('hltHcalCalibrationRaw::HLT'),
-#  InputLabel = cms.InputTag("hltEcalCalibrationRaw","","HLT"),
-  CalibTypes    = cms.vint32( 1 ),
-  FilterSummary = cms.untracked.bool( False )
-)
-
-seqALCARECOHcalCalPedestal = cms.Sequence(hcalCalibPedestal*hcalDigiAlCaMB*gtDigisAlCaMB*hcalLocalRecoSequenceNZS*hbherecoNoise*hfrecoNoise*horecoNoise)
+    #  InputLabel = cms.string('rawDataCollector'), 
+    InputLabel = cms.string('hltHcalCalibrationRaw::HLT'),
+    #  InputLabel = cms.InputTag("hltEcalCalibrationRaw","","HLT"),
+    CalibTypes    = cms.vint32( 1 ),
+    FilterSummary = cms.untracked.bool( False )
+    )
+
+seqALCARECOHcalCalPedestal = cms.Sequence(hcalCalibPedestal*
+                                          hcalDigiAlCaPedestals*
+                                          gtDigisAlCaPedestals*
+                                          hcalLocalRecoSequencePedestals*
+                                          hbherecoPedestals*
+                                          hfrecoPedestals*
+                                          horecoPedestals)