Changeset 23336

Timestamp:

Mar 15, 2009, 4:56:51 PM (17 years ago)

Author:

eugene

Message:

change APIs to allow user-specified pmFPAfile name for source

Location:

branches/eam_branches/eam_branch_20090312/psastro/src

Files:

• psastro.h (modified) (3 diffs)
• psastroAnalysis.c (modified) (5 diffs)
• psastroChooseRefstars.c (modified) (2 diffs)
• psastroLoadRefstars.c (modified) (4 diffs)

branches/eam_branches/eam_branch_20090312/psastro/src/psastro.h

@@ -61 +61 @@
 bool              psPlaneDistortIsIdentity (psPlaneDistort *distort);
 
-psArray          *psastroLoadRefstars (pmConfig *config);
+psArray          *psastroLoadRefstars (pmConfig *config, const char *source);
 bool              psastroChipAstrom (pmConfig *config);
 bool              psastroOneChip (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroOneChipGrid (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroOneChipFit (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
-bool              psastroChooseRefstars (pmConfig *config, psArray *refs);
+bool              psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source);
 bool              psastroRefstarSubset (pmReadout *readout);
 pmLumFunc        *psastroLuminosityFunction (psArray *stars, pmLumFunc *rawFunc);
@@ -121 +121 @@
 bool              psastroDumpCorners (char *filenameU, char *filenameD, pmFPA *fpa);
 
+char             *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config, const char *source);
 
 psArray          *psastroReadGetstarCatalog (psFits *fits);
@@ -133 +134 @@
 bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, pmFPA *fpa, psMetadata *recipe);
 
+// psastroExtract functions
+bool psastroExtractAnalysis (pmConfig *config);
+psImage *psastroExtractStar (psImage *input, float x, float y, float dX, float dY);
+bool psastroExtractParseCamera (pmConfig *config);
+bool psastroExtractDataLoad (pmConfig *config);
+pmConfig *psastroExtractArguments (int argc, char **argv);
+
 ///@}
 # endif /* PSASTRO_H */

branches/eam_branches/eam_branch_20090312/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;
 }

branches/eam_branches/eam_branch_20090312/psastro/src/psastroChooseRefstars.c

@@ -20 +20 @@
 }
 
-bool psastroChooseRefstars (pmConfig *config, psArray *refs) {
+bool psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source) {
 
     bool status;
@@ -35 +35 @@
 
     // select the input data sources
-    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, source);
     if (!input) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find input data!\n");

branches/eam_branches/eam_branch_20090312/psastro/src/psastroLoadRefstars.c

@@ -14 +14 @@
 # define ELIXIR_MODE 1
 
-char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config);
-
-psArray *psastroLoadRefstars (pmConfig *config) {
+psArray *psastroLoadRefstars (pmConfig *config, const char *source) {
 
     int fd;
@@ -69 +67 @@
     float minMag;
     float maxRho;
-    char *photcode = psastroSetMagLimit (&minMag, &maxRho, config);
+    char *photcode = psastroSetMagLimit (&minMag, &maxRho, config, source);
     PS_ASSERT (photcode, NULL);
 
@@ -240 +238 @@
   goto escape; }
 
-char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config) {
+char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config, const char *source) {
 
     bool status;
@@ -249 +247 @@
 
     // select the input data sources
-    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, source);
     if (!input) {
         psLogMsg ("psastro", PS_LOG_DETAIL, "no supplied reference header data");