Changeset 34049 for branches/eam_branches/ipp-20120601/psphot/src/psphotEfficiency.c

Timestamp:

Jun 20, 2012, 12:22:52 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotEfficiency.c (modified) (1 diff)

branches/eam_branches/ipp-20120601/psphot/src/psphotEfficiency.c

@@ -420 +420 @@
 
     // psphotFitSourcesLinearReadout subtracts the model fits
+# if (HAVE_MODEL_VAR)
     if (!psphotFitSourcesLinearReadout(recipe, readout, fakeSourcesAll, psf, true, PM_SOURCE_PHOTFIT_CONST)) {
+# else
+    if (!psphotFitSourcesLinearReadout(recipe, readout, fakeSourcesAll, psf, true)) {
+# endif
         psError(PS_ERR_UNKNOWN, false, "Unable to perform linear fit on fake sources.");
         psFree(fakeSources);