Changeset 7749

Timestamp:

Jun 29, 2006, 8:09:31 AM (20 years ago)

Author:

eugene

Message:

added ppFocus code to drop previous camera

Location:

trunk/ppImage/src

Files:

• ppFocus.c (modified) (4 diffs)
• ppFocusGetFWHM.c (modified) (4 diffs)
• ppFocusParseCamera.c (modified) (3 diffs)
• ppImage.h (modified) (1 diff)

trunk/ppImage/src/ppFocus.c

@@ -17 +17 @@
     }
 
-    // define recipe options
-    // define the active I/O files
-    ppImageOptions *options = ppFocusParseCamera(config);
-    if (options == NULL) {
-        psErrorStackPrint(stderr, "");
-        exit(1);
-    }
-    
     // we search the argument data for the named fileset (argname)
     psArray *infiles = psMetadataLookupPtr(NULL, config->arguments, "INPUT");
@@ -38 +30 @@
     for (int i = 0; i < infiles->n; i++) {
 
+        // define recipe options
+        // define the active I/O files
+        ppImageOptions *options = ppFocusParseCamera(config, i);
+        if (options == NULL) {
+            psErrorStackPrint(stderr, "");
+            exit(1);
+        }
+
         // Image Arithmetic Loop
+        // XXX ppFocus REQUIRES photom: for it to be true?
         if (!ppImageLoop(config, options)) {
             psErrorStackPrint(stderr, "");
@@ -48 +49 @@
         ppFocusGetFWHM (config, focus, fwhm);
 
-        // silently ignore failure for (i == infiles->n)
-        pmFPAfileDefineSingleFromArgs (NULL, config, "PPIMAGE.INPUT", "INPUT", i+1);
+        ppFocusDropCamera (config);
+        psFree (options);
     }
 
@@ -57 +58 @@
 
     // Cleaning up
-    ppImageCleanup(config, options);
+    ppImageCleanup(config, NULL);
     return EXIT_SUCCESS;
 }

trunk/ppImage/src/ppFocusGetFWHM.c

@@ -11 +11 @@
     int FWHMnum;
 
-    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPIMAGE.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
     if (!status) {
         psErrorStackPrint(stderr, "Can't find input data!\n");
@@ -45 +45 @@
                 // in this example, we use the supplied PSPHOT.HEADER data in which FWHM_X,Y are supplied
                 header = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
-                if (header == NULL) continue;
+                if (header == NULL) {
+                    psError(PS_ERR_IO, false, "Missing header in ppFocus");
+                    continue;
+                }
 
                 FWHM_X = psMetadataLookupF32 (&status, header, "FWHM_X");
@@ -52 +55 @@
                 FWHMsum += 0.5*(FWHM_X + FWHM_Y);
                 FWHMnum ++;
+
+                psLogMsg ("ppFocus", 4, "focus pt: %f,%f, fwhm sum: %f, fwhm num: %d\n", FWHM_X, FWHM_Y, FWHMsum, FWHMnum);
             }
         }
@@ -67 +72 @@
     psVectorExtend (focus, 10, 1);
 
-    psMetadataRemoveKey (config->files, "PPIMAGE.INPUT");
+    psLogMsg ("ppFocus", 4, "focus: %f, fwhm: %f (%d,%d)\n", FOCUS, FWHM, FWHMnum);
+
     psFree (view);
     return true;

trunk/ppImage/src/ppFocusParseCamera.c

@@ -2 +2 @@
 
 // XXX clean up error checks: return NULL, not psAbort
-ppImageOptions *ppFocusParseCamera (pmConfig *config) {
+ppImageOptions *ppFocusParseCamera (pmConfig *config, int entry) {
 
     bool status = false;
@@ -8 +8 @@
     // the first input image defines the camera, and all recipes and options that follow
     // select only the first file from the INPUT array
-    pmFPAfile *input = pmFPAfileDefineSingleFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT", 0);
+    pmFPAfile *input = pmFPAfileDefineSingleFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT", entry);
     if (!status) {
         psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");
@@ -103 +103 @@
     return (options);
 }
+
+// remove from config all pmFPAfiles which could have been added (ignore missing entries)
+void ppFocusDropCamera (pmConfig *config) {
+
+    psMetadataRemoveKey (config->files, "PPIMAGE.INPUT");
+
+    psMetadataRemoveKey (config->files, "PPIMAGE.BIAS");
+    psMetadataRemoveKey (config->files, "PPIMAGE.DARK");
+    psMetadataRemoveKey (config->files, "PPIMAGE.MASK");
+    psMetadataRemoveKey (config->files, "PPIMAGE.FLAT");
+
+    psMetadataRemoveKey (config->files, "PPIMAGE.OUTPUT");
+    psMetadataRemoveKey (config->files, "PPIMAGE.OUTPUT.CHIP");
+    psMetadataRemoveKey (config->files, "PPIMAGE.OUTPUT.FPA1");
+    psMetadataRemoveKey (config->files, "PPIMAGE.OUTPUT.FPA2");
+
+    psMetadataRemoveKey (config->files, "PPIMAGE.BIN1");
+    psMetadataRemoveKey (config->files, "PPIMAGE.BIN2");
+    
+    psMetadataRemoveKey (config->files, "PPIMAGE.JPEG1");
+    psMetadataRemoveKey (config->files, "PPIMAGE.JPEG2");
+
+    psMetadataRemoveKey (config->files, "PSPHOT.INPUT");
+    psMetadataRemoveKey (config->files, "PSPHOT.OUTPUT");
+    psMetadataRemoveKey (config->files, "PSPHOT.RESID");
+    psMetadataRemoveKey (config->files, "PSPHOT.BACKMDL");
+    psMetadataRemoveKey (config->files, "PSPHOT.BACKGND");
+    psMetadataRemoveKey (config->files, "PSPHOT.BACKSUB");
+    psMetadataRemoveKey (config->files, "PSPHOT.PSF.LOAD");
+    psMetadataRemoveKey (config->files, "PSPHOT.PSF.SAVE");
+
+    return;
+}
+

trunk/ppImage/src/ppImage.h

@@ -47 +47 @@
 // functions used by ppFocus
 pmConfig *ppFocusArguments(int argc, char **argv);
-ppImageOptions *ppFocusParseCamera (pmConfig *config);
+ppImageOptions *ppFocusParseCamera (pmConfig *config, int entry);
 bool ppFocusGetFWHM (pmConfig *config, psVector *focus, psVector *fwhm);
 bool ppFocusFitFWHM (pmConfig *config, psVector *focus, psVector *fwhm);
 
+void ppFocusDropCamera (pmConfig *config);
+
 #endif