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

Timestamp:

Sep 22, 2007, 3:47:28 AM (19 years ago)

Author:

eugene

Message:

fix compilation issues re pmTrend for psf parameters

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 02:20:11 $
+ *  @version $Revision: 1.2.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-22 13:47:28 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -14 +14 @@
 #endif
 
+# include <strings.h>
 # include <pslib.h>
 # include "pmTrend2D.h"
@@ -85 +86 @@
         for (int nx = 0; nx < trend->poly->nX + 1; nx++) {
             for (int ny = 0; ny < trend->poly->nY + 1; ny++) {
-                trend->poly->mask[nx][ny] = XXX;
+                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;
+                }
             }
         }
@@ -181 +186 @@
 
 psString pmTrend2DModeToString (pmTrend2DMode mode) {
+    
+    psString name;
 
     switch (mode) {
       case PM_TREND_NONE:
-        psString name = psStringCopy ("NONE");
-        break;
-      case PM_TREND_POLY_ORD:
-        psString name = psStringCopy ("POLY_ORD");
-        break;
-      case PM_TREND_POLY_CHEB:
-        psString name = psStringCopy ("POLY_CHEB");
-        break;
-      case PM_TREND_MAP:
-        psString name = psStringCopy ("MAP");
+        name = psStringCopy ("NONE");
+        break;
+      case PM_TREND_POLY_ORD:
+        name = psStringCopy ("POLY_ORD");
+        break;
+      case PM_TREND_POLY_CHEB:
+        name = psStringCopy ("POLY_CHEB");
+        break;
+      case PM_TREND_MAP:
+        name = psStringCopy ("MAP");
         break;
       default: