Merge pull request #19033 from bsunanda/Run2-hcx127

Run2-hcx127 Correct the output cff sepecification for 2 minimum bias paths
cms-sw · Jun 6, 2017 · 769f96a · 769f96a
2 parents d5432f4 + 97bdf07
commit 769f96a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_Output_cff.py
@@ -13,7 +13,7 @@
         'keep HBHERecHitsSorted_hbhereco_*_*',
         'keep HORecHitsSorted_horeco_*_*',
         'keep HFRecHitsSorted_hfreco_*_*',
-        'keep HFRecHitsSorted_hfrecoMBspecial_*_*',
+        'keep HFRecHitsSorted_hfrecoMBNZS_*_*',
         'keep HBHERecHitsSorted_hbherecoNoise_*_*',
         'keep HORecHitsSorted_horecoNoise_*_*',
         'keep HFRecHitsSorted_hfrecoNoise_*_*')

diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBiasHI_cff.py
@@ -26,7 +26,8 @@
 
 import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi
 
-seqALCARECOHcalCalMinBias = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)
+seqALCARECOHcalCalMinBiasDigi = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB)
+seqALCARECOHcalCalMinBias = cms.Sequence(hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)
 
 import RecoLocalCalo.HcalRecProducers.hfprereco_cfi
 hfprerecoMBNZS = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone(

diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py
@@ -10,10 +10,9 @@
     ),
     outputCommands = cms.untracked.vstring(
 	'keep *_gtDigisAlCaMB_*_*',
-        'keep HBHERecHitsSorted_hbherecoMB_*_*',
-        'keep HORecHitsSorted_horecoMB_*_*',
-        'keep HFRecHitsSorted_hfrecoMB_*_*',
-        'keep HFRecHitsSorted_hfrecoMBspecial_*_*',
+        'keep HBHERecHitsSorted_hbherecoMBNZS_*_*',
+        'keep HORecHitsSorted_horecoMBNZS_*_*',
+        'keep HFRecHitsSorted_hfrecoMBNZS_*_*',
         'keep HBHERecHitsSorted_hbherecoNoise_*_*',
         'keep HORecHitsSorted_horecoNoise_*_*',
         'keep HFRecHitsSorted_hfrecoNoise_*_*')

diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py
@@ -55,8 +55,10 @@
 hfrecoMBNZS.tsFromDB = cms.bool(False)
 hfrecoMBNZS.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)
+seqALCARECOHcalCalMinBiasDigi = cms.Sequence(hcalminbiasHLT*hcalDigiAlCaMB*gtDigisAlCaMB)
+seqALCARECOHcalCalMinBiasDigiNoHLT = cms.Sequence(hcalDigiAlCaMB*gtDigisAlCaMB)
+
+seqALCARECOHcalCalMinBias = cms.Sequence(hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)
 
 import RecoLocalCalo.HcalRecProducers.hfprereco_cfi
 hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone(

diff --git a/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py b/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py
@@ -51,7 +51,7 @@
 
 from DQMOffline.Configuration.AlCaRecoDQMHI_cff import *
 
-pathALCARECOHcalCalMinBias = cms.Path(seqALCARECOHcalCalMinBias*ALCARECOHcalCalPhisymDQM)
+pathALCARECOHcalCalMinBias = cms.Path(seqALCARECOHcalCalMinBiasDigi*seqALCARECOHcalCalMinBias*ALCARECOHcalCalPhisymDQM)
 
 from Configuration.EventContent.AlCaRecoOutput_cff import *
 

diff --git a/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py b/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py
@@ -44,7 +44,7 @@
 # HCAL calibration with min.bias
 from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBias_cff import *
 
-pathALCARECOHcalCalMinBias = cms.Path(seqALCARECOHcalCalMinBias*ALCARECOHcalCalPhisymDQM)
+pathALCARECOHcalCalMinBias = cms.Path(seqALCARECOHcalCalMinBiasDigi*seqALCARECOHcalCalMinBias*ALCARECOHcalCalPhisymDQM)
 
 from Configuration.EventContent.AlCaRecoOutput_cff import *