Changeset 17539 for trunk/Mars/mcore

Timestamp:

02/05/14 10:44:43 (11 years ago)

Author:

lyard

Message:

moved uint64 to int64 in DrsCalibration member variables

File:

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

trunk/Mars/mcore/DrsCalib.h

@@ -20 +20 @@
 {
 protected:
-    uint64_t fNumEntries;
+    int64_t fNumEntries;
 
     size_t fNumSamples;
@@ -120 +120 @@
 
     void AddRel(const int16_t *val,    const int16_t *start,
-                const int32_t *offset, const uint32_t scale)
+                const int32_t *offset, const int64_t scale)
     {
         /*
@@ -220 +220 @@
     }*/
 
-    void AddAbs(const int16_t *val,    const  int16_t *start,
-                const int32_t *offset, const uint32_t scale)
+    void AddAbs(const int16_t *val,    const int16_t *start,
+                const int32_t *offset, const int64_t scale)
     {
         /*
@@ -297 +297 @@
 
     static void ApplyCh(float *vec, const int16_t *val, int16_t start, uint32_t roi,
-                        const int32_t *offset, const uint32_t scaleabs,
-                        const int64_t *gain,   const uint64_t scalegain)
+                        const int32_t *offset, const int64_t scaleabs,
+                        const int64_t *gain,   const int64_t scalegain)
     {
         if (start<0)
@@ -360 +360 @@
 
     static void ApplyCh(float *vec, const int16_t *val, int16_t start, uint32_t roi,
-                        const int32_t *offset, const uint32_t scaleabs,
-                        const int64_t *gain,   const uint64_t scalegain,
-                        const int64_t *trgoff, const uint64_t scalerel)
+                        const int32_t *offset, const int64_t scaleabs,
+                        const int64_t *gain,   const int64_t scalegain,
+                        const int64_t *trgoff, const int64_t scalerel)
     {
         if (start<0)
@@ -849 +849 @@
         {
             *ptr      = scale*double(*it)/fNumEntries;
-            *(ptr+sz) = scale*sqrt(double(*i2*int64_t(fNumEntries) - *it * *it))/fNumEntries;
+            *(ptr+sz) = scale*sqrt(double(*i2*fNumEntries - *it * *it))/fNumEntries;
 
             ptr++;
@@ -929 +929 @@
     const std::vector<int64_t> &GetSum() const { return fSum; }
 
-    uint64_t GetNumEntries() const { return fNumEntries; }
+    int64_t GetNumEntries() const { return fNumEntries; }
 };
 
@@ -935 +935 @@
 {
 public:
-    uint64_t fNumEntries;
+    int64_t fNumEntries;
 
     size_t fNumSamples;
@@ -1209 +1209 @@
     std::vector<int64_t> fTrgOff;
 
-    uint64_t fNumOffset;
-    uint64_t fNumGain;
-    uint64_t fNumTrgOff;
+    int64_t fNumOffset;
+    int64_t fNumGain;
+    int64_t fNumTrgOff;
 
     uint32_t fStep;
@@ -1315 +1315 @@
 
         fStep      = file.GetUInt("STEP");
-        fNumOffset = file.GetUInt("NBOFFSET");
-        fNumGain   = file.GetUInt("NBGAIN");
-        fNumTrgOff = file.GetUInt("NBTRGOFF");
+        fNumOffset = file.GetInt("NBOFFSET");
+        fNumGain   = file.GetInt("NBGAIN");
+        fNumTrgOff = file.GetInt("NBTRGOFF");
         fRoi       = file.GetUInt("NROI");
         fNumTm     = file.HasKey("NTM") ? file.GetUInt("NTM") : 0;