Changeset 24650

Timestamp:

Jul 2, 2009, 3:41:27 PM (17 years ago)

Author:

eugene

Message:

get max mag based on filter (psastroZeroPointFromRecipe); drop excess verbosity

File:

• trunk/psastro/src/psastroLoadGhosts.c (modified) (4 diffs)

trunk/psastro/src/psastroLoadGhosts.c

@@ -46 +46 @@
     pmCell *cell = NULL;
     pmReadout *readout = NULL;
-    float zeropt, exptime;
+    float zeropt, exptime, MAX_MAG;
     psMetadata *md = NULL;
     psPolynomial2D *centerX = NULL;
@@ -71 +71 @@
     if (!strcasecmp(ghostFile, "NONE")) return true;
 
-    double MAX_MAG = psMetadataLookupF32 (&status, recipe, "GHOST_MAX_MAG");
-
     if (!pmConfigFileRead (&ghostModel, ghostFile, "GHOST MODEL")) {
         psError(PSASTRO_ERR_CONFIG, true, "Trouble loading ghost model");
@@ -97 +95 @@
 
     // really error-out here?  or just skip?
-    if (!psastroZeroPointFromRecipe (&zeropt, &exptime, fpa, recipe)) {
+    if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, fpa, recipe)) {
         psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe");
         goto escape;
@@ -162 +160 @@
                     // which encompass the full size of the ghost
                     pmChip *ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, -ghost->srcFP->x, -ghost->srcFP->y);
-                    fprintf (stderr, "raw chip position: %f, %f ", ghost->chip->x, ghost->chip->y);
+                    // fprintf (stderr, "raw chip position: %f, %f ", ghost->chip->x, ghost->chip->y);
 
                     ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, ghost->FP->x, ghost->FP->y);
-                    fprintf (stderr, "-> model chip position: %f, %f\n", ghost->chip->x, ghost->chip->y);
+                    // fprintf (stderr, "-> model chip position: %f, %f\n", ghost->chip->x, ghost->chip->y);
 
                     if (!ghostChip) goto skip;