Changeset 7749 for trunk/ppImage/src/ppFocus.c

Timestamp:

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

Author:

eugene

Message:

added ppFocus code to drop previous camera

File:

• trunk/ppImage/src/ppFocus.c (modified) (4 diffs)

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;
 }