Changeset 30108

Timestamp:

Dec 17, 2010, 10:08:59 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101205/psphot

Files:

• . (modified) (1 prop)
• src/psphotApResid.c (modified) (1 prop)
• src/psphotChoosePSF.c (modified) (1 diff)
• src/psphotGuessModels.c (modified) (1 diff)
• src/psphotMakeFluxScale.c (modified) (1 prop)

branches/eam_branches/ipp-20101205/psphot/src/psphotChoosePSF.c

@@ -249 +249 @@
         if (!try) {
             // No big deal --- we'll try another model
-            psErrorClear();
+            if (i < modelNames->n - 1) {
+                psErrorClear();
+            }
             continue;
         }

branches/eam_branches/ipp-20101205/psphot/src/psphotGuessModels.c

@@ -206 +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");