Changeset 16939

Timestamp:

06/28/13 11:57:18 (11 years ago)

Author:

lyard

Message:

got rid of over 1024 start cell values by adding modulo

File:

• trunk/Mars/mcore/factfits.h (modified) (3 diffs)

trunk/Mars/mcore/factfits.h

@@ -62 +62 @@
          {
              if (*startCell < 0)
+             {
+                 data += fNumRoi;
                  continue;
-
+             }
              for (uint32_t j=0; j<fNumRoi; j++, data++)
                  *data += fOffsetCalibration[i + (*startCell+j)%1024];
@@ -79 +81 @@
              }
 
+             const int16_t modStart = startCell[ch] % 1024;
              const int16_t *off = fOffsetCalibration.data() + ch*1024;
 
-             const int16_t *cal = off+startCell[ch];
+             const int16_t *cal = off+modStart;
              const int16_t *end = data+fNumRoi;
 
-             if (startCell[ch]+fNumRoi>1024)
+             if (modStart+fNumRoi>1024)
              {
                  while (cal<off+1024)
@@ -94 +97 @@
                  *data++ += *cal++;
          }
-    }
+
+}
 
     bool init()