Changeset 14989 for branches/eam_branch_20070921/psModules/src/objects/pmTrend2D.c

Timestamp:

Sep 23, 2007, 5:00:44 PM (19 years ago)

Author:

eugene

Message:

converted pmPSF to use pmTrend2D to represent psf parameters; updated PSF I/O to handle full pmTrend2D

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 13:47:28 $
+ *  @version $Revision: 1.2.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 03:00:44 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -32 +32 @@
 {
     assert (image);
-    assert (stats);
-
-    pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
-    psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
-
-    trend->map = NULL;
-    trend->poly = NULL;
-    trend->stats = psMemIncrRefCounter (stats);
-    trend->mode = mode;
-        
-    switch (mode) {
-      case PM_TREND_POLY_ORD:
-        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_ORD, nXtrend, nYtrend);
-        break;
-
-      case PM_TREND_POLY_CHEB:
-        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_CHEB, nXtrend, nYtrend);
-        break;
-
-      case PM_TREND_MAP: {
-          // binning defines the map scale relationship
-          psImageBinning *binning = psImageBinningAlloc();
-          binning->nXruff = nXtrend;
-          binning->nYruff = nYtrend;
-          binning->nXfine = image->numCols;
-          binning->nYfine = image->numRows;
-
-          trend->map = psImageMapAlloc (image, binning, stats);
-          psFree (binning);
-          break;
-      }
-
-      default:
-        psAbort ("error");
-    }
-    return (trend);
-}
-
-pmTrend2D *pmTrend2DFieldAlloc (pmTrend2DMode mode, int nXfield, int nYfield, int nXtrend, int nYtrend, psStats *stats)
-{
+
     pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
     psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
@@ -102 +63 @@
           // binning defines the map scale relationship
           psImageBinning *binning = psImageBinningAlloc();
+          binning->nXruff = nXtrend;
+          binning->nYruff = nYtrend;
+          binning->nXfine = image->numCols;
+          binning->nYfine = image->numRows;
+
+          trend->map = psImageMapAlloc (image, binning, stats);
+          psFree (binning);
+          break;
+      }
+
+      default:
+        psAbort ("error");
+    }
+    return (trend);
+}
+
+pmTrend2D *pmTrend2DNoImageAlloc (pmTrend2DMode mode, psImageBinning *binning, psStats *stats)
+{
+    pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
+    psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
+
+    trend->map = NULL;
+    trend->poly = NULL;
+    trend->stats = psMemIncrRefCounter (stats);
+    trend->mode = mode;
+        
+    switch (mode) {
+      case PM_TREND_POLY_ORD:
+        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_ORD, binning->nXruff, binning->nYruff);
+        // set masking somehow
+        for (int nx = 0; nx < trend->poly->nX + 1; nx++) {
+            for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
+                if (nx + ny >= PS_MAX (trend->poly->nX, trend->poly->nY) + 1) {
+                    trend->poly->mask[nx][ny] = 1;
+                } else {
+                    trend->poly->mask[nx][ny] = 0;
+                }
+            }
+        }
+        break;
+
+      case PM_TREND_POLY_CHEB:
+        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_CHEB, binning->nXruff, binning->nYruff);
+        break;
+
+      case PM_TREND_MAP: {
+          // binning defines the map scale relationship
+          trend->map = psImageMapNoImageAlloc (binning, stats);
+          break;
+      }
+
+      default:
+        psAbort ("error");
+    }
+    return (trend);
+}
+
+pmTrend2D *pmTrend2DFieldAlloc (pmTrend2DMode mode, int nXfield, int nYfield, int nXtrend, int nYtrend, psStats *stats)
+{
+    pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
+    psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
+
+    trend->map = NULL;
+    trend->poly = NULL;
+    trend->stats = psMemIncrRefCounter (stats);
+    trend->mode = mode;
+        
+    switch (mode) {
+      case PM_TREND_POLY_ORD:
+        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_ORD, nXtrend, nYtrend);
+        // set masking somehow
+        for (int nx = 0; nx < trend->poly->nX + 1; nx++) {
+            for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
+                if (nx + ny >= PS_MAX (trend->poly->nX, trend->poly->nY) + 1) {
+                    trend->poly->mask[nx][ny] = 1;
+                } else {
+                    trend->poly->mask[nx][ny] = 0;
+                }
+            }
+        }
+        break;
+
+      case PM_TREND_POLY_CHEB:
+        trend->poly = psPolynomial2DAlloc (PS_POLYNOMIAL_CHEB, nXtrend, nYtrend);
+        break;
+
+      case PM_TREND_MAP: {
+          // binning defines the map scale relationship
+          psImageBinning *binning = psImageBinningAlloc();
           binning->nXfine = nXfield;
           binning->nYfine = nYfield;
@@ -122 +172 @@
     bool status;
 
+    assert (trend);
+    assert (x);
+    assert (y);
+    assert (f);
+
     switch (trend->mode) {
       case PM_TREND_POLY_ORD:
@@ -147 +202 @@
     double result;
 
-    if (!trend) return 0.0;
+    assert (trend);
 
     switch (trend->mode) {
@@ -168 +223 @@
 
     psVector *result;
+
+    assert (trend);
+    assert (x);
+    assert (y);
 
     switch (trend->mode) {