Changeset 6380

Timestamp:

Feb 7, 2006, 9:16:49 PM (20 years ago)

Author:

magnier

Message:

removed variables named "class", added typedef to pmPSFtryMaskValues

Location:

branches/eam_rel9_p0/psModules/src/objects

Files:

• pmObjects.c (modified) (4 diffs)
• pmObjects.h (modified) (3 diffs)
• pmPSFtry.h (modified) (2 diffs)

branches/eam_rel9_p0/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5.4.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-08 06:10:29 $
+ *  @version $Revision: 1.5.4.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 07:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
                     psS32 y,
                     psF32 counts,
-                    pmPeakType class)
+                    pmPeakType type)
 {
     psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
@@ -32 +32 @@
     tmp->y = y;
     tmp->counts = counts;
-    tmp->class = class;
+    tmp->type = type;
 
     psTrace(__func__, 3, "---- %s() end ----\n", __func__);
@@ -1206 +1206 @@
         pmSource *tmpSrc = (pmSource *) sources->data[i];
 
-        tmpSrc->peak->class = 0;
+        tmpSrc->peak->type = 0;
 
         psF32 sigX = tmpSrc->moments->Sx;

branches/eam_rel9_p0/psModules/src/objects/pmObjects.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4.4.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-22 21:12:20 $
+ *  @version $Revision: 1.4.4.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 07:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
     int y;                              ///< Y-coordinate of peak pixel.
     float counts;                       ///< Value of peak pixel (above sky?).
-    pmPeakType class;                   ///< Description of peak.
+    pmPeakType type;                   ///< Description of peak.
 }
 pmPeak;
@@ -219 +219 @@
     int y,    ///< Col-coordinate in image space
     float counts,   ///< The value of the peak pixel
-    pmPeakType class   ///< The type of peak pixel
+    pmPeakType type   ///< The type of peak pixel
 );
 

branches/eam_rel9_p0/psModules/src/objects/pmPSFtry.h

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2.4.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-15 18:23:13 $
+ *  @version $Revision: 1.2.4.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 07:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
  * 
  */
-enum {
+typedef enum {
     PSFTRY_MASK_CLEAR    = 0x00,        ///< Add comment.
     PSFTRY_MASK_OUTLIER  = 0x01,        ///< 1: outlier in psf polynomial fit (provided by psPolynomials)