Changeset 2675 for trunk/src

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.

Location:

trunk/src

Files:

• STFitter.cpp (modified) (2 diffs)
• STGrid.cpp (modified) (2 diffs)

trunk/src/STFitter.cpp

@@ -38 +38 @@
 #include <scimath/Functionals/CompoundFunction.h>
 #include <scimath/Functionals/Gaussian1D.h>
-#include <scimath/Functionals/Lorentzian1D.h>
+//#include <scimath/Functionals/Lorentzian1D.h>
+#include "Lorentzian1D.h"
 #include <scimath/Functionals/Sinusoid1D.h>
 #include <scimath/Functionals/Polynomial.h>
@@ -117 +118 @@
   Gaussian1D<Float>* g = 0;
   for (uInt i=0; i<n;i++) {
-    g = dynamic_cast<Gaussian1D<Float>* >(funcs_[i]);
-    if (g) {
-      const GaussianSpectralElement *gauss = 
-        dynamic_cast<const GaussianSpectralElement *>(listGauss[i]) ;
-      (*g)[0] = gauss->getAmpl();
-      (*g)[1] = gauss->getCenter();
-      (*g)[2] = gauss->getFWHM();     
-      /*
-      (*g)[0] = listGauss[i].getAmpl();
-      (*g)[1] = listGauss[i].getCenter();
-      (*g)[2] = listGauss[i].getFWHM();
-      */
-    }
+//     g = dynamic_cast<Gaussian1D<Float>* >(funcs_[i]);
+//     if (g) {
+//       const GaussianSpectralElement *gauss = 
+//      dynamic_cast<const GaussianSpectralElement *>(listGauss[i]) ;
+//       (*g)[0] = gauss->getAmpl();
+//       (*g)[1] = gauss->getCenter();
+//       (*g)[2] = gauss->getFWHM();     
+//       /*
+//       (*g)[0] = listGauss[i].getAmpl();
+//       (*g)[1] = listGauss[i].getCenter();
+//       (*g)[2] = listGauss[i].getFWHM();
+//       */
+//     }
   }
   estimate_.resize();

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 ) ;