Changeset 7771

Timestamp:

Jun 30, 2006, 2:07:26 PM (20 years ago)

Author:

eugene

Message:

added addstar option, not well tested; converted detselect to use psPipe / psIOBuffer

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (2 diffs)
• ppImage.h (modified) (1 diff)
• ppImageAddstar.c (added)
• ppImageLoop.c (modified) (1 diff)
• ppImageOptions.c (modified) (1 diff)
• ppImageOptions.h (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -21 +21 @@
         ppImageMosaic.c \
         ppImagePhotom.c \
-        ppImageAstrom.c
+        ppImageAstrom.c \
+        ppImageAddstar.c
 
 ppFocus_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppImage_CFLAGS)
@@ -40 +41 @@
         ppImageMosaic.c \
         ppImagePhotom.c \
-        ppImageAstrom.c
+        ppImageAstrom.c \
+        ppImageAddstar.c
 
 ppTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppImage_CFLAGS)

trunk/ppImage/src/ppImage.h

@@ -39 +39 @@
 bool ppImagePhotom (pmConfig *config, pmFPAview *view);
 bool ppImageAstrom (pmConfig *config);
+bool ppImageAddstar (pmConfig *config);
 
 bool ppImageMosaicChip (pmConfig *config, const pmFPAview *view, char *outFile, char *inFile);

trunk/ppImage/src/ppImageLoop.c

@@ -58 +58 @@
     // we perform astrometry on all chips after sources have been detected
     if (options->doAstromChip || options->doAstromMosaic) ppImageAstrom (config);
+    if (options->doAddstar) ppImageAddstar (config);
 
     if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;

trunk/ppImage/src/ppImageOptions.c

@@ -188 +188 @@
     }
 
+    options->doAddstar = psMetadataLookupBool(NULL, recipe, "ADDSTAR");
+    if (options->doAddstar && !(options->doAstromChip || options->doAstromMosaic)) {
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot Addstar without Astrometry");
+        exit(EXIT_FAILURE);
+    }
+
     return options;
 }

trunk/ppImage/src/ppImageOptions.h

@@ -14 +14 @@
     bool doAstromChip;                  // per-chip Astrometry
     bool doAstromMosaic;                // full-mosaic Astrometry
+    bool doAddstar;                     // add results to object database?
 
     bool doOverscan;                    // Overscan subtraction