prescale column is an unsigned int - revert developer's change.

cms-sw · Jan 26, 2021 · 2d2109d · 2d2109d
1 parent 624f954
commit 2d2109d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/HLTrigger/HLTcore/src/HLTPrescaleProvider.cc b/HLTrigger/HLTcore/src/HLTPrescaleProvider.cc
@@ -90,7 +90,7 @@ int HLTPrescaleProvider::prescaleSet(const edm::Event& iEvent, const edm::EventS
   } else if (l1tType == 2) {
     checkL1TGlobalUtil();
     l1tGlobalUtil_->retrieveL1Event(iEvent, iSetup);
-    return static_cast<double>(l1tGlobalUtil_->prescaleColumn());
+    return static_cast<int>(l1tGlobalUtil_->prescaleColumn());
   } else {
     if (count_[0] < countMax) {
       count_[0] += 1;

diff --git a/L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h b/L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h
@@ -104,7 +104,7 @@ namespace l1t {
     // It is provided only until prescales and masks are available as CondFormats...
     // Most users should simply ignore this method and use the default ctor only!
     // Will look for prescale csv file in L1Trigger/L1TGlobal/data/Luminosity/startup/<filename>
-    void OverridePrescalesAndMasks(std::string filename, double psColumn = 1.);
+    void OverridePrescalesAndMasks(std::string filename, unsigned int psColumn = 1.);
 
     /// initialize the class (mainly reserve)
     void retrieveL1(const edm::Event& iEvent, const edm::EventSetup& evSetup);  // using helper
@@ -167,7 +167,7 @@ namespace l1t {
     inline const std::string& gtTriggerMenuComment() const { return m_l1GtMenu->getComment(); }
 
     // Prescale Column
-    inline double prescaleColumn() const { return m_PreScaleColumn; }
+    inline unsigned int prescaleColumn() const { return m_PreScaleColumn; }
     inline unsigned int numberOfPreScaleColumns() const { return m_numberOfPreScaleColumns; }
 
   private:
@@ -204,7 +204,7 @@ namespace l1t {
 
     //file  and container for prescale factors
     std::string m_preScaleFileName;
-    double m_PreScaleColumn;
+    unsigned int m_PreScaleColumn;
     unsigned int m_numberOfPreScaleColumns;
 
     std::vector<std::vector<double>> m_initialPrescaleFactorsAlgoTrig;

diff --git a/L1Trigger/L1TGlobal/src/L1TGlobalUtil.cc b/L1Trigger/L1TGlobal/src/L1TGlobalUtil.cc
@@ -57,7 +57,7 @@ l1t::L1TGlobalUtil::~L1TGlobalUtil() {
 /// check that the L1TGlobalUtil has been properly initialised
 bool l1t::L1TGlobalUtil::valid() const { return m_l1GtMenuCacheID != 0ULL and m_l1GtMenu != nullptr; }
 
-void l1t::L1TGlobalUtil::OverridePrescalesAndMasks(std::string filename, double psColumn) {
+void l1t::L1TGlobalUtil::OverridePrescalesAndMasks(std::string filename, unsigned int psColumn) {
   edm::FileInPath f1("L1Trigger/L1TGlobal/data/Luminosity/startup/" + filename);
   m_preScaleFileName = f1.fullPath();
   m_PreScaleColumn = psColumn;