Changeset 33963 for trunk/psModules/src/objects/pmSource.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/pmSource.c (modified) (9 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -51 +51 @@
     psFree(tmp->pixels);
     psFree(tmp->variance);
+    psFree(tmp->modelVar);
     psFree(tmp->maskObj);
     psFree(tmp->maskView);
@@ -77 +78 @@
     psFree (source->pixels);
     psFree (source->variance);
+    psFree (source->modelVar);
     psFree (source->maskObj);
     psFree (source->maskView);
@@ -84 +86 @@
     source->pixels = NULL;
     source->variance = NULL;
+    source->modelVar = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -113 +116 @@
     source->pixels = NULL;
     source->variance = NULL;
+    source->modelVar = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -200 +204 @@
     source->pixels   = in->pixels   ? psImageCopyView(NULL, in->pixels)   : NULL;
     source->variance = in->variance ? psImageCopyView(NULL, in->variance) : NULL;
+    source->modelVar = NULL;
     source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 
@@ -1028 +1033 @@
 
     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)
@@ -1050 +1058 @@
         }
 
-        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++) {
@@ -1065 +1073 @@
             }
         }
-        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;
@@ -1077 +1087 @@
         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;
     }