Merge pull request #1 from kpedro88/update-HcalSeverityLevelComputer-…

…phase1 Fixes & reduce code duplication
PFCal-dev · Jun 27, 2017 · 234ee9c · 234ee9c
2 parents 34d2d6b + b711afe
commit 234ee9c
Showing 1 changed file with 15 additions and 49 deletions.
diff --git a/RecoLocalCalo/HcalRecAlgos/python/hcalRecAlgoESProd_cfi.py b/RecoLocalCalo/HcalRecAlgos/python/hcalRecAlgoESProd_cfi.py
@@ -27,7 +27,7 @@
 
 
 hcalRecAlgos = cms.ESProducer("HcalRecAlgoESProducer",
-    phase = cms.uint32(1), 
+    phase = cms.uint32(0),
     SeverityLevels = cms.VPSet(
         # the following is the default level, please do not modify its definition:
         cms.PSet( Level = cms.int32(0),
@@ -90,59 +90,25 @@
 
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 run2_HCAL_2017.toModify(hcalRecAlgos,
-    phase = cms.uint32(1), 
-    SeverityLevels = cms.VPSet(
-        # the following is the default level, please do not modify its definition:
-        cms.PSet( Level = cms.int32(0),
-                  RecHitFlags = cms.vstring(''),
-                  ChannelStatus = cms.vstring('')
-                ),
-        cms.PSet( Level = cms.int32(1),
-                  RecHitFlags = cms.vstring(''),
-                  ChannelStatus = cms.vstring('HcalCellCaloTowerProb')
-                ),
-        cms.PSet( Level = cms.int32(5),
-                  RecHitFlags = cms.vstring(''),
-        #          RecHitFlags = cms.vstring('HSCP_R1R2','HSCP_FracLeader','HSCP_OuterEnergy',
-        #                                    'HSCP_ExpFit','ADCSaturationBit', 'HBHEIsolatedNoise',
-        #                                    'AddedSimHcalNoise'),
-                  ChannelStatus = cms.vstring('HcalCellExcludeFromHBHENoiseSummary')
-                ),
-        cms.PSet( Level = cms.int32(8),
-                  RecHitFlags = cms.vstring('HBHEHpdHitMultiplicity',  
+    phase = cms.uint32(1),
+    SeverityLevels = {
+        2 : dict( RecHitFlags = cms.vstring('') ),
+        3 : dict( RecHitFlags = cms.vstring('HBHEHpdHitMultiplicity',  
                                             'HBHEFlatNoise', 
                                             'HBHESpikeNoise', 
                                             'HBHETriangleNoise',
                                             'HBHETS4TS5Noise', 
                                             'HBHENegativeNoise', 
                                             'HBHEOOTPU',
-                                            'HBHEPulseFitBit' 
-                                           ),
-                  ChannelStatus = cms.vstring('')
-                ),
-        cms.PSet( Level = cms.int32(11),
-                  RecHitFlags = cms.vstring('HFLongShort', 
-                                            # HFPET and HFS8S1Ratio feed HFLongShort, and should be at the same severity
-                                            'HFS8S1Ratio',  
-                                            'HFPET', 
-                                            'HFSignalAsymmetry',
-                                            'TimingFromTDC'
-                                            ),
-                  ChannelStatus = cms.vstring('')
-                ),
-        cms.PSet( Level = cms.int32(12),
-                  RecHitFlags = cms.vstring(''),
-                  ChannelStatus = cms.vstring('HcalCellCaloTowerMask')
-                ),
-        cms.PSet( Level = cms.int32(15),
-                  RecHitFlags = cms.vstring(''),
-                  ChannelStatus = cms.vstring('HcalCellHot')
-                ),
-        cms.PSet( Level = cms.int32(20),
-                  RecHitFlags = cms.vstring(''),
-                  ChannelStatus = cms.vstring('HcalCellOff', 'HcalCellDead')
+                                            'HBHEPulseFitBit'
                 )
-        ),
-    #RecoveredRecHitBits = cms.vstring('TimingAddedBit','TimingSubtractedBit'),
-    DropChannelStatusBits = cms.vstring('HcalCellMask','HcalCellOff', 'HcalCellDead')
+            ),
+        4: dict( RecHitFlags = cms.vstring('HFLongShort', 
+                                           'HFPET', 
+                                           'HFS8S1Ratio',  
+                                           'HFSignalAsymmetry',
+                                           'TimingFromTDC'
+                )
+            ),
+    },
 )