Changeset 7531

Timestamp:

Jun 12, 2006, 4:49:23 PM (20 years ago)

Author:

eugene

Message:

substantial work to make formats all work, added error checking

Location:

trunk/ppImage

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/ppImage.c (modified) (1 diff)
• src/ppImage.h (modified) (2 diffs)
• src/ppImageArguments.c (modified) (1 diff)
• src/ppImageAstrom.c (added)
• src/ppImageCleanup.c (modified) (1 diff)
• src/ppImageDetrendReadout.c (modified) (2 diffs)
• src/ppImageLoop.c (modified) (3 diffs)
• src/ppImageOptions.c (modified) (7 diffs)
• src/ppImageOptions.h (modified) (2 diffs)
• src/ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/configure.ac

@@ -26 +26 @@
 PKG_CHECK_MODULES([PSMODULE], [psmodule >= 0.0.0]) 
 PKG_CHECK_MODULES([PSPHOT], [psphot >= 0.0.0]) 
+PKG_CHECK_MODULES([PSASTRO], [psastro >= 0.0.0]) 
 
 CFLAGS="${CFLAGS} -Wall -Werror -std=c99"

trunk/ppImage/src/Makefile.am

@@ -6 +6 @@
         ppMem.h
 
-ppImage_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(ppImage_CFLAGS)
-ppImage_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS)
+ppImage_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppImage_CFLAGS)
+ppImage_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppImage_SOURCES = \
         ppImage.c \
@@ -20 +20 @@
         ppImageRebinReadout.c \
         ppImagePhotom.c \
-        ppMem.c
+        ppImageAstrom.c
 
 #       ppImageParseCamera.c \

trunk/ppImage/src/ppImage.c

@@ -26 +26 @@
     ppImageLoop(config, options);
 
-    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
+    psLogMsg ("ppImage", 3, "complete ppImage run: %f sec\n", psTimerMark ("complete"));
 
     // Cleaning up

trunk/ppImage/src/ppImage.h

@@ -6 +6 @@
 #include "psmodules.h"
 #include "psphot.h"
+#include "psastro.h"
 #include "ppImageOptions.h"
 
@@ -36 +37 @@
 
 bool ppImagePhotom (pmConfig *config, pmFPAview *view);
+bool ppImageAstrom (pmConfig *config);
 
 #endif

trunk/ppImage/src/ppImageArguments.c

@@ -56 +56 @@
     if ((N = psArgumentGet (*argc, argv, "-chip"))) {
         psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(argv[N]));
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
         psArgumentRemove (N, argc, argv);
     }

trunk/ppImage/src/ppImageCleanup.c

@@ -12 +12 @@
     pmConfigDone();
     fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
+    // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
     return;
 }

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -39 +39 @@
 
     // Bias, dark and overscan subtraction are all merged.
-    ppImageDetrendBias(input, bias, dark, options);
+    if (options->doBias || options->doDark) {
+        ppImageDetrendBias(input, bias, dark, options);
+    }
 
     // Flat-field correction (no options used?)
     if (options->doFlat) {
-        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
+        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
         pmFlatField(input, flat);
     }
@@ -50 +52 @@
     return true;
 }
-
-    // XXX in psphot, the recipe options are parsed at this depth
-    // XXX consider if we move ppImageOptions in here
-    // psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PSPHOT");
-

trunk/ppImage/src/ppImageLoop.c

@@ -20 +20 @@
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
-        psLogMsg ("psphot", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
         pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
-            psLogMsg ("psphot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
             pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
@@ -48 +48 @@
 
         // we perform photometry on the readouts of this chip in the output
-        ppImagePhotom (config, view);
+        if (options->doPhotom) ppImagePhotom (config, view);
 
         pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
@@ -62 +62 @@
     }
 
-    // ppImageAstrom (config);
+    // we perform astrometry on all chips after sources have been detected
+    if (options->doAstrom) ppImageAstrom (config);
     
     // ppImageFPAMosaic (config, view);

trunk/ppImage/src/ppImageOptions.c

@@ -18 +18 @@
     options->nonLinearSource = NULL;
 
-    return options;
-}
-
-ppImageOptions *ppImageOptionsParse(pmConfig *config)
-{
-    bool status;
-    ppImageOptions *options = ppImageOptionsAlloc ();
-
     // default flags for various activities
     options->doMask     = false;        // Mask bad pixels
@@ -36 +28 @@
     options->doFlat     = false;        // Flat-field normalisation
     options->doFringe   = false;        // Fringe subtraction
-    options->doSource   = false;        // Source identification and photometry
+    options->doPhotom   = false;        // Source identification and photometry
     options->doAstrom   = false;        // Astrometry
+
+    options->doBin1     = false;        // create binned image (scale 1)
+    options->doBin2     = false;        // create binned image (scale 2)
+    options->doBin1JPG  = false;        // create jpg of binned image (scale 1)
+    options->doBin2JPG  = false;        // create jpg of binned image (scale 2)
 
     // Overscan defaults
     options->overscan      = NULL;      // Overscan options
-    bool overscanSingle    = false;     // A single value for entire overscan?
-    pmFit overscanFit      = PM_FIT_NONE; // Fit type for overscan
-    int overscanOrder      = 0;         // Order for overscan fit
-    psStats *overscanStats = NULL;      // Statistics for overscan
 
     // Non-linearity default options
@@ -50 +43 @@
     options->nonLinearData   = NULL;    // The non-linearity data
     options->nonLinearSource = NULL;    // If the non-linearity data is a menu, this provides the key
+
+    return options;
+}
+
+ppImageOptions *ppImageOptionsParse(pmConfig *config)
+{
+    bool status;
+    ppImageOptions *options = ppImageOptionsAlloc ();
 
     // select the recipe for this analysis
@@ -105 +106 @@
 
         // Do the overscan as a single value?
-        overscanSingle = psMetadataLookupBool(NULL, recipe, "OVERSCAN.SINGLE");
+        bool overscanSingle = psMetadataLookupBool(NULL, recipe, "OVERSCAN.SINGLE");
 
         // How do we fit it?
+        pmFit overscanFit = PM_FIT_NONE; // Fit type for overscan
+        int overscanOrder = 0;          // Order for overscan fit
         psString fit = psMetadataLookupStr(NULL, recipe, "OVERSCAN.FIT");
         if (! strcasecmp(fit, "POLYNOMIAL")) {
@@ -118 +121 @@
             overscanFit = PM_FIT_SPLINE;
         } else if (strcasecmp(fit, "NONE")) {
-            psLogMsg(__func__, PS_LOG_WARN, "OVERSCAN.FIT (%s) in recipe %s is not one of NONE, "
-                     "POLYNOMIAL, or SPLINE: assuming NONE.\n", fit, RECIPE_NAME);
+            psLogMsg(__func__, PS_LOG_WARN, "OVERSCAN.FIT (%s) in recipe %s is not one of NONE, POLYNOMIAL, or SPLINE", fit, RECIPE_NAME);
+            exit(EXIT_FAILURE);
         }
 
+        // What method do we use to measure the overscan statistics?
+        psStats *overscanStats = NULL;  // Statistics for overscan
         psString stat = psMetadataLookupStr(NULL, recipe, "OVERSCAN.STAT");
         if (! strcasecmp(stat, "MEAN")) {
@@ -128 +133 @@
             overscanStats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
         } else {
-            psErrorStackPrint(stderr, "OVERSCAN.STAT (%s) in recipe %s is not one of MEAN, MEDIAN: "
-                              "assuming MEAN\n", stat, RECIPE_NAME);
-            overscanStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
+            psErrorStackPrint(stderr, "OVERSCAN.STAT (%s) in recipe %s is not one of MEAN or MEDIAN", stat, RECIPE_NAME);
+            exit(EXIT_FAILURE);
         }
 
@@ -161 +165 @@
 
     options->doBin1 = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
+    options->doBin1JPG = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
+    if (options->doBin1JPG && !options->doBin1) {
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot make JPG of Bin1 image without Bin1 image");
+        exit(EXIT_FAILURE);
+    }
+
     options->doBin2 = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
+    options->doBin2JPG = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
+    if (options->doBin2JPG && !options->doBin2) {
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot make JPG of Bin2 image without Bin2 image");
+        exit(EXIT_FAILURE);
+    }
+    
+    options->doPhotom = psMetadataLookupBool(NULL, recipe, "PHOTOM");
+    options->doAstrom = psMetadataLookupBool(NULL, recipe, "ASTROM");
+    if (options->doAstrom && !options->doPhotom) {
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot do ASTROMetry without PHOTOMetry");
+        exit(EXIT_FAILURE);
+    }
 
-    // options->doBin1JPEG = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
-    // options->doBin2JPEG = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
-    
     return options;
 }

trunk/ppImage/src/ppImageOptions.h

@@ -11 +11 @@
     bool doFlat;                        // Flat-field normalisation
     bool doFringe;                      // Fringe subtraction
-    bool doSource;                      // Source identification and photometry
+    bool doPhotom;                      // Source identification and photometry
     bool doAstrom;                      // Astrometry
 
@@ -23 +23 @@
 
     bool doBin1;
+    bool doBin1JPG;
     int xBin1, yBin1;
 
     bool doBin2;
+    bool doBin2JPG;
     int xBin2, yBin2;
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -53 +53 @@
     if (options->doBin1) {
         pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
-        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
+        if (options->doBin1JPG) {
+            pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
+        }
     }
     if (options->doBin2) {
         pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
-        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
+        if (options->doBin2JPG) {
+            pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
+        }
     }