Changeset 9564 for trunk/psModules/src/objects

Timestamp:

Oct 13, 2006, 2:56:37 PM (20 years ago)

Author:

magnier

Message:

support for psfTrendMask in pmPSFAlloc

Location:

trunk/psModules/src/objects

Files:

• pmPSFtry.c (modified) (6 diffs)
• pmPSFtry.h (modified) (3 diffs)

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:29:14 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:56:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 
 // allocate a pmPSFtry based on the desired sources and the model (identified by name)
-pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, bool poissonErrors)
+pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, bool poissonErrors, psPolynomial2D *psfTrendMask)
 {
 
@@ -64 +64 @@
     // XXX probably need to increment ref counter
     type           = pmModelSetType (modelName);
-    test->psf      = pmPSFAlloc (type, poissonErrors);
+    test->psf      = pmPSFAlloc (type, poissonErrors, psfTrendMask);
     test->sources  = psMemIncrRefCounter(sources);
     test->modelEXT = psArrayAlloc (sources->n);
@@ -95 +95 @@
 // mask values indicate the reason the source was rejected:
 
-pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors)
+pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask)
 {
     bool status;
@@ -105 +105 @@
     int Npsf = 0;
 
-    pmPSFtry *psfTry = pmPSFtryAlloc (sources, modelName, poissonErrors);
+    pmPSFtry *psfTry = pmPSFtryAlloc (sources, modelName, poissonErrors, psfTrendMask);
 
     // stage 1:  fit an independent model (freeModel) to all sources
@@ -280 +280 @@
     psLogMsg ("pmPSFtryMetric", 4, "fit stats: %f +/- %f\n", stats->sampleMedian, stats->sampleStdev);
 
-    pmPSF_MaskApTrend (psfTry->psf->ApTrend, PM_PSF_SKYBIAS);
+    pmPSFMaskApTrend (psfTry->psf->ApTrend, PM_PSF_APTREND_SKYBIAS);
     psfTry->psf->ApTrend->coeff[0][0][0][0] = poly->coeff[0];
     psfTry->psf->ApTrend->coeff[0][0][1][0] = 0;

trunk/psModules/src/objects/pmPSFtry.h

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 01:02:08 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:56:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -78 +78 @@
  * 
  */
-pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, bool poissonErrors);
+pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, bool poissonErrors, psPolynomial2D *psfTrendMask);
 
 /** pmPSFtryModel()
@@ -87 +87 @@
  * 
  */
-pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors);
+pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask);
 
 /** pmPSFtryMetric()