Changeset 27517 for branches/eam_branches/20100225/magic/remove/src/streaksio.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/magic/remove/src/streaksio.c

@@ -811 +811 @@
     }
     streaksVersionHeaderFull(sfile->header);
+
     if (!psFitsWriteImage(sfile->fits, sfile->header, sfile->image, 0, extname)) {
         psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d",
@@ -871 +872 @@
 closeImages(streakFiles *sf)
 {
+    if (sf->stage == IPP_STAGE_RAW) {
+        if (sf->view) {
+            sf->view->readout = -1;
+            pmFPAfileIOChecks(sf->config, sf->view, PM_FPA_AFTER);
+            sf->view->cell = -1;
+            pmFPAfileIOChecks(sf->config, sf->view, PM_FPA_AFTER);
+            sf->view->chip = -1;
+            pmFPAfileIOChecks(sf->config, sf->view, PM_FPA_AFTER);
+        }
+    }
     closeImage(sf->inImage);
     closeImage(sf->outImage);
@@ -1123 +1134 @@
 
         psImage *image = sfiles->outImage->image;
+        int imageType = image->type.type;
+        double exciseValue = sfiles->inImage->exciseValue;
+
         psImage *mask = sfiles->inMask->image;
         psImage *weight = NULL;
+        int weightType = 0;
+        double weightExciseValue = NAN;
         if (sfiles->outWeight) {
             weight = sfiles->outWeight->image;
-        }
-        double exciseValue = sfiles->inImage->exciseValue;
+            weightType = weight->type.type;
+            weightExciseValue = sfiles->inWeight->exciseValue;
+        }
 
         if (printCounts) {
@@ -1138 +1155 @@
                 // these gets are not necessary, we could just set the pixels to nan
                 // but I want to get the counts
-                double imageVal  = image->data.F32[y][x];
-                psU32 maskVal;
+                double imageVal = 0; // avoid compiler warning
+                if (imageType == PS_TYPE_F32) {
+                    imageVal  = image->data.F32[y][x];
+                } else if (imageType == PS_TYPE_S16) {
+                    imageVal = image->data.S16[y][x];
+                } else if (imageType == PS_TYPE_U16) {
+                    imageVal = image->data.U16[y][x];
+                } else {
+                    psError(PS_ERR_PROGRAMMING, true, "unexpected image type found: %d\n",
+                                imageType);
+                    streaksExit("", PS_EXIT_PROG_ERROR);
+                }
+                psU32 maskVal = 0;
                 if (sfiles->stage == IPP_STAGE_RAW) {
                     unsigned int xChip, yChip;
@@ -1149 +1177 @@
                 if (maskVal & maskMask) {
                     ++maskedPixels;
-                    if (!isExciseValue(imageVal, sfiles->inImage->exciseValue)) {
+                    if (!isExciseValue(imageVal, exciseValue)) {
                         ++nandPixels;
-                        image->data.F32[y][x] = exciseValue;
+                        if (imageType == PS_TYPE_F32) {
+                            image->data.F32[y][x] = exciseValue;
+                        } else if (imageType == PS_TYPE_S16) {
+                            image->data.S16[y][x] = exciseValue;
+                        } else if (imageType == PS_TYPE_U16) {
+                            image->data.U16[y][x] = exciseValue;
+                        } else {
+                            psError(PS_ERR_PROGRAMMING, true, "unexpected image type found: %d\n",
+                                imageType);
+                            streaksExit("", PS_EXIT_PROG_ERROR);
+                        }
                     }
                     if (weight) {
-                        double weightVal = weight ? weight->data.F32[y][x] : 0;
-                        if (!isnan(weightVal)) {
-                            ++nandWeights;
-                            weight->data.F32[y][x] = NAN;
+                        if (weightType == PS_TYPE_F32) {
+                            double weightVal = weight->data.F32[y][x];
+                            if (!isnan(weightVal)) {
+                                ++nandWeights;
+                                weight->data.F32[y][x] = NAN;
+                            }
+                        } else if(weightType == PS_TYPE_S16) {
+                            double weightVal = weight->data.S16[y][x];
+                            if (!isExciseValue(weightVal, weightExciseValue)) {
+                                ++nandWeights;
+                                image->data.S16[y][x] = weightExciseValue;
+                            }
+                        } else if (weightType == PS_TYPE_U16) {
+                            double weightVal = weight->data.U16[y][x];
+                            if (!isExciseValue(weightVal, weightExciseValue)) {
+                                ++nandWeights;
+                                image->data.U16[y][x] = weightExciseValue;
+                            }
+                        } else {
+                            psError(PS_ERR_PROGRAMMING, true, "unexpected image type found: %d\n",
+                                    weightType);
+                                streaksExit("", PS_EXIT_PROG_ERROR);
                         }
                     }
@@ -1188 +1244 @@
         psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 65535);
         psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 65535);
-    } else {
+    } else if (in->image->type.type == PS_TYPE_S16) {
+        in->exciseValue = 32767;
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 32767);
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 32767);
+    } else if (in->image->type.type == PS_TYPE_F32) {
         in->exciseValue = NAN;
+    } else {
+        psError(PS_ERR_PROGRAMMING, true, "unexpected image type found: %d\n", in->image->type.type);
+        streaksExit("", PS_EXIT_PROG_ERROR);
     }
 }