Changeset 16502 for trunk

Timestamp:

05/30/13 15:59:22 (11 years ago)

Author:

lyard

Message:

fixed bug with negative start cell

Location:

trunk

Files:

• FACT++/src/fitsCompressor.cc (modified) (3 diffs)
• Mars/mcore/factfits.h (modified) (1 diff)

trunk/FACT++/src/fitsCompressor.cc

@@ -736 +736 @@
     header.push_back(HeaderEntry("CHECKSUM", "'0000000000000000'  ", "Checksum for the whole HDU"));
     header.push_back(HeaderEntry("DATASUM" ,  "         0"         , "Checksum for the data block"));
-    header.push_back(HeaderEntry("EXTNAME" , "'ZDrsCellOffsets'   ", "name of this binary table extension"));
+    header.push_back(HeaderEntry("EXTNAME" , "'ZDrsCellOffsets'    ", "name of this binary table extension"));
     header.push_back(HeaderEntry("TTYPE1"  , "'OffsetCalibration' ", "label for field   1"));
     header.push_back(HeaderEntry("TFORM1"  , "'1474560I'          ", "data format of field: 2-byte INTEGER"));
@@ -1738 +1738 @@
             {
                 const int thisStartCell = reinterpret_cast<int16_t*>(&buffer[startCellOffset])[j];
-                if (thisStartCell > -1)
+                if (thisStartCell < 0) continue;
                 for (int k=0;k<numSlices;k++)
                     reinterpret_cast<int16_t*>(&buffer[dataOffset])[numSlices*j + k] -= drsCalib16[1024*j + (thisStartCell+k)%1024];
@@ -1858 +1858 @@
     if (tableName == "")
     {
-        cout << "Error: table name could not be found. Aborting" << endl;
+        cout << "Error: table name from file " << fileNameOut << " could not be found. Aborting" << endl;
         return -1;
     }

trunk/Mars/mcore/factfits.h

@@ -60 +60 @@
          for (uint32_t i=0; i<1440*1024; i+=1024, startCell++)
          {
-             if ((*startCell) > -1)
              for (uint32_t j=0; j<fNumRoi; j++, data++)
+             {
+                 if ((*startCell) < 0) continue;
                  *data += fOffsetCalibration[i + (*startCell+j)%1024];
+             }
          }
     }