Changeset 29455

Timestamp:

Oct 17, 2010, 9:21:18 AM (16 years ago)

Author:

eugene

Message:

fix valid flux limits

Location:

branches/eam_branches/ipp-20100823/psphot/src

Files:

• psphotFitSourcesLinear.c (modified) (1 diff)
• psphotFitSourcesLinearStack.c (modified) (2 diffs)

branches/eam_branches/ipp-20100823/psphot/src/psphotFitSourcesLinear.c

@@ -104 +104 @@
     float MIN_VALID_FLUX = psMetadataLookupF32(&status, recipe, "PSF_FIT_MIN_VALID_FLUX");
     if (!status) {
-        MIN_VALID_FLUX = 1e-8;
+        MIN_VALID_FLUX = 0.0;
     }
     float MAX_VALID_FLUX = psMetadataLookupF32(&status, recipe, "PSF_FIT_MAX_VALID_FLUX");

branches/eam_branches/ipp-20100823/psphot/src/psphotFitSourcesLinearStack.c

@@ -35 +35 @@
     bool CONSTANT_PHOTOMETRIC_WEIGHTS = psMetadataLookupBool(&status, recipe, "CONSTANT_PHOTOMETRIC_WEIGHTS");
     psAssert (status, "You must provide a value for the BOOL recipe CONSTANT_PHOTOMETRIC_WEIGHTS");
+
+    float MIN_VALID_FLUX = psMetadataLookupF32(&status, recipe, "PSF_FIT_MIN_VALID_FLUX");
+    if (!status) {
+        MIN_VALID_FLUX = 0.0;
+    }
+    float MAX_VALID_FLUX = psMetadataLookupF32(&status, recipe, "PSF_FIT_MAX_VALID_FLUX");
+    if (!status) {
+        MAX_VALID_FLUX = 1e+8;
+    }
 
     // XXX store a local static array of covar factors for each of the images (by image ID)
@@ -123 +132 @@
 
     psSparseConstraint constraint;
-    constraint.paramMin   = 0.0;
-    constraint.paramMax   = 1e8;
-    constraint.paramDelta = 1e8;
+    constraint.paramMin   = MIN_VALID_FLUX;
+    constraint.paramMax   = MAX_VALID_FLUX;
+    constraint.paramDelta = 1e7;
 
     // solve for normalization terms (need include local sky?)