Changeset 9594 for trunk/psModules/src/objects

Timestamp:

Oct 16, 2006, 4:21:03 PM (20 years ago)

Author:

Paul Price

Message:

Documenting pmFPAMaskWeight.[ch]. Moving NOT_U8 and NOT_U16 macros into psLib (and renamed with PS_ prefix). Updating other files that use these macros so that they compile.

Location:

trunk/psModules/src/objects

Files:

• pmPSFtry.c (modified) (3 diffs)
• pmSourcePhotometry.c (modified) (2 diffs)
• pmSourceSky.c (modified) (3 diffs)

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-14 00:56:37 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-17 02:21:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121 +121 @@
         psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
         status = pmSourceFitModel (source, model, PM_SOURCE_FIT_EXT);
-        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", NOT_U8(PM_MASK_MARK));
+        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 
         // exclude the poor fits
@@ -183 +183 @@
 
 next_source:
-        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", NOT_U8(PM_MASK_MARK));
+        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 
     }

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:29:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-17 02:21:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
 
     // unmask aperture
-    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
+    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
 
     // subtract object, leave local sky

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-17 02:21:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
     psStats *myStats = psStatsAlloc(statsOptions);
     myStats = psImageStats(myStats, image, mask, 0xff);
-    psImageMaskRegion(mask, srcRegion, "AND", NOT_U8(PM_MASK_MARK));
+    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(PM_MASK_MARK));
     double value = psStatsGetValue(myStats, statistic);
     psFree(myStats);
@@ -117 +117 @@
     psStats *myStats = psStatsAlloc(statsOptions);
     myStats = psImageStats(myStats, image, mask, 0xff);
-    psImageMaskRegion(mask, srcRegion, "AND", NOT_U8(PM_MASK_MARK));
+    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(PM_MASK_MARK));
     double value = psStatsGetValue(myStats, statistic);
     psFree(myStats);