Changeset 6848 for branches/rel10_ifa/psModules/src/objects/pmPSF.c

Timestamp:

Apr 12, 2006, 8:18:46 PM (20 years ago)

Author:

magnier

Message:

additions to objects for further flexibility with options

File:

• branches/rel10_ifa/psModules/src/objects/pmPSF.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/objects/pmPSF.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4.4.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-10 20:21:36 $
+ *  @version $Revision: 1.4.4.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-13 06:18:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
  Object Normalization
  *****************************************************************************/
-pmPSF *pmPSFAlloc (pmModelType type)
+pmPSF *pmPSFAlloc (pmModelType type, bool poissonErrors)
 {
     int Nparams;
@@ -92 +92 @@
     psf->skyBias  = 0.0;
     psf->skySat   = 0.0;
+    psf->poissonErrors = poissonErrors;
 
     // the ApTrend components are (x, y, r2rflux, flux)
@@ -97 +98 @@
     pmPSF_MaskApTrend (psf, PM_PSF_SKYBIAS);
 
-    if (PM_PSF_POISSON_WEIGHTS) {
+    if (psf->poissonErrors) {
         psf->ChiTrend = psPolynomial1DAlloc (PS_POLYNOMIAL_ORD, 1);
     } else {
@@ -319 +320 @@
     psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_MODEL_NAME", PS_DATA_STRING, "PSF model name", modelName);
 
+    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_POISSON_ERRORS", PS_DATA_BOOL, "Poisson errors for fits", psf->poissonErrors);
+
     int nPar = pmModelParameterCount (psf->type)    ;
     psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_MODEL_NPAR", PS_DATA_S32, "PSF model parameter count", nPar);
@@ -347 +350 @@
     pmModelType type = pmModelSetType (modelName);
 
-    pmPSF *psf = pmPSFAlloc (type);
+    bool poissonErrors = psMetadataLookupPtr (&status, metadata, "PSF_POISSON_ERRORS");
+    if (!status)
+        poissonErrors = true;
+
+    pmPSF *psf = pmPSFAlloc (type, poissonErrors);
 
     int nPar = psMetadataLookupS32 (&status, metadata, "PSF_MODEL_NPAR");