Changeset 2675 for trunk/src/STGrid.cpp

Timestamp:

10/19/12 19:06:59 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4429

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

convSupport for gauss and gjinc is set to ceil of truncation
radius, which was round before.

File:

• trunk/src/STGrid.cpp (modified) (2 diffs)

trunk/src/STGrid.cpp

@@ -1812 +1812 @@
       }
     }      
-    convSupport_ = (Int)(truncate+0.5);
+    //convSupport_ = (Int)(truncate+0.5);
+    convSupport_ = (Int)(truncate);
+    convSupport_ += (((truncate-(Double)convSupport_) > 0.0) ? 1 : 0);
     Int convSize = convSampling_ * ( 2*convSupport_ + 2 ) ;
     convFunc.resize( convSize ) ;
@@ -1860 +1862 @@
       }
     }      
-    convSupport_ = (truncate >= 0.0) ? (Int)(truncate+0.5) : (Int)(2*pixelJW+0.5);
+    //convSupport_ = (truncate >= 0.0) ? (Int)(truncate+0.5) : (Int)(2*pixelJW+0.5);
+    Double convSupportF = (truncate >= 0.0) ? truncate : (2*pixelJW);
+    convSupport_ = (Int)convSupportF;
+    convSupport_ += (((convSupportF-(Double)convSupport_) > 0.0) ? 1 : 0);
     Int convSize = convSampling_ * ( 2*convSupport_ + 2 ) ;
     convFunc.resize( convSize ) ;