Changeset 3087 for trunk

Timestamp:

11/25/15 18:57:32 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...

Bug fix on STFitter::computeEstimate. Introduced size check of func_ member variable to avoid segmentation fault. Uncommented lines that seems to be commented unintentionally.

File:

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

trunk/src/STFitter.cpp

@@ -88 +88 @@
     throw (AipsError("No x/y data specified."));
 
+  if (funcs_.size() == 0) {
+    throw AipsError("No fit function specified.");
+  }
+
   if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) == 0)
     return false;
@@ -115 +119 @@
   SpectralList listGauss = estimator.estimate(x_, y_);
   parameters_.resize(n*3);
-//  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();
-//       */
-//     }
-//  }
+  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();
+       */
+     }
+  }
   estimate_.resize();
   listGauss.evaluate(estimate_,x_);