Changeset 884 for trunk

Timestamp:

03/08/06 12:01:46 (19 years ago)

Author:

mar637

Message:

added setSpectrum

Location:

trunk/src

Files:

• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -581 +581 @@
   return out;
 }
+
+
+void asap::Scantable::setSpectrum( const std::vector<float>& spec,
+                                   int whichrow )
+{
+  Vector<Float> spectrum(spec);
+  Vector<Float> arr;
+  specCol_.get(whichrow, arr);
+  if ( spectrum.nelements() != arr.nelements() )
+    throw AipsError("The specturm has incorrect number of channels.");
+  specCol_.put(whichrow, spectrum);
+}
+
 
 String Scantable::generateName()
@@ -739 +752 @@
   std::vector<double> stlout;
   int nchan = specCol_(whichrow).nelements();
-  cout << nchan << endl;
   String us = freqTable_.getUnitString();
   if ( us == "" || us == "pixel" || us == "channel" ) {

trunk/src/Scantable.h

@@ -248 +248 @@
   std::vector<float> getSpectrum(int whichrow) const;
 
+  void setSpectrum(const std::vector<float>& spec, int whichrow);
+
   std::vector<float> getStokesSpectrum( int whichrow=0,
                                         bool dopol=false) const;

trunk/src/ScantableWrapper.h

@@ -121 +121 @@
 
 
-//   void setSpectrum(std::vector<float> spectrum, int whichrow=0)
-//     { table_->setSpectrum(spectrum, whichrow); }
+  void setSpectrum(std::vector<float> spectrum, int whichrow=0)
+    { table_->setSpectrum(spectrum, whichrow); }
 
   int getIF(int whichrow) const {return table_->getIF(whichrow);}

trunk/src/python_Scantable.cpp

@@ -63 +63 @@
     .def("_setInstrument", &ScantableWrapper::setInstrument)
     .def("_getspectrum", &ScantableWrapper::getSpectrum,
-         (boost::python::arg("whichRow")=0))
+         (boost::python::arg("whichrow")=0))
     /*
     .def("nstokes", &ScantableWrapper::nStokes)
     .def("_getstokesspectrum", &ScantableWrapper::getStokesSpectrum,
-         (boost::python::arg("whichRow")=0),
+         (boost::python::arg("whichrow")=0),
          (boost::python::arg("linpol")=false) )
     .def("_stokestopolspectrum", &ScantableWrapper::stokesToPolSpectrum,
-         (boost::python::arg("whichRow")=0),
+         (boost::python::arg("whichrow")=0),
          (boost::python::arg("linear")=false),
          (boost::python::arg("thepol")=-1) )
@@ -79 +79 @@
          (boost::python::arg("linpol")=false) )
 //         (boost::python::arg("thepol")=0) )        // Boost fails with 4 arguments
-/*    .def("_setspectrum",&ScantableWrapper::setSpectrum,
-         (boost::python::arg("whichRow")=0) )*/
+   .def("_setspectrum",&ScantableWrapper::setSpectrum,
+         (boost::python::arg("whichrow")=0) )
     .def("_getabcissa", &ScantableWrapper::getAbcissa,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_getabcissalabel", &ScantableWrapper::getAbcissaLabel,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_getmask", &ScantableWrapper::getMask,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_gettsys", &ScantableWrapper::getTsys)
     .def("_getsourcename", &ScantableWrapper::getSourceName,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_getelevation", &ScantableWrapper::getElevation,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_getazimuth", &ScantableWrapper::getAzimuth,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_getparangle", &ScantableWrapper::getParAngle,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_gettime", &ScantableWrapper::getTime,
-         (boost::python::arg("whichRow")=0) )
+         (boost::python::arg("whichrow")=0) )
     .def("_flag", &ScantableWrapper::flag)
     .def("_save",  &ScantableWrapper::makePersistent)