Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/magic/remove/src/streaksio.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• magic/remove/src/streaksio.c (modified) (11 diffs)

branches/cnb_branches/cnb_branch_20090301/magic/remove/src/streaksio.c

@@ -6 +6 @@
 static void streakFilesFree(streakFiles *sf);
 static void freeImages(streakFiles *);
+static void setExciseValue(sFile *in);
 
 static nebServer *ourNebServer = NULL;
@@ -12 +13 @@
 // if remove is true the calling program is streaksremove and the recovery files are outputs
 // if false the recovery files are inputs
-streakFiles *openFiles(pmConfig *config, bool remove)
+streakFiles *openFiles(pmConfig *config, bool remove, char *program_name)
 {
     bool status;
@@ -20 +21 @@
 
     sf->config = config;
+    sf->program_name = basename(program_name);
 
     // error checking is done by sFileOpen. If a file can't be opened we just exit
@@ -471 +473 @@
     sf->inImage->numCols = readout->image->numCols;
     sf->inImage->numRows = readout->image->numRows;
+    setExciseValue(sf->inImage);
 }
 
@@ -545 +548 @@
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
-        if (in->image->type.type == PS_TYPE_U16) {
-            in->exciseValue = 65535;
-            psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 65535);
-            psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 65535);
-        } else {
-            in->exciseValue = NAN;
-        }
+        setExciseValue(in);
     }  else {
         if (stage != IPP_STAGE_RAW) {
@@ -613 +610 @@
 
 #ifdef STREAKS_COMPRESS_OUTPUT
+    // Paul says that I should be able to leave this blank
+    bitpix = 0;
     setFitsOptions(out, bitpix, bscale, bzero);
     setFitsOptions(rec, bitpix, bscale, bzero);
@@ -916 +915 @@
 deleteFile(sFile *sfile)
 {
-
     if (sfile->inNebulous) {
         nebServer *server = getNebServer(NULL);
@@ -970 +968 @@
 
 void
-setMaskedToNAN(streakFiles *sfiles, psU8 maskMask, bool printCounts)
+setMaskedToNAN(streakFiles *sfiles, psU32 maskMask, bool printCounts)
 {
         int maskedPixels = 0;
@@ -993 +991 @@
                 // but I want to get the counts
                 double imageVal  = psImageGet(image, x, y);
-                psU8 maskVal;
+                psU32 maskVal;
                 if (sfiles->stage == IPP_STAGE_RAW) {
                     int xChip, yChip;
@@ -1018 +1016 @@
         }
         if (printCounts) {
-            printf("time to NAN mask pixels: %f\n", psTimerClear("NAN_MASKED"));
+            psLogMsg(sfiles->program_name, PS_LOG_INFO, "time to NAN mask pixels: %f\n", psTimerClear("NAN_MASKED"));
             int totalPixels = image->numRows * image->numCols;
-            printf("pixels:        %10ld\n", totalPixels);
-            printf("masked pixels: %10ld %4.2f%%\n", maskedPixels, 100. * maskedPixels / totalPixels);
-            printf("nand pixels:   %10ld %4.2f%%\n", nandPixels, 100. * nandPixels / totalPixels);
+            psLogMsg(sfiles->program_name, PS_LOG_INFO, "pixels:        %10ld\n", totalPixels);
+            psLogMsg(sfiles->program_name, PS_LOG_INFO, "masked pixels: %10ld %4.2f%%\n", maskedPixels, 100. * maskedPixels / totalPixels);
+            psLogMsg(sfiles->program_name, PS_LOG_INFO, "nand pixels:   %10ld %4.2f%%\n", nandPixels, 100. * nandPixels / totalPixels);
             if (weight) {
-                printf("nand weights:  %10ld %4.2f%%\n", nandWeights, 100. * nandWeights / totalPixels);
+                psLogMsg(sfiles->program_name, PS_LOG_INFO, "nand weights:  %10ld %4.2f%%\n", nandWeights, 100. * nandWeights / totalPixels);
             }
         }
@@ -1035 +1033 @@
     ourNebServer = NULL;
 }
+static void
+setExciseValue(sFile *in)
+{
+    if (in->image->type.type == PS_TYPE_U16) {
+        in->exciseValue = 65535;
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 65535);
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 65535);
+    } else {
+        in->exciseValue = NAN;
+    }
+}
+
+void
+strkGetMaskValues(streakFiles *sfiles, psU32 *maskStreak, psU32 *maskMask)
+{
+    if (sfiles->inMask && sfiles->inMask->header) {
+        if (!pmConfigMaskReadHeader(sfiles->config, sfiles->inMask->header)) {
+            streaksExit("failed to read mask values from file", PS_EXIT_CONFIG_ERROR);
+        }
+    }
+
+    bool status;
+    psMetadata *masks = psMetadataLookupMetadata(&status, sfiles->config->recipes, "MASKS");
+    if (!status) {
+        psError(PM_ERR_CONFIG, false, "failed to lookup MASKS in recipes\n");
+        streaksExit("", PS_EXIT_CONFIG_ERROR);
+    }
+    *maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
+    if (!status) {
+        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for STREAK in recipes\n");
+        streaksExit("", PS_EXIT_CONFIG_ERROR);
+    }
+
+    // optionally setting pixels with any mask bits execpt CONV.POOR to NAN
+    // check old name first
+    psU32 convPoor = (double) psMetadataLookupU32(&status, masks, "POOR.WARP");
+    if (!status) {
+        convPoor = (double) psMetadataLookupU32(&status, masks, "CONV.POOR");
+        if (!status) {
+            psError(PM_ERR_CONFIG, false, "failed to lookup mask value for CONV.POOR in recipes\n");
+            streaksExit("", PS_EXIT_CONFIG_ERROR);
+        }
+    }
+    *maskMask = ~convPoor;
+}