Restore forceDefault functionality

tumer · Dec 3, 2013 · f2cb53f · f2cb53f
1 parent 01a3ef9
commit f2cb53f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/FWCore/PrescaleService/interface/PrescaleService.h b/FWCore/PrescaleService/interface/PrescaleService.h
@@ -52,6 +52,7 @@ namespace edm {
       //
       // member data
       //
+      const bool            forceDefault_;
       const VString_t       lvl1Labels_; 
       const unsigned int    lvl1Default_;
       const std::vector<ParameterSet> vpsetPrescales_;

diff --git a/FWCore/PrescaleService/src/PrescaleService.cc b/FWCore/PrescaleService/src/PrescaleService.cc
@@ -23,7 +23,8 @@ namespace edm {
 
     // constructor
     PrescaleService::PrescaleService(ParameterSet const& iPS,ActivityRegistry& iReg)
-      : lvl1Labels_(iPS.getParameter<std::vector<std::string> >("lvl1Labels"))
+      : forceDefault_(iPS.getParameter<bool>("forceDefault"))
+      , lvl1Labels_(iPS.getParameter<std::vector<std::string> >("lvl1Labels"))
       , lvl1Default_(findDefaultIndex(iPS.getParameter<std::string>("lvl1DefaultLabel"), lvl1Labels_))
       , vpsetPrescales_(iPS.getParameterSetVector("prescaleTable"))
       , prescaleTable_()
@@ -133,6 +134,8 @@ namespace edm {
     // const method
     unsigned int PrescaleService::getPrescale(unsigned int lvl1Index, std::string const& prescaledPath) const
     {
+      if (forceDefault_) lvl1Index = lvl1Default_;
+
       if (lvl1Index >= lvl1Labels_.size()) {
         throw cms::Exception("InvalidLvl1Index")
           << "lvl1Index '" << lvl1Index << "' exceeds number of prescale columns " << lvl1Labels_.size() << "!";