Removing mutable keyword left behind and including a counter initiali…

…zation
cms-sw · Jul 11, 2019 · e37187c · e37187c
1 parent 90c62da
commit e37187c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/EventFilter/CTPPSRawToDigi/interface/CTPPSElectronicIndex.h b/EventFilter/CTPPSRawToDigi/interface/CTPPSElectronicIndex.h
@@ -2,7 +2,7 @@
 #define EventFilter_CTPPSRawToDigi_CTPPSElectronicIndex_H
 
 namespace ctppspixelobjects {
-  struct CTPPSElectronicIndex {
+  struct ElectronicIndex {
     int link;
     int roc;
     int dcol;

diff --git a/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h b/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h
@@ -40,8 +40,8 @@ class CTPPSTotemDataFormatter {
   typedef uint32_t Word32;
   typedef uint64_t Word64;
 
-  mutable int m_WordCounter;
-  mutable int m_DigiCounter;
+  int m_WordCounter;
+  int m_DigiCounter;
 
 public:
   typedef std::unordered_map<int, FEDRawData> RawData;

diff --git a/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc b/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc
@@ -194,15 +194,14 @@ void CTPPSPixelDataFormatter::formatRawData(unsigned int lvl1_ID,
                                             std::vector<PPSPixelIndex> iDdet2fed) {
   std::map<int, vector<Word32> > words;
   // translate digis into 32-bit raw words and store in map indexed by Fed
+  m_hasDetDigis = 0;
+  m_allDetDigis = 0;
   for (auto const& im : digis) {
     m_allDetDigis++;
     cms_uint32_t rawId = im.first;
 
-    m_hasDetDigis++;
     const DetDigis& detDigis = im.second;
     for (auto const& it : detDigis) {
-      m_DigiCounter++;
-
       int nroc = 999, nlink = 999;
       int rocPixelRow = -1, rocPixelColumn = -1, rocID = -1;
       int modulePixelColumn = it.column();
@@ -221,13 +220,14 @@ void CTPPSPixelDataFormatter::formatRawData(unsigned int lvl1_ID,
         nlink = iDdet2fed.at(i).fedch;
         nroc = iDdet2fed.at(i).rocch + 1;
 
-        CTPPSElectronicIndex cabling = {nlink, nroc, dcol, pxid};
+        ElectronicIndex cabling = {nlink, nroc, dcol, pxid};
 
         cms_uint32_t word = (cabling.link << m_LINK_shift) | (cabling.roc << m_ROC_shift) |
                             (cabling.dcol << m_DCOL_shift) | (cabling.pxid << m_PXID_shift) | (it.adc() << m_ADC_shift);
 
         words[iDdet2fed.at(i).fedid].push_back(word);
         m_WordCounter++;
+        m_hasDetDigis++;
 
       }  // range
     }    // for DetDigis