Changeset 6571 for trunk/psphot/src/psphotModelTest.c

Timestamp:

Mar 11, 2006, 5:27:13 PM (20 years ago)

Author:

eugene

Message:

major revisions to use the new pmFPAfile,view I/O handling

File:

• trunk/psphot/src/psphotModelTest.c (modified) (7 diffs)

trunk/psphot/src/psphotModelTest.c

@@ -3 +3 @@
 static char DEFAULT_MODE[] = "EXT";
 
-bool psphotModelTest (pmReadout *readout, psMetadata *arguments, psMetadata *recipe) {
+bool psphotModelTest (pmReadout *readout, recipe) {
 
     bool status;
@@ -15 +15 @@
 
     // run model fitting tests on a single source
-    if (!psMetadataLookupBool (&status, arguments, "TEST_FIT")) return false;
+    if (!psMetadataLookupBool (&status, recipe, "TEST_FIT")) return false;
 
     // what fitting mode to use?
-    char *psfModeWord = psMetadataLookupStr (&status, arguments, "TEST_FIT_MODE");
+    char *psfModeWord = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODE");
     if (!status) {
         psfModeWord = DEFAULT_MODE;
@@ -33 +33 @@
     } else {
         // find the model: supplied by user or first in the PSF_MODEL list
-        char *modelName  = psMetadataLookupStr (&status, arguments, "TEST_FIT_MODEL");
+        char *modelName  = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODEL");
         if (modelName == NULL) {
             // get the list pointers for the PSF_MODEL entries
@@ -57 +57 @@
 
     // find the fitting parameters (try test values first)
-    float INNER = psMetadataLookupF32 (&status, arguments, "TEST_FIT_INNER_RADIUS");
+    float INNER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_INNER_RADIUS");
     if (!status) {
         INNER = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS");
     }
 
-    float OUTER = psMetadataLookupF32 (&status, arguments, "TEST_FIT_OUTER_RADIUS");
+    float OUTER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_OUTER_RADIUS");
     if (!status) {
         OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS");
     }
 
-    float RADIUS = psMetadataLookupF32 (&status, arguments, "TEST_FIT_RADIUS");
+    float RADIUS = psMetadataLookupF32 (&status, recipe, "TEST_FIT_RADIUS");
     if (!status) {
         RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS");
     }
 
-    float mRADIUS = psMetadataLookupF32 (&status, arguments, "TEST_MOMENTS_RADIUS");
+    float mRADIUS = psMetadataLookupF32 (&status, recipe, "TEST_MOMENTS_RADIUS");
     if (!status) {
         mRADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
@@ -78 +78 @@
 
     // define the source of interest
-    float xObj     = psMetadataLookupF32 (&status, arguments, "TEST_FIT_X");
-    float yObj     = psMetadataLookupF32 (&status, arguments, "TEST_FIT_Y");
+    float xObj     = psMetadataLookupF32 (&status, recipe, "TEST_FIT_X");
+    float yObj     = psMetadataLookupF32 (&status, recipe, "TEST_FIT_Y");
 
     // construct the source structures
@@ -120 +120 @@
         }
         sprintf (name, "TEST_FIT_PAR%d", i);
-        value = psMetadataLookupF32 (&status, arguments, name);
+        value = psMetadataLookupF32 (&status, recipe, name);
         if (status) {
             params[i] = value;
@@ -154 +154 @@
     psImageKeepCircle (source->mask, xObj, yObj, RADIUS, "OR", PSPHOT_MASK_MARKED);
 
-    char *fitset = psMetadataLookupStr (&status, arguments, "TEST_FIT_SET");
+    char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET");
     if (status) {
         status = psphotFitSet (source, model, fitset, psfMode);