Changeset 30139

Timestamp:

Dec 21, 2010, 2:54:21 PM (15 years ago)

Author:

eugene

Message:

option to force pixel redefinition

Location:

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

Files:

• pmSource.c (modified) (3 diffs)
• pmSource.h (modified) (1 diff)

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

@@ -286 +286 @@
                             psF32 x,
                             psF32 y,
-                            psF32 Radius)
+                            psF32 Radius,
+                            bool force)
 {
     PS_ASSERT_PTR_NON_NULL(mySource, false);
@@ -300 +301 @@
     newRegion = psRegionForImage (readout->image, newRegion);
 
-    extend = false;
+    // re-define if (a) required externally (force = true) or (b) required internally
+    extend = force;
     extend |= (int)(newRegion.x0) < (int)(mySource->region.x0);
     extend |= (int)(newRegion.x1) > (int)(mySource->region.x1);
@@ -1020 +1022 @@
     }
 
-    if (!addNoise) {
-        if (add) {
-            status = pmModelAddWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
-            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 (add) {
+        status = pmModelAddWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
+        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;
     }
 

branches/eam_branches/ipp-20101205/psModules/src/objects/pmSource.h

@@ -159 +159 @@
     psF32 x,     ///< center coords of source
     psF32 y,      ///< center coords of source
-    psF32 Radius   ///< size of box on source
+    psF32 Radius,   ///< size of box on source
+    bool force      ///< guaranteed pixels are re-assigned
 );