Merge pull request #29819 from jeongeun/evtcontentCosmic11X

Update event content structure for cosmic in RecoLocalCalo
cms-sw · May 13, 2020 · b928772 · b928772
2 parents 92bec1a + bb3d30c
commit b928772
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 58 deletions.
diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContentCosmics_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContentCosmics_cff.py
@@ -4,46 +4,40 @@
 #
 # start with HCAL part
 #
-#FEVT
-RecoLocalCaloFEVT = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_hbhereco_*_*',
-                                           'keep *_hbheprereco_*_*', 
-                                           'keep *_hfprereco_*_*', 
-                                           'keep *_hfreco_*_*', 
-                                           'keep *_horeco_*_*',
-                                           'keep HBHERecHitsSorted_hbherecoMB_*_*',
-                                           'keep HBHERecHitsSorted_hbheprerecoMB_*_*',
-                                           'keep HORecHitsSorted_horecoMB_*_*',
-                                           'keep HFRecHitsSorted_hfrecoMB_*_*',
-                                           'keep ZDCDataFramesSorted_*Digis_*_*',
-                                           'keep ZDCRecHitsSorted_*_*_*',
-                                           'keep HcalUnpackerReport_*_*_*'
-        )
-)
-#RECO content
-RecoLocalCaloRECO = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_hbhereco_*_*', 
-                                           'keep *_hfprereco_*_*', 
-                                           'keep *_hfreco_*_*', 
-                                           'keep *_horeco_*_*',
-                                           'keep HBHERecHitsSorted_hbherecoMB_*_*',
-                                           'keep HORecHitsSorted_horecoMB_*_*',
-                                           'keep HFRecHitsSorted_hfrecoMB_*_*',
-                                           #'keep ZDCDataFramesSorted_*Digis_*_*',
-                                           'keep ZDCDataFramesSorted_hcalDigis_*_*',
-                                           'keep ZDCDataFramesSorted_castorDigis_*_*',
-                                           'keep ZDCDataFramesSorted_simHcalUnsuppressedDigis_*_*',
-                                           'keep ZDCRecHitsSorted_zdcreco_*_*',
-                                           #'keep HcalUnpackerReport_*_*_*'
-                                           'keep HcalUnpackerReport_castorDigis_*_*',
-                                           'keep HcalUnpackerReport_hcalDigis_*_*'
-        )
-)
 #AOD content
 RecoLocalCaloAOD = cms.PSet(
     outputCommands = cms.untracked.vstring()
 )
-RecoLocalCaloFEVT.outputCommands.extend(ecalLocalRecoFEVT.outputCommands)
-RecoLocalCaloRECO.outputCommands.extend(ecalLocalRecoRECO.outputCommands)
 RecoLocalCaloAOD.outputCommands.extend(ecalLocalRecoAOD.outputCommands)
 
+#RECO content
+RecoLocalCaloRECO = cms.PSet(
+    outputCommands = cms.untracked.vstring(
+	'keep *_hbhereco_*_*', 
+	'keep *_hfprereco_*_*', 
+	'keep *_hfreco_*_*', 
+	'keep *_horeco_*_*',
+	'keep HBHERecHitsSorted_hbherecoMB_*_*',
+	'keep HORecHitsSorted_horecoMB_*_*',
+	'keep HFRecHitsSorted_hfrecoMB_*_*',
+	'keep ZDCDataFramesSorted_hcalDigis_*_*',
+	'keep ZDCDataFramesSorted_castorDigis_*_*',
+	'keep ZDCDataFramesSorted_simHcalUnsuppressedDigis_*_*',
+	'keep ZDCRecHitsSorted_zdcreco_*_*',
+	'keep HcalUnpackerReport_castorDigis_*_*',
+	'keep HcalUnpackerReport_hcalDigis_*_*')
+)
+RecoLocalCaloRECO.outputCommands.extend(RecoLocalCaloAOD.outputCommands)
+RecoLocalCaloRECO.outputCommands.extend(ecalLocalRecoRECO.outputCommands)
+
+#FEVT content
+RecoLocalCaloFEVT = cms.PSet(
+    outputCommands = cms.untracked.vstring(
+	'keep *_hbheprereco_*_*', 
+	'keep HBHERecHitsSorted_hbheprerecoMB_*_*',
+	'keep ZDCDataFramesSorted_*Digis_*_*',
+	'keep ZDCRecHitsSorted_*_*_*',
+	'keep HcalUnpackerReport_*_*_*')
+)
+RecoLocalCaloFEVT.outputCommands.extend(RecoLocalCaloRECO.outputCommands)
+RecoLocalCaloFEVT.outputCommands.extend(ecalLocalRecoFEVT.outputCommands)
diff --git a/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContentCosmics_cff.py b/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContentCosmics_cff.py
@@ -1,34 +1,28 @@
 import FWCore.ParameterSet.Config as cms
 
-# Full Event content 
-# .. EB + EE uncalibrated recHits
-# .. calibrated RecHits
-ecalLocalRecoFEVT = cms.PSet(
-    outputCommands = cms.untracked.vstring(
-        'keep *_ecalWeightUncalibRecHit_*_*', 
-        'keep *_ecalFixedAlphaBetaFitUncalibRecHit_*_*', 
-        'keep *_ecalPreshowerRecHit_*_*', 
-        'keep *_ecalRecHit_*_*',
-        'keep ESDataFramesSorted_ecalPreshowerDigis_*_*',
-        'keep EBSrFlagsSorted_ecalDigis__*',
-        'keep EESrFlagsSorted_ecalDigis__*'
-        )
+# AOD content
+ecalLocalRecoAOD = cms.PSet(
+    outputCommands = cms.untracked.vstring()
 )
 # RECO content
 # .. calibrated RecHits
 ecalLocalRecoRECO = cms.PSet(
     outputCommands = cms.untracked.vstring(
-        'keep *_ecalPreshowerRecHit_*_*', 
+        'keep *_ecalPreshowerRecHit_*_*',
         'keep *_ecalRecHit_*_*',
         'keep *_ecalCompactTrigPrim_*_*',
         'keep ESDataFramesSorted_ecalPreshowerDigis_*_*',
         'keep EBSrFlagsSorted_ecalDigis__*',
-        'keep EESrFlagsSorted_ecalDigis__*'
-        )
-)
-# AOD content
-# .. nothing
-ecalLocalRecoAOD = cms.PSet(
-    outputCommands = cms.untracked.vstring()
+        'keep EESrFlagsSorted_ecalDigis__*')
 )
+ecalLocalRecoRECO.outputCommands.extend(ecalLocalRecoAOD.outputCommands)
 
+# Full Event content 
+# .. EB + EE uncalibrated recHits
+# .. calibrated RecHits
+ecalLocalRecoFEVT = cms.PSet(
+    outputCommands = cms.untracked.vstring(
+        'keep *_ecalWeightUncalibRecHit_*_*', 
+        'keep *_ecalFixedAlphaBetaFitUncalibRecHit_*_*')
+)
+ecalLocalRecoFEVT.outputCommands.extend(ecalLocalRecoRECO.outputCommands)