Changeset 16428 for trunk/Mars

Timestamp:

05/29/13 14:04:26 (12 years ago)

Author:

tbretz

Message:

Added copy cnstructor to DrsCalibration; allow CorrectStep to be called without a map... I hope the compiler will realize and remove the conditional from the loops

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (9 diffs)

trunk/Mars/mcore/DrsCalib.h

@@ -220 +220 @@
     }
 
-    static double FindStep(const size_t ch0, const float *vec, int16_t roi, const int16_t pos, const uint16_t *map)
+    static double FindStep(const size_t ch0, const float *vec, int16_t roi, const int16_t pos, const uint16_t *map=NULL)
     {
         // We have about 1% of all cases which are not ahndled here,
@@ -237 +237 @@
         {
             const size_t hw = ch0+p;
-            const size_t sw = map[hw]*roi + pos;
+            const size_t sw = (map?map[hw]:hw)*roi + pos;
 
             const double diff = vec[sw]-vec[sw-1];
@@ -250 +250 @@
     }
 
-    static void SubtractStep(const size_t ch0, const double avg, float *vec, int16_t roi, int32_t pos, const uint16_t *map)
+    static void SubtractStep(const size_t ch0, const double avg, float *vec, int16_t roi, int32_t pos, const uint16_t *map=NULL)
     {
         if (pos==0 || pos>=roi)
@@ -265 +265 @@
             {
                 const size_t hw = ch0+p;
-                const size_t sw = map[hw]*roi + j;
+                const size_t sw = (map?map[hw]:hw)*roi + j;
 
                 vec[sw] -= sub;
@@ -307 +307 @@
     static Step CorrectStep(float *vec, uint16_t nch, uint16_t roi,
                             const int16_t *prev, const int16_t *start,
-                            const int16_t offset, const uint16_t *map)
+                            const int16_t offset, const uint16_t *map=NULL)
     {
 
         std::vector<Step> list;
+        list.reserve(nch);
 
         // Fill steps into array
@@ -331 +332 @@
         }
 
-        if (list.size()==0)
+        if (list.empty())
             return Step();
 
@@ -522 +523 @@
     static void SlidingAverage(float *const vec, const uint32_t roi, const uint16_t w)
     {
-        if (w==0)
-            return;
-
-        if (w>roi)
+        if (w==0 || w>roi)
             return;
 
@@ -954 +952 @@
 
     DrsCalibration() :
-        fOffset  (1440*1024, 0),
-        fGain    (1440*1024, 4096),
-        fTrgOff  (1600*1024, 0),
+        fOffset(1440*1024, 0),
+        fGain(1440*1024, 4096),
+        fTrgOff (1600*1024, 0),
         fNumOffset(1),
         fNumGain(2000),
@@ -969 +967 @@
             fDateRunEnd[i] = "1970-01-01T00:00:00";
         }
+    }
+
+    DrsCalibration(const DrsCalibration &cpy) :
+        fOffset(cpy.fOffset),
+        fGain(cpy.fGain),
+        fTrgOff(cpy.fTrgOff),
+        fNumOffset(cpy.fNumOffset),
+        fNumGain(cpy.fNumGain),
+        fNumTrgOff(cpy.fNumTrgOff),
+        fStep(cpy.fStep),
+        fRoi(cpy.fRoi),
+        fNumTm(cpy.fNumTm),
+        fDateObs(cpy.fDateObs),
+        fDateRunBeg(cpy.fDateRunBeg),
+        fDateRunEnd(cpy.fDateRunEnd),
+        fDateEnd(cpy.fDateEnd)
+    {
     }