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

…phase1 Add filldescriptions and remove warning
CmsHI · Jul 3, 2017 · 7f06d21 · 7f06d21
2 parents f1711c3 + ce952c0
commit 7f06d21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Configuration/StandardSequences/python/Reconstruction_Data_cff.py b/Configuration/StandardSequences/python/Reconstruction_Data_cff.py
@@ -18,7 +18,7 @@
 
 
 import RecoLocalCalo.HcalRecAlgos.RemoveAddSevLevel as HcalRemoveAddSevLevel
-HcalRemoveAddSevLevel.AddFlag(hcalRecAlgos,"HFDigiTime",11)
+HcalRemoveAddSevLevel.AddFlag(hcalRecAlgos,"HFDigiTime",11,verbose=False)
 HcalRemoveAddSevLevel.AddFlag(hcalRecAlgos,"HBHEFlatNoise",12)
 HcalRemoveAddSevLevel.AddFlag(hcalRecAlgos,"HBHENegativeNoise",12)
 

diff --git a/RecoLocalCalo/HcalRecAlgos/plugins/HcalRecAlgoESProducer.cc b/RecoLocalCalo/HcalRecAlgos/plugins/HcalRecAlgoESProducer.cc
@@ -42,6 +42,8 @@ class HcalRecAlgoESProducer : public edm::ESProducer {
 
       ~HcalRecAlgoESProducer();
 
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       typedef std::shared_ptr<HcalSeverityLevelComputer> ReturnType;
 
       ReturnType produce(const HcalSeverityLevelComputerRcd&);
@@ -94,5 +96,12 @@ HcalRecAlgoESProducer::produce(const HcalSeverityLevelComputerRcd& iRecord)
    return myComputer ;
 }
 
+void HcalRecAlgoESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.setAllowAnything();
+  desc.add<uint32_t>("phase",0);
+  descriptions.add("hcalRecAlgos",desc);
+}
+
 //define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(HcalRecAlgoESProducer);
diff --git a/RecoLocalCalo/HcalRecAlgos/python/RemoveAddSevLevel.py b/RecoLocalCalo/HcalRecAlgos/python/RemoveAddSevLevel.py
@@ -42,7 +42,7 @@ def PrintLevels(SLComp):
     return
 
 
-def AddFlag(sevLevelComputer,flag="UserDefinedBit0",severity=10):
+def AddFlag(sevLevelComputer,flag="UserDefinedBit0",severity=10,verbose=True):
     ''' Adds specified flag to severity level computer using specified severity level.
         If flag already exists at another severity level, it is removed from that level.
         '''
@@ -58,7 +58,7 @@ def AddFlag(sevLevelComputer,flag="UserDefinedBit0",severity=10):
             allowedflags.append(j)
 
     #print "Allowed flags = ",allowedflags
-    if flag not in allowedflags:
+    if flag not in allowedflags and verbose:
         print "\n\n"
         for j in range(0,3):
             print "###################################################"