Changeset 17226

Timestamp:

10/16/13 19:22:38 (11 years ago)

Author:

tbretz

Message:

SerDrsCalibration changed to vector... pointers are always a security risk; added SetDrsCalibration(DrsCalibration&)

File:

• trunk/Mars/mcore/factofits.h (modified) (2 diffs)

trunk/Mars/mcore/factofits.h

@@ -49 +49 @@
 
         //assign a given drs offset calibration
-        void SetDrsCalibration(const float* calib)
+        void SetDrsCalibration(const vector<float> &calib)
         {
             if (!IsOffsetCalibration())
                 fOffsetCalibration.resize(1440*1024);
 
-            for (uint32_t i=0;i<1440*1024;i++)
-                fOffsetCalibration[i] = (int16_t)(calib[i]*4096.f/2000.f);
+            for (uint32_t i=0; i<1440*1024; i++)
+                fOffsetCalibration[i] = (int16_t)(calib[i]*4096/2000);
         }
 
@@ -74 +74 @@
                 fOffsetCalibration.resize(1440*1024);
 
-            for (uint32_t i=0;i<1440*1024;i++)
+            for (uint32_t i=0; i<1440*1024; i++)
                 fOffsetCalibration[i] = vec[i];
+        }
+
+        void SetDrsCalibration(const DrsCalibration& drs)
+        {
+            if (drs.fNumOffset==0)
+                return;
+
+            if (!IsOffsetCalibration())
+                fOffsetCalibration.resize(1440*1024);
+
+            for (uint32_t i=0; i<1024*1440; i++)
+                fOffsetCalibration[i] = drs.fOffset[i]/drs.fNumOffset;
         }