Changeset 2047 for trunk/src/STFitter.cpp

Timestamp:

03/15/11 18:31:04 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes CAS-2847

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): scantable

Description: added {auto_}sinusoid_baseline() for sinusoidal baseline fitting. also minor bug fixes for asapfitter.

File:

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

trunk/src/STFitter.cpp

@@ -39 +39 @@
 #include <scimath/Functionals/Gaussian1D.h>
 #include "Lorentzian1D.h"
+#include <scimath/Functionals/Sinusoid1D.h>
 #include <scimath/Functionals/Polynomial.h>
 #include <scimath/Mathematics/AutoDiff.h>
@@ -149 +150 @@
       funccomponents_.push_back(3);
     }
-  } else if (expr == "poly") {
-    funcs_.resize(1);
-    funcnames_.clear();
-    funccomponents_.clear();
-    funcs_[0] = new Polynomial<Float>(ncomp);
-      funcnames_.push_back(expr);
-      funccomponents_.push_back(ncomp);
   } else if (expr == "lorentz") {
     if (ncomp < 1) throw (AipsError("Need at least one lorentzian to fit."));
@@ -166 +160 @@
       funccomponents_.push_back(3);
     }
+  } else if (expr == "sinusoid") {
+    if (ncomp < 1) throw (AipsError("Need at least one sinusoid to fit."));
+    funcs_.resize(ncomp);
+    funcnames_.clear();
+    funccomponents_.clear();
+    for (Int k=0; k<ncomp; ++k) {
+      funcs_[k] = new Sinusoid1D<Float>();
+      funcnames_.push_back(expr);
+      funccomponents_.push_back(3);
+    }
+  } else if (expr == "poly") {
+    funcs_.resize(1);
+    funcnames_.clear();
+    funccomponents_.clear();
+    funcs_[0] = new Polynomial<Float>(ncomp);
+      funcnames_.push_back(expr);
+      funccomponents_.push_back(ncomp);
   } else {
-    //cerr << " compiled functions not yet implemented" << endl;
     LogIO os( LogOrigin( "Fitter", "setExpression()", WHERE ) ) ;
     os << LogIO::WARN << " compiled functions not yet implemented" << LogIO::POST;
@@ -244 +254 @@
             }
         }
+    } 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;
+            }
+        }
+    } else if (dynamic_cast<Sinusoid1D<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;
+            }
+        }
     } else if (dynamic_cast<Polynomial<Float>* >(funcs_[0]) != 0) {
         for (uInt i=0; i < funcs_[0]->nparameters(); ++i) {
             parameters_[i] = tmppar[i];
             (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;
-            }
         }
     }
@@ -286 +305 @@
             }
         }
+    } 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;
+            }
+        }
+    } else if (dynamic_cast<Sinusoid1D<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;
+            }
+        }
     } else if (dynamic_cast<Polynomial<Float>* >(funcs_[0]) != 0) {
         for (uInt i=0; i < funcs_[0]->nparameters(); ++i) {
             fixedpar_[i] = fixed[i];
             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;
-            }
         }
     }