Changeset 10077

Timestamp:

Nov 17, 2006, 11:52:14 PM (20 years ago)

Author:

magnier

Message:

added weight to ModelInit, set to sky variance

Location:

trunk/psModules/src/objects

Files:

• pmSourceFitModel.c (modified) (4 diffs)
• pmSourceFitModel.h (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-18 07:31:44 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-18 09:52:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 static psF32 PM_SOURCE_FIT_MODEL_NUM_ITERATIONS = 15;
 static psF32 PM_SOURCE_FIT_MODEL_TOLERANCE = 0.1;
+static psF32 PM_SOURCE_FIT_MODEL_WEIGHT = 1.0;
 static bool PM_PSF_POISSON_WEIGHTS = true;
 
-bool pmSourceFitModelInit (float nIter, float tol, bool poissonErrors)
+bool pmSourceFitModelInit (float nIter, float tol, float weight, bool poissonErrors)
 {
 
     PM_SOURCE_FIT_MODEL_NUM_ITERATIONS = nIter;
     PM_SOURCE_FIT_MODEL_TOLERANCE = tol;
+    PM_SOURCE_FIT_MODEL_WEIGHT = weight;
     PM_PSF_POISSON_WEIGHTS = poissonErrors;
 
@@ -54 +56 @@
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
-    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     PS_ASSERT_PTR_NON_NULL(source->mask, false);
@@ -334 +335 @@
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
-    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     PS_ASSERT_PTR_NON_NULL(source->mask, false);

trunk/psModules/src/objects/pmSourceFitModel.h

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-18 09:52:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
     float nIter,   ///< max number of allowed iterations
     float tol,      ///< convergence criterion
+    float weight,      ///< use this weight for constant-weight fits
     bool poissonErrors   // use poisson errors for fits?
 );