Changeset 18142 for trunk/FACT++/src

Timestamp:

02/18/15 11:07:36 (10 years ago)

Author:

tbretz

Message:

Added some explicit conversions, a const qualifier and removed an obsolete conditional.

File:

• trunk/FACT++/src/ratescan.cc (modified) (3 diffs)

trunk/FACT++/src/ratescan.cc

@@ -79 +79 @@
     void UpdateProc()
     {
-        const array<uint32_t,3> v = {{ fThresholdMin, fThresholdMax, fThresholdStep }};
+        const array<uint32_t,3> v = {{ uint32_t(fThresholdMin), uint32_t(fThresholdMax), uint32_t(fThresholdStep) }};
         fDimProc.Update(v);
     }
@@ -237 +237 @@
         //    return kSM_FatalError;
 
-        string fType   = evt.Ptr<char>(12);
+        const string fType = evt.Ptr<char>(12);
 
         auto it = fTypes.find(fType);
@@ -251 +251 @@
             }
         }
-        //const config &conf = it->second;
-
-        if (it!=fTypes.end())
-        {
-            fCounterMax=it->second.fCounterMax;
-            fResolution=it->second.fResolution;
-        }
+
+        fCounterMax = it->second.fCounterMax;
+        fResolution = it->second.fResolution;
 
         fCommand = "FTM_CONTROL/"+command;