Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroAnalysis.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psastro (modified) (1 prop)
• psastro/src (modified) (1 prop)
• psastro/src/psastroAnalysis.c (modified) (5 diffs)

branches/cnb_branches/cnb_branch_20090301/psastro/src

@@ -16 +16 @@
 gpcModel
 psastroModelFit
+psastroExtract

@@ -16 +16 @@
 gpcModel
 psastroModelFit
+psastroExtract

branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroAnalysis.c

@@ -45 +45 @@
 
     // load the reference stars overlapping the data stars
-    psArray *refs = psastroLoadRefstars(config);
+    psArray *refs = psastroLoadRefstars(config, "PSASTRO.INPUT");
     if (!refs) {
         psError (PSASTRO_ERR_UNKNOWN, false, "failed to load reference data\n");
@@ -56 +56 @@
     }
 
-    if (!psastroChooseRefstars (config, refs)) {
+    if (!psastroChooseRefstars (config, refs, "PSASTRO.INPUT")) {
         psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
         psFree(refs);
         return false;
     }
+    psFree (refs);  // refs of interest are saved on readout->analysis
 
     // check the command-line arguments first
@@ -79 +80 @@
         if (!psastroChipAstrom (config)) {
             psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform single chip astrometry\n");
-            psFree(refs);
             return false;
         }
@@ -86 +86 @@
         if (!psastroMosaicAstrom (config)) {
             psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform mosaic camera astrometry\n");
-            psFree(refs);
             return false;
         }
@@ -100 +99 @@
     // psastroStackAstrom (config, refs);
 
-    psFree (refs);
     return true;
 }

@@ -16 +16 @@
 gpcModel
 psastroModelFit
+psastroExtract