Changeset 25819 for trunk/psModules/src/objects/pmPSFtryModel.c

Timestamp:

Oct 9, 2009, 9:53:26 AM (17 years ago)

Author:

Paul Price

Message:

Require psfTrendNx and psfTrendNy to be >= 1.

File:

• trunk/psModules/src/objects/pmPSFtryModel.c (modified) (2 diffs)

trunk/psModules/src/objects/pmPSFtryModel.c

@@ -72 +72 @@
     }
 
-    int orderMin = (options->psfTrendMode == PM_TREND_MAP) ? 1 : 0;
+    // XXX set the min number of needed source more carefully (depends on psfTrendMode?)
     int orderMax = PS_MAX (options->psfTrendNx, options->psfTrendNy);
-
-    // XXX set the min number of needed source more carefully (depends on psfTrendMode?)
     if ((sources->n < 15) && (orderMax >= 3)) orderMax = 2;
     if ((sources->n < 11) && (orderMax >= 2)) orderMax = 1;
@@ -83 +81 @@
         return NULL;
     }
-    orderMin = PS_MIN(orderMin, orderMax);
+
+    int orderMin;
+    if (options->psfTrendMode == PM_TREND_MAP) {
+        orderMin = 1;
+        orderMax = PS_MAX(orderMax, 1);
+    } else {
+        orderMin = 0;
+    }
 
     // save the raw source mask (generated by pmPSFtryFitEXT)