Changeset 33963 for trunk/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

May 30, 2012, 1:46:12 PM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120405

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourcePhotometry.c (modified) (11 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -899 +899 @@
 }
 
-double pmSourceModelWeight(const pmSource *Mi, int term, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
+double pmSourceModelWeight(const pmSource *Mi, int term, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
 {
     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;
     assert (Pi != NULL);
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
+
+    const psImage *Wi = NULL;
+    switch (fitVarMode) {
+      case PM_SOURCE_PHOTFIT_CONST:
+        break;
+      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+        Wi = Mi->variance;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+        Wi = Mi->modelVar;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
+    }   
+
     const psImage *Ti = Mi->maskObj;
     assert (Ti != NULL);
@@ -915 +928 @@
     for (int yi = 0; yi < Pi->numRows; yi++) {
         for (int xi = 0; xi < Pi->numCols; xi++) {
-            if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal)
-                continue;
-            if (!unweighted_sum) {
+            if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal) continue;
+            if (fitVarMode != PM_SOURCE_PHOTFIT_CONST) {
                 wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt == 0)
-                    continue;
+                if (wt == 0) continue;
             }
 
@@ -937 +948 @@
             }
 
-            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;
         }
     }
@@ -947 +955 @@
 }
 
-double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
+double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(Mi, NAN);
@@ -955 +963 @@
     int xIs, xJs, yIs, yJs;
     int xIe, yIe;
-    double flux, wt;
+    double flux;
+    double wt = 1.0;
 
     const psImage *Pi = Mi->modelFlux;
@@ -962 +971 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
+    const psImage *Wi = NULL;
+    switch (fitVarMode) {
+      case PM_SOURCE_PHOTFIT_CONST:
+        break;
+      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+        Wi = Mi->variance;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+        Wi = Mi->modelVar;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
+    }   
 
     const psImage *Ti = Mi->maskObj;
@@ -995 +1015 @@
                 continue;
 
-            // XXX skip the nonsense weight pixels?
-            if (unweighted_sum) {
-                flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
-            } else {
+            float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
+            switch (fitVarMode) {
+              case PM_SOURCE_PHOTFIT_CONST:
+                wt = 1.0;
+                break;
+              case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+              case PM_SOURCE_PHOTFIT_MODEL_VAR:
                 wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt > 0) {
-                    flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]) / wt;
-                }
-            }
+                break;
+              case PM_SOURCE_PHOTFIT_NONE:
+                psAbort("programming error");
+            }
+            // skip pixels with nonsense weight values
+            if (wt <= 0) continue;
+
+            flux += value / wt;
         }
     }
@@ -1009 +1036 @@
 }
 
-double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
+double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(Mi, NAN);
@@ -1017 +1044 @@
     int xIs, xJs, yIs, yJs;
     int xIe, yIe;
-    double flux, wt;
+    double flux;
+    double wt = 1.0;
 
     const psImage *Pi = Mi->pixels;
@@ -1024 +1052 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
+    const psImage *Wi = NULL;
+    switch (fitVarMode) {
+      case PM_SOURCE_PHOTFIT_CONST:
+        break;
+      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+        Wi = Mi->variance;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+        Wi = Mi->modelVar;
+        psAssert (Wi, "programming error");
+        break;
+      case PM_SOURCE_PHOTFIT_NONE:
+        psAbort("programming error");
+    }   
 
     const psImage *Ti = Mi->maskObj;
@@ -1057 +1096 @@
                 continue;
 
-            // XXX skip the nonsense weight pixels?
-            if (unweighted_sum) {
-                flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
-            } else {
+            float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
+            switch (fitVarMode) {
+              case PM_SOURCE_PHOTFIT_CONST:
+                wt = 1.0;
+                break;
+              case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+              case PM_SOURCE_PHOTFIT_MODEL_VAR:
                 wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt > 0) {
-                    flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]) / wt;
-                }
-            }
+                break;
+              case PM_SOURCE_PHOTFIT_NONE:
+                psAbort("programming error");
+            }
+            // skip pixels with nonsense weight values
+            if (wt <= 0) continue;
+
+            flux += value / wt;
+
         }
     }