Changeset 24951 for branches/czw_branch/cleanup/magic/remove/src

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• magic/remove/src (modified) (1 prop)
• magic/remove/src/Makefile.simple (modified) (1 diff)
• magic/remove/src/isdestreaked.c (modified) (3 diffs)
• magic/remove/src/streaksastrom.c (modified) (1 diff)
• magic/remove/src/streaksastrom.h (modified) (1 diff)
• magic/remove/src/streaksio.c (modified) (4 diffs)
• magic/remove/src/streaksio.h (modified) (1 diff)
• magic/remove/src/streaksrelease.c (modified) (1 diff)
• magic/remove/src/streaksremove.c (modified) (2 diffs)

branches/czw_branch/cleanup/magic/remove/src

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace

branches/czw_branch/cleanup/magic/remove/src/Makefile.simple

@@ -37 +37 @@
 STREAKSFLAGS=-DSTREAKS_COMPRESS_OUTPUT=1
 OPTFLAGS= -g -O2
-OPTFLAGS= -g
+#OPTFLAGS= -g
 CFLAGS=`psmodules-config --cflags` -std=gnu99 ${OPTFLAGS} ${STREAKSFLAGS}
 #CFLAGS=`psmodules-config --cflags` -std=gnu99 ${OPTFLAGS}

branches/czw_branch/cleanup/magic/remove/src/isdestreaked.c

@@ -21 +21 @@
         psErrorStackPrint(stderr, "");
         exit(PS_EXIT_DATA_ERROR);
-        return false;
     }
 
@@ -28 +27 @@
         psError(PS_ERR_IO, false, "failed to read header for: %s", fileName);
         psErrorStackPrint(stderr, "");
-        return false;
+        exit(PS_EXIT_DATA_ERROR);
     }
 
@@ -34 +33 @@
     bool isDestreaked = psMetadataLookupBool(&mdok, header, "PSDESTRK");
     if (mdok && isDestreaked) {
+        printf("%s is a destreaked file\n", fileName);
         exit(0);
     } else {
+        printf("%s is not a destreaked file\n", fileName);
         exit(42);
     }

branches/czw_branch/cleanup/magic/remove/src/streaksastrom.c

@@ -377 +377 @@
 }
 
-void
+bool
 linearizeTransforms(strkAstrom *astrom)
 {
     if (!pmAstromLinearizeTransforms((pmFPA *) astrom->fpa, (pmChip *) astrom->chip)) {
-        streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
-    }
-}
+        // streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
+        psError(PS_ERR_UNKNOWN, false, "linear fit to astrometry failed ignoring");
+        return false;
+    }
+    return true;
+}

branches/czw_branch/cleanup/magic/remove/src/streaksastrom.h

@@ -30 +30 @@
 extern bool skyToCell(strkPt *, strkAstrom *astrom, double ra, double dec);
 extern bool cellToSky(strkPt *, strkAstrom *astrom, double x, double y);
-extern void linearizeTransforms(strkAstrom *astrom);
+extern bool linearizeTransforms(strkAstrom *astrom);
 
 extern bool SkyToLocal(strkPt *outPt, strkAstrom *astrom, double ra, double dec);

branches/czw_branch/cleanup/magic/remove/src/streaksio.c

@@ -9 +9 @@
 
 static nebServer *ourNebServer = NULL;
+
+// Assumptions about the file structure of non-raw files
+// The 'image' for each file (image, mask weight) is contained in the first
+// extension. 
+
 
 // open the files required for streaks procesing.
@@ -66 +71 @@
     // 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 it doesn't exist, we didn't have a camera mask
     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->inChMask = sFileOpen(config, stage, "INPUT.CHMASK", NULL, false);
+        if (sf->inChMask) {
+            inputBasename = basename(sf->inChMask->name);
+            sf->outChMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+            sf->recChMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
+        }
     }
 
@@ -282 +290 @@
         // copy header from fpu
         sfile->header = (psMetadata*) psMemIncrRefCounter(sfile->pmfile->fpa->hdu->header);
+
+        sfile->nHDU = psFitsGetSize(sfile->pmfile->fits);
 
         return sfile;
@@ -1195 +1205 @@
     *maskMask = ~convPoor;
 }
+
+static void
+doCopyExtraExtensions(streakFiles *sf, sFile *in, sFile *out)
+{
+    for (int extnum = sf->extnum; extnum < in->nHDU; extnum++) {
+        moveExt(in, extnum);
+        readImage(in, extnum, sf->stage, false);
+
+        if (SFILE_IS_IMAGE(in)) {
+            // Turn off compression (code adapted from pmFPAWrite)
+#ifdef SAVE_AND_RESTORE_COMPRESSION
+            int bitpix = out->fits->options ? out->fits->options->bitpix : 0; // Desired bits per pixel
+            psFitsCompression *compress = psFitsCompressionGet(out->fits); // Current compression options
+#endif
+            if (!psFitsSetCompression(out->fits, PS_FITS_COMPRESS_NONE, NULL, 0, 0, 0)) {
+                psError(PM_ERR_UNKNOWN, false, "failed to turn off compression for extension %d\n", extnum);
+                streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+            }
+#ifdef SAVE_AND_RESTORE_COMPRESSION
+            if (out->fits->options) {
+                out->fits->options->bitpix = 0;
+            }
+            if (!psFitsWriteImage(out->fits, in->header, in->image, 0, in->extname)) {
+                psError(PM_ERR_UNKNOWN, false, "failed to write image for extension %d\n", extnum);
+                streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+            }
+            if (out->fits->options) {
+                out->fits->options->bitpix = bitpix;
+            }
+            if (!psFitsCompressionApply(out->fits, compress)) {
+                psError(PM_ERR_UNKNOWN, false, "failed to rest compression image for extension %d\n", extnum);
+                streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+            }
+#endif
+        } else {
+            copyTable(out, in, extnum);
+        }
+    }
+}
+
+void
+copyExtraExtensions(streakFiles *sf)
+{
+    // XXX: Bad assumption, the begining of the mask and weight files have the same structure as the image
+    // So we are currently at the image portion
+    sf->extnum = sf->inImage->nHDU;
+
+    if (sf->inWeight && sf->outWeight) {
+        doCopyExtraExtensions(sf, sf->inWeight, sf->outWeight);
+    }
+    if (sf->inMask && sf->outMask) {
+        doCopyExtraExtensions(sf, sf->inMask, sf->outMask);
+    }
+    if (sf->inChMask && sf->outChMask) {
+        doCopyExtraExtensions(sf, sf->inChMask, sf->outChMask);
+    }
+}

branches/czw_branch/cleanup/magic/remove/src/streaksio.h

@@ -17 +17 @@
 void setupImageRefs(sFile *out, sFile *recoveryOut, sFile *in, int extnum, bool exciseAll);
 void strkGetMaskValues(streakFiles *sfiles, psU32 *maskStreak, psU32 *maskMask);
+void copyExtraExtensions(streakFiles *sfiles);
 
 void writeImage(sFile *sfile, psString extname, int extnum);

branches/czw_branch/cleanup/magic/remove/src/streaksrelease.c

@@ -67 +67 @@
         printf("time to process component %d: %f\n", sfiles->extnum, psTimerClear("PROCESS_COMPONENT"));
     } while (streakFilesNextExtension(sfiles));
+
+    // check the weight and mask files for extra extensions that might be in files
+    // (covariance matrix for example)
+    copyExtraExtensions(sfiles);
+
+
 
     psTimerStart("CLOSE_IMAGES");

branches/czw_branch/cleanup/magic/remove/src/streaksremove.c

@@ -198 +198 @@
     } while (streakFilesNextExtension(sfiles));
 
+
     psFree(streaks);
 
     psLogMsg("streaksremove", PS_LOG_INFO, "pixels: %ld streak pixels: %ld %4.2f%%\n", totalPixels, totalStreakPixels, 100. * totalStreakPixels / totalPixels);
+
+    // check the weight and mask files for extra extensions that might be in files
+    // (covariance matrix for example)
+    copyExtraExtensions(sfiles);
 
     // all done close the files. This is where the files are written so it can take a long time.
@@ -483 +488 @@
     if (sf->bilevelAstrometry) {
 
-        linearizeTransforms(sf->astrom);
+        if (!linearizeTransforms(sf->astrom)) {
+            // fit failed, leave the astrometry unchanged
+            return;
+        }
 
         if (!pmAstromWriteWCS(sf->outImage->header, sf->inAstrom->fpa, sf->chip, 0.001)) {

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace