Index: trunk/Mars/mcore/DrsCalib.h
===================================================================
--- trunk/Mars/mcore/DrsCalib.h	(revision 17534)
+++ trunk/Mars/mcore/DrsCalib.h	(revision 17539)
@@ -20,5 +20,5 @@
 {
 protected:
-    uint64_t fNumEntries;
+    int64_t fNumEntries;
 
     size_t fNumSamples;
@@ -120,5 +120,5 @@
 
     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,6 +220,6 @@
     }*/
 
-    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,6 +297,6 @@
 
     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,7 +360,7 @@
 
     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,5 +849,5 @@
         {
             *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,5 +929,5 @@
     const std::vector<int64_t> &GetSum() const { return fSum; }
 
-    uint64_t GetNumEntries() const { return fNumEntries; }
+    int64_t GetNumEntries() const { return fNumEntries; }
 };
 
@@ -935,5 +935,5 @@
 {
 public:
-    uint64_t fNumEntries;
+    int64_t fNumEntries;
 
     size_t fNumSamples;
@@ -1209,7 +1209,7 @@
     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,7 +1315,7 @@
 
         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;