Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastro.c

Timestamp:

Oct 9, 2008, 2:39:01 PM (18 years ago)

Author:

beaumont

Message:

merged mainline into branch. resolved conflicts. added plots.

Location:

branches/cnb_branch_20080830/psastro/src

Files:

• . (modified) (1 prop)
• psastro.c (modified) (3 diffs)

branches/cnb_branch_20080830/psastro/src

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

branches/cnb_branch_20080830/psastro/src/psastro.c

@@ -9 +9 @@
 
     pmConfig *config = NULL;
-
     psTimerStart ("complete");
 
@@ -24 +23 @@
     // load identify the data sources
     if (!psastroParseCamera (config)) {
-        psErrorStackPrint(stderr, "error setting up the camera\n");
-        exit (1);
+        psErrorStackPrint(stderr, "error setting up the camera\n");
+        exit (1);
     }
 
@@ -31 +30 @@
     // select subset of stars for astrometry
     if (!psastroDataLoad (config)) {
-        psErrorStackPrint(stderr, "error loading input data\n");
-        exit (1);
+        psErrorStackPrint(stderr, "error loading input data\n");
+        exit (1);
     }
 
     // run the full astrometry analysis (chip and/or mosaic)
     if (!psastroAnalysis (config)) {
-        psErrorStackPrint(stderr, "failure in psastro analysis\n");
-        exit (1);
+        psErrorStackPrint(stderr, "failure in psastro analysis\n");
+        exit (1);
     }
-    
+
     // write out the results
     if (!psastroDataSave (config)) {
-        psErrorStackPrint(stderr, "failed to write out data\n");
-        exit (1);
+        psErrorStackPrint(stderr, "failed to write out data\n");
+        exit (1);
     }
 

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit