Changeset 20269

Timestamp:

Oct 19, 2008, 1:53:16 PM (18 years ago)

Author:

eugene

Message:

do not overwrite results in header from earlier stages

Location:

trunk/psastro/src

Files:

• psastroChipAstrom.c (modified) (8 diffs)
• psastroMosaicAstrom.c (modified) (2 diffs)
• psastroMosaicChipAstrom.c (modified) (4 diffs)

trunk/psastro/src/psastroChipAstrom.c

@@ -4 +4 @@
 bool psastroChipAstrom (pmConfig *config) {
 
+    bool status;
     pmChip *chip = NULL;
     pmCell *cell = NULL;
@@ -9 +10 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe");
@@ -16 +17 @@
 
     // select the input data sources
-    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSASTRO.INPUT");
     if (!input) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find input data");
@@ -43 +44 @@
 
                 // select the raw objects for this readout
-                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
+                psArray *rawstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.RAWSTARS");
                 if (rawstars == NULL) { continue; }
 
                 // select the raw objects for this readout
-                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
+                psArray *refstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.REFSTARS");
                 if (refstars == NULL) { continue; }
 
@@ -59 +60 @@
 
                 // save WCS and analysis metadata in update header
-                psMetadata *updates = psMetadataAlloc();
+                // (pull or create local view to entry on readout->analysis)
+                psMetadata *updates = psMetadataLookupMetadata (&status, readout->analysis, "PSASTRO.HEADER");
+                if (!updates) {
+                    updates = psMetadataAlloc ();
+                    psMetadataAddMetadata (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
+                    psFree (updates);
+                }
 
                 // XXX update the header with info to reflect the failure
@@ -65 +72 @@
                     readout->data_exists = false;
                     psLogMsg ("psastro", 3, "failed to find a solution\n");
-                    psFree (updates);
                     continue;
                 }
@@ -72 +78 @@
                     readout->data_exists = false;
                     psLogMsg ("psastro", 3, "failed to find a solution\n");
-                    psFree (updates);
                     continue;
                 }
@@ -82 +87 @@
 
                 pmAstromWriteWCS (updates, fpa, chip, NONLIN_TOL);
-                psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_DATA_METADATA, "psastro header stats", updates);
-                psFree (updates);
 
                 if (psTraceGetLevel("psastro.dump") > 0) {
 
                     char *filename = NULL;
-                    char *chipname = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+                    char *chipname = psMetadataLookupStr (&status, chip->concepts, "CHIP.NAME");
 
                     psStringAppend (&filename, "rawstars.ch.%s.dat", chipname);

trunk/psastro/src/psastroMosaicAstrom.c

@@ -63 +63 @@
 
     // save WCS and analysis metadata in update header.
-    psMetadata *updates = psMetadataAlloc();
+    // (pull or create local view to entry on readout->analysis)
+    psMetadata *updates = psMetadataLookupMetadata (&status, fpa->analysis, "PSASTRO.HEADER");
+    if (!updates) {
+        updates = psMetadataAlloc ();
+        psMetadataAddMetadata (fpa->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
+        psFree (updates);
+    }
     if (!pmAstromWriteBilevelMosaic (updates, fpa, NONLIN_TOL)) {
         psAbort ("failed to save header terms");
@@ -70 +76 @@
     // write the elapsed time here; this will be updated in psastroMosaicAstrometry, if called
     psMetadataAddF32 (updates, PS_LIST_TAIL, "DT_ASTR", PS_META_REPLACE, "elapsed psastro time", psTimerMark ("psastroAnalysis"));
-
-    psMetadataAddMetadata (fpa->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
-    psFree (updates);
 
     // update the headers based on the results

trunk/psastro/src/psastroMosaicChipAstrom.c

@@ -4 +4 @@
 bool psastroMosaicChipAstrom (pmFPA *fpa, psMetadata *recipe, int iteration) {
 
+    bool status;
     pmChip *chip = NULL;
     pmCell *cell = NULL;
@@ -25 +26 @@
 
                 // save WCS and analysis metadata in update header
-                psMetadata *updates = psMetadataAlloc();
+                // (pull or create local view to entry on readout->analysis)
+                psMetadata *updates = psMetadataLookupMetadata (&status, readout->analysis, "PSASTRO.HEADER");
+                if (!updates) {
+                    updates = psMetadataAlloc ();
+                    psMetadataAddMetadata (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
+                    psFree (updates);
+                }
 
                 if (!psastroMosaicOneChip (chip, readout, recipe, updates, iteration)) {
@@ -31 +38 @@
                     psError(PS_ERR_UNKNOWN, false, "failed to find a solution for %d,%d,%d\n",
                             view->chip, view->cell, view->readout);
-                    psFree(updates);
                     psFree(view);
                     return false;
@@ -38 +44 @@
                 // create the header keywords to descripe the results
                 pmAstromWriteBilevelChip (updates, chip, NONLIN_TOL);
-                psMetadataAddMetadata (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
-                psFree (updates);
             }
         }