Changeset 30118 for branches/czw_branch/20101203/psphot/src/psphotGuessModels.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotGuessModels.c (modified) (2 diffs)

branches/czw_branch/20101203/psphot/src/psphotGuessModels.c

@@ -12 +12 @@
     bool status = true;
 
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, filerule);
 
     // skip the chisq image (optionally?)
@@ -207 +206 @@
             float Xc = 0.5*readout->image->numCols;
             float Yc = 0.5*readout->image->numRows;
-            pmModel *modelPSF = pmModelFromPSFforXY(psf, Xc, Yc, Io);
+            modelPSF = pmModelFromPSFforXY(psf, Xc, Yc, Io);
             if (modelPSF == NULL) {
                 psError(PSPHOT_ERR_PSF, false, "Failed to determine PSF model at center of image");