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

Timestamp:

Jan 9, 2012, 8:36:04 AM (15 years ago)

Author:

eugene

Message:

preparing to use model variance for fitting

File:

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

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

@@ -900 +900 @@
 }
 
-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);
@@ -907 +907 @@
     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;
+    }   
+
     const psImage *Ti = Mi->maskObj;
     assert (Ti != NULL);
@@ -916 +927 @@
     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;
             }
 
@@ -948 +957 @@
 }
 
-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);
@@ -963 +972 @@
     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;
+    }   
 
     const psImage *Ti = Mi->maskObj;
@@ -996 +1014 @@
                 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;
+            }
+            // skip pixels with nonsense weight values
+            if (wt <= 0) continue;
+
+            flux += value / wt;
         }
     }
@@ -1010 +1033 @@
 }
 
-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);
@@ -1025 +1048 @@
     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;
+    }   
 
     const psImage *Ti = Mi->maskObj;
@@ -1058 +1090 @@
                 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;
+            }
+            // skip pixels with nonsense weight values
+            if (wt <= 0) continue;
+
+            flux += value / wt;
+
         }
     }