Changeset 21085 for trunk/magic/remove/src/streaksio.c

Timestamp:

Jan 4, 2009, 12:32:32 PM (17 years ago)

Author:

bills

Message:

When destreaking chip stage images, use replace the mask from the chip
stage with the mask from the camera stage, destreaking them both.
Added program to prepare images for release by insuring that all masked
pixels are set to NAN

File:

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

trunk/magic/remove/src/streaksio.c

@@ -5 +5 @@
 static nebServer *ourNebServer = NULL;
 
+// open the files required for streaks procesing.
+// 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)
 {
@@ -30 +33 @@
 
     if (remove) {
+        // XXX: the recovery file should be required if stage is raw and the replace flag is set
+        // that is if the input raw image is to be destroyed
         sf->recImage = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
     } else {
@@ -45 +50 @@
         }
     }
+    // If we're in streaksremove and operating on a chip stage image
+    // if we are passed a mask it is camera stage mask and we also
+    // need to destreak the chip level mask file as well
+    if (remove && sf->inMask && (stage == IPP_STAGE_CHIP)) {
+        sf->inChMask = sFileOpen(config, stage, "INPUT.CHMASK", NULL, true);
+        inputBasename = basename(sf->inChMask->name);
+        sf->outChMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+        sf->recChMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
+    }
+
     sf->inWeight = sFileOpen(config, stage, "INPUT.WEIGHT", NULL, false);
     if (sf->inWeight) {
@@ -421 +436 @@
     // XXX: This function assumes that it is only used for a single
     // chip single cell FPA (i.e. a skycell)
+    assert(sf->inImage->pmfile->fpa->chips->n == 1);
+
     pmFPAview *view = sf->view;
-    assert(view->chip == 0);
+    if (view) {
+        // The view was allocated and the chip set by setupAstrometry()
+        assert(view->chip == 0);
+    } else {
+        sf->view = pmFPAviewAlloc(0);
+        view = sf->view;
+        sf->chip = pmFPAviewNextChip(view, sf->inImage->pmfile->fpa, 1);
+        assert(sf->chip != NULL);
+    }
     view->cell = 0;
     sf->cell =  pmFPAviewThisCell(view, sf->inImage->pmfile->fpa);
@@ -747 +772 @@
         closeImage(sf->recMask);
     }
+    if (sf->inChMask) {
+        closeImage(sf->inChMask);
+        closeImage(sf->outChMask);
+        closeImage(sf->recChMask);
+    }
     if (sf->inWeight) {
         closeImage(sf->inWeight);