Changeset 7621 for trunk/ppImage/src/ppImageAstrom.c

Timestamp:

Jun 21, 2006, 12:51:48 PM (20 years ago)

Author:

eugene

Message:

various fixes

File:

• trunk/ppImage/src/ppImageAstrom.c (modified) (3 diffs)

trunk/ppImage/src/ppImageAstrom.c

@@ -5 +5 @@
     bool status;
 
+    // select recipe options supplied on command line
+    // XXX move these options to the "PSASTRO" recipe?
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME);
+
     // find or define a pmFPAfile PSPHOT.INPUT
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSASTRO.INPUT");
     if (!status) {
 
-        // psphotReadout requires a pmFPAfile supplied with the name PSPHOT.INPUT
-        // create a pmFPAfile which points at PPIMAGE.OUTPUT
+        // psphotReadout requires a pmFPAfile supplied with the name PSASTRO.INPUT
+        // create a pmFPAfile which points at PSPHOT.OUTPUT
         // mode is 'REFERENCE' to prevent double frees of the fpa
         pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
@@ -17 +21 @@
 
         pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
-
-        // supply the output name (from cmd-line) to all output (WRITE) files
-        // XXX does this cause trouble with existing files?
-        char *outname = psMetadataLookupPtr(&status, config->arguments, "OUTPUT");
-        pmFPAfileAddFileNames (config->files, "OUTPUT", outname, PM_FPA_MODE_WRITE);
     }
-
-    // we only was to operate on PSPHOT pmFPAfiles here:
-    pmFPAfileActivate (config->files, false, NULL);
-    pmFPAfileActivate (config->files, true, "PSASTRO.INPUT");
-    pmFPAfileActivate (config->files, true, "PSASTRO.OUTPUT");
 
     // interpret the available initial astrometric information
@@ -38 +32 @@
     psastroMosaicGetRefstars (config, refs); 
 
-    char *mosastro = psMetadataLookupStr (NULL, config->arguments, "MOSASTRO");
-    if (mosastro == NULL) {
+    if (psMetadataLookupBool (NULL, recipe, "ASTROM.CHIP")) {
         psastroChipAstrom (config, refs);
-    } else {
+    } 
+    if (psMetadataLookupBool (NULL, recipe, "ASTROM.MOSAIC")) {
         psastroMosaicAstrom (config, refs);
     }
 
-    psastroDataSave (config);
-
-    // de-activate the PSPHOT image files, activate the PPIMAGE ones
-    pmFPAfileActivate (config->files, false, NULL);
-    pmFPAfileActivate (config->files, true, "PPIMAGE.INPUT");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.BIAS");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.DARK");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.MASK");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.FLAT");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.OUTPUT");
-
-    pmFPAfileActivate (config->files, true, "PPIMAGE.BIN1");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.JPEG1");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.BIN2");
-    pmFPAfileActivate (config->files, true, "PPIMAGE.JPEG2");
-
     return true;
 }