Changeset 4954 for trunk/psphot/src/pspsf.c

Timestamp:

Sep 6, 2005, 5:33:01 PM (21 years ago)

Author:

eugene

Message:

psphot reorganization: merged in pmObjects code from psModule, modified to work with psLib 0.7.0

File:

• trunk/psphot/src/pspsf.c (modified) (5 diffs)

trunk/psphot/src/pspsf.c

@@ -31 +31 @@
     }
 
-    p_psMemSetDeallocator(psf, (psFreeFcn) pmPSFFree);
+    psMemSetDeallocator(psf, (psFreeFunc) pmPSFFree);
     return(psf);
 }
@@ -74 +74 @@
     }   
 
-    p_psMemSetDeallocator(test, (psFreeFcn) pmPSF_TestFree);
+    psMemSetDeallocator(test, (psFreeFunc) pmPSF_TestFree);
     return (test);
 }
@@ -106 +106 @@
         // set temporary object mask and fit object
         // fit model as FLT, not PSF
-        psImageKeepCircle (source->mask, x, y, RADIUS, OR, 0x80);
+        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PSPHOT_MASK_MARKED);
         status = pmSourceFitModel (source, model, false);
-        psImageKeepCircle (source->mask, x, y, RADIUS, AND, 0x7f);
+        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PSPHOT_MASK_MARKED);
 
         // exclude the poor fits
@@ -142 +142 @@
         y = source->peak->y;
 
-        psImageKeepCircle (source->mask, x, y, RADIUS, OR, 0x80);
+        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PSPHOT_MASK_MARKED);
         status = pmSourceFitModel (source, modelPSF, true);
 
@@ -168 +168 @@
 
     next_source:
-        psImageKeepCircle (source->mask, x, y, RADIUS, AND, 0x7f);
+        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PSPHOT_MASK_MARKED);
 
     }