Fix naming convention in the HcalCalPedestal AlCaReco, and selecting …

…the correct output collections.

Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_Output_cff.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-# output block for alcastream HCAL Min Bias
+# output block for alcastream HCAL Pedestal
 # output module 
 #  module alcastreamHcalMinbiasOutput = PoolOutputModule
 
@@ -9,14 +9,10 @@
         SelectEvents = cms.vstring('pathALCARECOHcalCalPedestal')
     ),
     outputCommands = cms.untracked.vstring(
-	'keep *_gtDigisAlCaMB_*_*',
-        'keep HBHERecHitsSorted_hbherecoMB_*_*',
-        'keep HORecHitsSorted_horecoMB_*_*',
-        'keep HFRecHitsSorted_hfrecoMB_*_*',
-        'keep HFRecHitsSorted_hfrecoMBspecial_*_*',
-        'keep HBHERecHitsSorted_hbherecoNoise_*_*',
-        'keep HORecHitsSorted_horecoNoise_*_*',
-        'keep HFRecHitsSorted_hfrecoNoise_*_*')
+        'keep *_gtDigisAlCaPedestal_*_*',
+        'keep HBHERecHitsSorted_hbherecoPedestal_*_*',
+        'keep HORecHitsSorted_horecoPedestal_*_*',
+        'keep HFRecHitsSorted_hfrecoPedestal_*_*')
 )
 
 import copy

Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py

@@ -1,54 +1,52 @@
 import FWCore.ParameterSet.Config as cms
 
 #------------------------------------------------
-#AlCaReco filtering for HCAL minbias:
+#AlCaReco filtering for HCAL pedestal:
 #------------------------------------------------
-import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi
-hcalDigiAlCaPedestals = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone()
-hcalDigiAlCaPedestals.InputLabel = 'hltHcalCalibrationRaw'
-
-import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi
-hbherecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone()
 
-import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
-hfrecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone()
-
-import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
-horecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone()
+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 )
+    )
 
 #add GT digi:
 import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi
-gtDigisAlCaPedestals = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone()
+gtDigisAlCaPedestal = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone()
 
-hbherecoPedestals.firstSample = 0
-hbherecoPedestals.samplesToAdd = 4
-hbherecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi
+hcalDigiAlCaPedestal = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone()
+hcalDigiAlCaPedestal.InputLabel = cms.InputTag('hltHcalCalibrationRaw')
+
+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)
 
-hfrecoPedestals.firstSample = 0
-hfrecoPedestals.samplesToAdd = 2
-hfrecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+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)
 
-horecoPedestals.firstSample = 0
-horecoPedestals.samplesToAdd = 4
-horecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+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":
-hbherecoPedestals.dropZSmarkedPassed = cms.bool(False)
-hfrecoPedestals.dropZSmarkedPassed = cms.bool(False)
-horecoPedestals.dropZSmarkedPassed = cms.bool(False)
-
-hcalLocalRecoSequencePedestals = cms.Sequence(hbherecoPedestals*hfrecoPedestals*horecoPedestals) 
+hbherecoPedestal.dropZSmarkedPassed = cms.bool(False)
+hfrecoPedestal.dropZSmarkedPassed = cms.bool(False)
+horecoPedestal.dropZSmarkedPassed = cms.bool(False)
 
-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 )
-    )
+hcalLocalRecoSequencePedestal = cms.Sequence(hbherecoPedestal*hfrecoPedestal*horecoPedestal) 
 
 seqALCARECOHcalCalPedestal = cms.Sequence(hcalCalibPedestal*
-                                          hcalDigiAlCaPedestals*
-                                          gtDigisAlCaPedestals*
-                                          hcalLocalRecoSequencePedestals)
+                                          hcalDigiAlCaPedestal*
+                                          gtDigisAlCaPedestal*
+                                          hcalLocalRecoSequencePedestal)