Changeset 15137

Timestamp:

Sep 30, 2007, 4:20:08 AM (19 years ago)

Author:

eugene

Message:

astrometry I/O at chip and file level

Location:

trunk

Files:

• ppImage/src/ppImageAstrom.c (modified) (2 diffs)
• ppImage/src/ppImageLoop.c (modified) (2 diffs)
• ppImage/src/ppImageParseCamera.c (modified) (1 diff)
• psconfig/psconfig.bash (modified) (1 diff)

trunk/ppImage/src/ppImageAstrom.c

@@ -19 +19 @@
     PS_ASSERT (input, false);
 
-    // deactivate the psastro files, reactive when needed
-    // XXX ??? pmFPAfileActivate (config->files, true, "PSASTRO.OUTPUT");
-
     // convert the output sources created by psphot into astrometry objects
     if (!psastroConvertFPA (input->fpa, recipe)) {
@@ -33 +30 @@
     }
 
+    // deactivate the psastro files, reactive when needed
+    pmFPAfileActivate (config->files, false, NULL);
+    pmFPAfileActivate (config->files, true, "PSASTRO.OUTPUT");
+
+    // loop over all chips and perform IO needed
+    pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest
+    while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
+        psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+
+        // Output and Close at Chip level
+        if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+            psFree(view);
+            return false;
+        }
+    }
+
+    // Output and Close FPA
+    if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+        psFree(view);
+        return false;
+    }
+
+    // deactivate the PSASTRO files, re-active all else 
+    // XXX do we need a way to activate / deactivate other groups?
+    pmFPAfileActivate (config->files, true, NULL);
+    pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT");
+
     return true;
 }

trunk/ppImage/src/ppImageLoop.c

@@ -144 +144 @@
 
     // we perform astrometry on all chips after sources have been detected
+    // this also performs the psastro file IO
     if (options->doAstromChip || options->doAstromMosaic) {
         if (!ppImageAstrom(config)) {
@@ -163 +164 @@
     }
 
-
     // Write out summary statistics
     if (!ppImageStatsOutput (config, options)) {

trunk/ppImage/src/ppImageParseCamera.c

@@ -272 +272 @@
 
         // deactivate the psastro files, reactive when needed
-        // XXX ??? pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT");
+        pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT");
     }
 

trunk/psconfig/psconfig.bash

@@ -2 +2 @@
 
 if [ -z $PSCONFIG_DIR ]; then
-  PSCONFIG_DIR=/home/kiawe/eugene/src.alala/panstarrs/ipp/psconfig
+  PSCONFIG_DIR=/home/eugene/src/panstarrs/ipp/psconfig
 fi