Changeset 1779 for branches/mergetest/src/STFitter.cpp

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• src/STFitter.cpp (modified) (5 diffs)

branches/mergetest/src/STFitter.cpp

@@ -32 +32 @@
 #include <casa/Arrays/ArrayMath.h>
 #include <casa/Arrays/ArrayLogical.h>
+#include <casa/Logging/LogIO.h>
 #include <scimath/Fitting.h>
 #include <scimath/Fitting/LinearFit.h>
@@ -37 +38 @@
 #include <scimath/Functionals/CompoundFunction.h>
 #include <scimath/Functionals/Gaussian1D.h>
+#include "Lorentzian1D.h"
 #include <scimath/Functionals/Polynomial.h>
 #include <scimath/Mathematics/AutoDiff.h>
@@ -146 +148 @@
     funcs_.resize(1);
     funcs_[0] = new Polynomial<Float>(ncomp);
+  } else if (expr == "lorentz") {
+    if (ncomp < 1) throw (AipsError("Need at least one lorentzian to fit."));
+    funcs_.resize(ncomp);
+    for (Int k=0; k<ncomp; ++k) {
+      funcs_[k] = new Lorentzian1D<Float>();
+    }
   } else {
-    cerr << " compiled functions not yet implemented" << endl;
+    //cerr << " compiled functions not yet implemented" << endl;
+    LogIO os( LogOrigin( "Fitter", "setExpression()", WHERE ) ) ;
+    os << LogIO::WARN << " compiled functions not yet implemented" << LogIO::POST;
     //funcs_.resize(1);
     //funcs_[0] = new CompiledFunction<Float>();
@@ -227 +237 @@
             (funcs_[0]->parameters())[i] =  tmppar[i];
         }
+    } else if (dynamic_cast<Lorentzian1D<Float>* >(funcs_[0]) != 0) {
+        uInt count = 0;
+        for (uInt j=0; j < funcs_.nelements(); ++j) {
+            for (uInt i=0; i < funcs_[j]->nparameters(); ++i) {
+                (funcs_[j]->parameters())[i] = tmppar[count];
+                parameters_[count] = tmppar[count];
+                ++count;
+            }
+        }
     }
     // reset
@@ -260 +279 @@
             funcs_[0]->mask(i) =  !fixed[i];
         }
+    } else if (dynamic_cast<Lorentzian1D<Float>* >(funcs_[0]) != 0) {
+      uInt count = 0;
+        for (uInt j=0; j < funcs_.nelements(); ++j) {
+            for (uInt i=0; i < funcs_[j]->nparameters(); ++i) {
+                funcs_[j]->mask(i) = !fixed[count];
+                fixedpar_[count] = fixed[count];
+                ++count;
+            }
+        }
     }
     return true;