Changeset 33085

Timestamp:

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

Author:

eugene

Message:

adding MODEL_VAR option for psf-fit weighting

Location:

branches/eam_branches/ipp-20111122/psModules/src/objects

Files:

• pmModelFuncs.h (modified) (1 diff)
• pmSource.c (modified) (9 diffs)
• pmSourcePhotometry.c (modified) (7 diffs)
• pmSourcePhotometry.h (modified) (1 diff)

branches/eam_branches/ipp-20111122/psModules/src/objects/pmModelFuncs.h

@@ -46 +46 @@
 
 typedef enum {
-    PM_MODEL_OP_NONE    = 0x00,
-    PM_MODEL_OP_FUNC    = 0x01,
-    PM_MODEL_OP_RES0    = 0x02,
-    PM_MODEL_OP_RES1    = 0x04,
-    PM_MODEL_OP_FULL    = 0x07,
-    PM_MODEL_OP_SKY     = 0x08,
-    PM_MODEL_OP_CENTER  = 0x10,
-    PM_MODEL_OP_NORM    = 0x20,
-    PM_MODEL_OP_NOISE   = 0x40,
+    PM_MODEL_OP_NONE     = 0x00,
+    PM_MODEL_OP_FUNC     = 0x01,
+    PM_MODEL_OP_RES0     = 0x02,
+    PM_MODEL_OP_RES1     = 0x04,
+    PM_MODEL_OP_FULL     = 0x07,
+    PM_MODEL_OP_SKY      = 0x08,
+    PM_MODEL_OP_CENTER   = 0x10,
+    PM_MODEL_OP_NORM     = 0x20,
+    PM_MODEL_OP_NOISE    = 0x40,
+    PM_MODEL_OP_MODELVAR = 0x80,
 } pmModelOpMode;
 

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

@@ -50 +50 @@
     psFree(tmp->pixels);
     psFree(tmp->variance);
+    psFree(tmp->modelVar);
     psFree(tmp->maskObj);
     psFree(tmp->maskView);
@@ -76 +77 @@
     psFree (source->pixels);
     psFree (source->variance);
+    psFree (source->modelVar);
     psFree (source->maskObj);
     psFree (source->maskView);
@@ -83 +85 @@
     source->pixels = NULL;
     source->variance = NULL;
+    source->modelVar = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -112 +115 @@
     source->pixels = NULL;
     source->variance = NULL;
+    source->modelVar = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -197 +201 @@
     source->pixels   = in->pixels   ? psImageCopyView(NULL, in->pixels)   : NULL;
     source->variance = in->variance ? psImageCopyView(NULL, in->variance) : NULL;
+    source->modelVar = in->modelVar ? psImageCopyView(NULL, in->modelVar) : NULL;
     source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 
@@ -1025 +1030 @@
 
     bool addNoise = mode & PM_MODEL_OP_NOISE;
+    bool addModelVar = mode & PM_MODEL_OP_MODELVAR;
+
+    if (addModelVar) psAssert (source->modelVar, "programming error");
 
     // require the use of pmModelAddWithOffset if we are adding noise (because the model size and norm are rescaled)
@@ -1047 +1055 @@
         }
 
-        psF32 **target = source->pixels->data.F32;
+        psF32 **target = addModelVar ? source->modelVar->data.F32 : source->pixels->data.F32;
 
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
@@ -1062 +1070 @@
             }
         }
-        if (add) {
-            source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
-        } else {
-            source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+        if (!addModelVar) {
+            if (add) {
+                source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+            } else {
+                source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+            }
         }
         return true;
@@ -1074 +1084 @@
         target = source->variance;
     }
+    if (addModelVar) {
+        target = source->modelVar;
+    }
 
     if (add) {
         status = pmModelAddWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
-        source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+        if (!addNoise && !addModelVar) source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
     } else {
         status = pmModelSubWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
-        source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+        if (!addNoise && !addModelVar) source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
     }
 

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

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

@@ -39 +39 @@
 
 typedef enum {
+    PM_SOURCE_PHOTFIT_NONE,
     PM_SOURCE_PHOTFIT_CONST,
     PM_SOURCE_PHOTFIT_IMAGE_VAR,