Changeset 1700 for branches/alma

Timestamp:

02/16/10 16:21:26 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1800 + CAS-1807)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: added parameters fitfunc for sdfit and clip, clipmaxmin, clipoutside for sdflag

Test Programs:

Put in Release Notes: No

Module(s): sdfit, sdflag

Description: Added a parameter for enabling Lorentzian line fitting with sdfit, and parameters for y-axis clipping with sdflag. Also 4 files for Lorentzian function class are (Lorentzian1D*) added.

Location:

branches/alma/src

Files:

• Lorentzian1D.h (added)
• Lorentzian1D.tcc (added)
• Lorentzian1DParam.h (added)
• Lorentzian1DParam.tcc (added)
• Makefile (modified) (4 diffs)
• STFitter.cpp (modified) (4 diffs)
• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

branches/alma/src/Makefile

@@ -24 +24 @@
 CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
-USELIB := lib
+USELIB := lib64
 
 # the compiler
@@ -34 +34 @@
 CXXFLAGS := -fPIC -O3 -g
 CXXFLAGS += -ansi -Wno-long-long -Wall
+CXXOPTS := -DAIPS_64B
 
 # darwin specific flags
@@ -56 +57 @@
 # if not than there might by symbol resolution errors.
 CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
-             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
+                /usr/lib64/libwcs.so \
              $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
+#             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
 
 # darwin specific CASA flags
@@ -140 +142 @@
 
 HEADERS   := MathUtils.h \
+             Lorentzian1D.h \
+             Lorentzian1DParam.h \
              Logger.h \
              STAttr.h \

branches/alma/src/STFitter.cpp

@@ -38 +38 @@
 #include <scimath/Functionals/CompoundFunction.h>
 #include <scimath/Functionals/Gaussian1D.h>
+#include "Lorentzian1D.h"
 #include <scimath/Functionals/Polynomial.h>
 #include <scimath/Mathematics/AutoDiff.h>
@@ -147 +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;
@@ -230 +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
@@ -263 +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;

branches/alma/src/Scantable.cpp

@@ -701 +701 @@
   }
   pushLog(String(oss));
+}
+
+void Scantable::clip(const Float uthres, const Float dthres, bool clipoutside, bool unflag)
+{
+  for (uInt i=0; i<table_.nrow(); ++i) {
+    Vector<Float> spcs = specCol_(i);
+    Vector<uChar> flgs = flagsCol_(i);
+    if (spcs.nelements() != nchan) {
+      throw(AipsError("Data has incorrect number of channels"));
+    }
+    uChar userflag = 1 << 7;
+    if (unflag) {
+      userflag = 0 << 7;
+    }
+    if (clipoutside) {
+      for (uInt j = 0; j < nchan; ++j) {
+        Float spc = spcs(j);
+        if ((spc >= uthres) || (spc <= dthres)) {
+          flgs(j) = userflag;
+        }
+      }
+    } else {
+      for (uInt j = 0; j < nchan; ++j) {
+        Float spc = spcs(j);
+        if ((spc < uthres) && (spc > dthres)) {
+          flgs(j) = userflag;
+        }
+      }
+    }
+    flagsCol_.put(i, flgs);
+  }
 }
 

branches/alma/src/Scantable.h

@@ -244 +244 @@
 
   /**
+   * Flag the data outside a specified range (in a channel-based manner).
+   * (CAS-1807 Wataru Kawasaki)
+   */
+  void Scantable::clip(const Float uthres, const Float dthres, bool clipoutside, bool unflag);
+
+  /**
    * Return a list of row numbers with respect to the original table.
    * @return a list of unsigned ints

branches/alma/src/ScantableWrapper.h

@@ -114 +114 @@
     { return table_->getFlagRow(whichrow); }
 
+  void clip(const Float uthres, const Float dthres, bool clipoutside=true, bool unflag=false)
+    { table_->clip(uthres, dthres, clipoutside, unflag); }
+
   std::string getSourceName(int whichrow=0) const
     { return table_->getSourceName(whichrow); }

branches/alma/src/python_Scantable.cpp

@@ -108 +108 @@
     .def("_getflagrow", &ScantableWrapper::getFlagRow,
          (boost::python::arg("whichrow")=0) )
+    .def("_clip", &ScantableWrapper::clip,
+         (boost::python::arg("clipoutside")=true,
+          boost::python::arg("unflag")=false) )
     .def("_save",  &ScantableWrapper::makePersistent)
     .def("_summary",  &ScantableWrapper::summary,