Changeset 21079 for branches/eam_branch_20081230/psModules/src/objects/pmPSFtry.c

Timestamp:

Jan 1, 2009, 7:13:00 PM (17 years ago)

Author:

eugene

Message:

convert mask references to abstract psImageMaskType and psVectorMaskType as needed

File:

• branches/eam_branch_20081230/psModules/src/objects/pmPSFtry.c (modified) (4 diffs)

branches/eam_branch_20081230/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.67.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-12-31 20:31:29 $
+ *  @version $Revision: 1.67.4.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-02 05:13:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -193 +193 @@
         // exclude the poor fits
         if (!status) {
-            psfTry->mask->data.PS_TYPE_IMAGE_MASK_DATA[i] = PSFTRY_MASK_EXT_FAIL;
+            psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] = PSFTRY_MASK_EXT_FAIL;
             psTrace ("psModules.objects", 4, "masking %d (%d,%d) : status is poor\n", i, source->peak->x, source->peak->y);
             continue;
@@ -283 +283 @@
     psVector *flux  = psVectorAlloc (psfTry->sources->n, PS_TYPE_F32);
     psVector *chisq = psVectorAlloc (psfTry->sources->n, PS_TYPE_F32);
-    psVector *mask  = psVectorAlloc (psfTry->sources->n, PS_TYPE_MASK);
+    psVector *mask  = psVectorAlloc (psfTry->sources->n, PS_TYPE_VECTOR_MASK);
 
     // generate the x and y vectors, and mask missing models
@@ -303 +303 @@
 
     // linear clipped fit of chisq trend vs flux
-    bool result = psVectorClipFitPolynomial1D(psfTry->psf->ChiTrend, options->stats, mask,
-                                              0xff, chisq, NULL, flux);
+    bool result = psVectorClipFitPolynomial1D(psfTry->psf->ChiTrend, options->stats, mask, 0xff, chisq, NULL, flux);
     psStatsOptions meanStat = psStatsMeanOption(options->stats->options); // Statistic for mean
     psStatsOptions stdevStat = psStatsStdevOption(options->stats->options); // Statistic for stdev