Changeset 27467

Timestamp:

Mar 26, 2010, 11:27:28 AM (16 years ago)

Author:

bills

Message:

various changes to get destreaking of raw files correct

File:

• trunk/magic/remove/src/streaksio.c (modified) (5 diffs)

trunk/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;
 
@@ -1143 +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];
+                double imageVal;
+                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;
                 if (sfiles->stage == IPP_STAGE_RAW) {
@@ -1156 +1179 @@
                     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) {