diff --git a/Configuration/StandardSequences/python/Reconstruction_Data_cff.py b/Configuration/StandardSequences/python/Reconstruction_Data_cff.py index 8824f6c45df2d..a3a2edd6b84c4 100644 --- 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 index 9a01a12f4ff45..3f78d176affd0 100644 --- 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 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("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 index 1b29b373d7aca..00b19cf76a278 100644 --- 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 "###################################################"