Changeset 37823 for branches/eam_branches/ipp-pv3-20140717-merge/ppTranslate/src/ppMopsRead.c

Timestamp:

Jan 12, 2015, 12:31:04 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-pv3-20140717-merge/ppTranslate/src/ppMopsRead.c (modified) (2 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/ppTranslate/src/ppMopsRead.c

@@ -105 +105 @@
     det->naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns
     det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows
+    det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
     psFree(header);
 
@@ -241 +242 @@
     long numGood = 0;               // Number of good rows
     for (long row = 0; row < size; row++) {
-      psU32 flags = flagsV->data.U32[row]; // psFitsTableGetU32(NULL, table, row, "FLAGS");
+      //psU32 flags = flagsV->data.U32[row]; // psFitsTableGetU32(NULL, table, row, "FLAGS");
+      psU64 flags = flagsV->data.U64[row]; // table reads in as U64 
       if (flags & SOURCE_MASK) {
-        psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of flags: %ud", row, i, flags);
+        psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of flags: %lud", row, i, flags);
         det->mask->data.U8[row] = 0xFF;
         continue;