Changeset 33085 for branches/eam_branches/ipp-20111122/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Jan 11, 2012, 6:56:47 AM (15 years ago)

Author:

eugene

Message:

adding MODEL_VAR option for psf-fit weighting

File:

• branches/eam_branches/ipp-20111122/psModules/src/objects/pmSourcePhotometry.c (modified) (7 diffs)

branches/eam_branches/ipp-20111122/psModules/src/objects/pmSourcePhotometry.c

@@ -903 +903 @@
 {
     PS_ASSERT_PTR_NON_NULL(Mi, NAN);
-    double flux = 0, wt = 0, factor = 0;
+    double flux = 0, wt = 1.0, factor = 0;
 
     const psImage *Pi = Mi->modelFlux;
@@ -920 +920 @@
         psAssert (Wi, "programming error");
         break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
     }   
 
@@ -947 +949 @@
             }
 
-            if (unweighted_sum) {
-                flux += (factor * Pi->data.F32[yi][xi]);
-            } else {
-                flux += (factor * Pi->data.F32[yi][xi]) / wt;
-            }
+            // wt is 1.0 for CONST
+            flux += (factor * Pi->data.F32[yi][xi]) / wt;
         }
     }
@@ -984 +983 @@
         psAssert (Wi, "programming error");
         break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
     }   
 
@@ -1023 +1024 @@
                 wt = covarFactor * Wi->data.F32[yi][xi];
                 break;
+              case PM_SOURCE_PHOTFIT_NONE:
+                psAbort("programming error");
             }
             // skip pixels with nonsense weight values
@@ -1060 +1063 @@
         psAssert (Wi, "programming error");
         break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
     }   
 
@@ -1099 +1104 @@
                 wt = covarFactor * Wi->data.F32[yi][xi];
                 break;
+              case PM_SOURCE_PHOTFIT_NONE:
+                psAbort("programming error");
             }
             // skip pixels with nonsense weight values