Changeset 19049

Timestamp:

Aug 12, 2008, 6:07:11 PM (18 years ago)

Author:

eugene

Message:

adding zero point calculation

Location:

trunk/psastro/src

Files:

• Makefile.am (modified) (1 diff)
• psastro.h (modified) (1 diff)
• psastroAnalysis.c (modified) (1 diff)
• psastroZeroPoint.c (modified) (4 diffs)

trunk/psastro/src/Makefile.am

@@ -67 +67 @@
         psastroMosaicSetAstrom.c    \
         psastroMosaicSetMatch.c     \
+        psastroZeroPoint.c          \
         psastroDemoDump.c           \
         psastroDemoPlot.c

trunk/psastro/src/psastro.h

@@ -97 +97 @@
 bool              psastroMetadataStats (pmConfig *config);
 
+bool psastroZeroPointReadout(psArray *rawstars, psArray *refstars, psArray *matches);
+bool psastroZeroPoint (pmConfig *config);
+
 # endif /* PSASTRO_H */

trunk/psastro/src/psastroAnalysis.c

@@ -79 +79 @@
     }
 
-    // psastroZeroPoint (rawstars, refstars, matches);
+    // psastroZeroPoint (config);
 
     // XXX how do we specify stack astrometry?

trunk/psastro/src/psastroZeroPoint.c

@@ -1 +1 @@
 # include "psastroInternal.h"
 
-bool GetZeroPoint(psArray *rawstars, psArray *refstars, psArray *matches);
+bool psastroZeroPointReadout(psArray *rawstars, psArray *refstars, psArray *matches);
 
 bool psastroZeroPoint (pmConfig *config) {
 
-    bool status;
     pmChip *chip = NULL;
     pmCell *cell = NULL;
     pmReadout *readout = NULL;
-    psArray *gradients = NULL;
 
     // select the current recipe
@@ -27 +25 @@
 
     pmFPAview *view = pmFPAviewAlloc (0);
+
+    // given the existing per-chip astrometry, determine matches between raw and ref stars
+    // is this needed? yes, if we didn't do SingleChip astrometry first
+    if (!psastroMosaicSetMatch (fpa, recipe, 0)) {
+        psError(PSASTRO_ERR_UNKNOWN, false, "failed to match raw and ref stars for mosaic");
+        return false;
+    }
 
     // this loop selects the matched stars for all chips
@@ -51 +56 @@
                 if (refstars == NULL) { continue; }
 
-                psArray *match = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
-                if (match == NULL) { continue; }
+                psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
+                if (matches == NULL) { continue; }
 
                 // calculate dMag for the matched stars
-                GetZeroPoint (rawstars, refstars, matches);
+                psastroZeroPointReadout (rawstars, refstars, matches);
             }
         }
@@ -65 +70 @@
 
 // XXX for now, let's just measure <dMag> and sigma_dMag
-bool GetZeroPoint(psArray *rawstars, psArray *refstars, psArray *matches) {
+bool psastroZeroPointReadout(psArray *rawstars, psArray *refstars, psArray *matches) {
 
     psVector *dMag  = psVectorAllocEmpty (100, PS_TYPE_F32);