Changeset 14911

Timestamp:

Sep 20, 2007, 9:21:13 AM (19 years ago)

Author:

magnier

Message:

use psImageMapClipFit in psTrend2DFit

File:

• branches/eam_branch_20070830/psModules/src/objects/pmTrend2D.c (modified) (6 diffs)

branches/eam_branch_20070830/psModules/src/objects/pmTrend2D.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:24:34 $
+ *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-20 19:21:13 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -30 +30 @@
 pmTrend2D *pmTrend2DAlloc (pmTrend2DMode mode, psImage *image, int nXtrend, int nYtrend, psStats *stats)
 {
+    assert (image);
+    assert (stats);
+
     pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
     psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
@@ -50 +53 @@
           // binning defines the map scale relationship
           psImageBinning *binning = psImageBinningAlloc();
+          binning->nXruff = nXtrend;
+          binning->nYruff = nYtrend;
           binning->nXfine = image->numCols;
           binning->nYfine = image->numRows;
-          binning->nXruff = nXtrend;
-          binning->nYruff = nYtrend;
 
           trend->map = psImageMapAlloc (image, binning, stats);
@@ -104 +107 @@
 }
 
-bool pmTrend2DFit (pmTrend2D *trend, psVector *x, psVector *y, psVector *f, psVector *df) {
+bool pmTrend2DFit (pmTrend2D *trend, psVector *mask, psMaskType maskVal, psVector *x, psVector *y, psVector *f, psVector *df) {
 
     bool status;
-
-    psVector *mask = psVectorAlloc (x->n, PS_TYPE_MASK);
 
     switch (trend->mode) {
       case PM_TREND_POLY_ORD:
       case PM_TREND_POLY_CHEB:
-        status = psVectorClipFitPolynomial2D (trend->poly, trend->stats, mask, 0xff, f, df, x, y);
+        status = psVectorClipFitPolynomial2D (trend->poly, trend->stats, mask, maskVal, f, df, x, y);
         // we can use the API here which adjusts the polynomial order based on the number
         // of points in the image, and potentially based on the fractional range of the
@@ -121 +122 @@
       case PM_TREND_MAP:
         // XXX supply fraction from trend elements
-        status = psImageMapGenerateScale (trend->map, x, y, f, df, 0.1);
+        // XXX need to add the API which adjusts the scale
+        status = psImageMapClipFit (trend->map, trend->stats, mask, maskVal, x, y, f, df);
         break;
 
@@ -127 +129 @@
         psAbort ("error");
     }
-    psFree (mask);
     return status;
 }