Changeset 158
- Timestamp:
- 12/26/04 21:57:09 (20 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/python/asapfitter.py
r123 r158 31 31 def set_data(self, xdat, ydat, mask=None): 32 32 """ 33 Set the abs cissa and ordinate for the fit. Also set the mask33 Set the absissa and ordinate for the fit. Also set the mask 34 34 indicationg valid points. 35 35 This can be used for data vectors retrieved from a scantable. 36 36 For scantable fitting use 'fitter.set_scan(scan, mask)'. 37 37 Parameters: 38 xdat: the ab scissa values38 xdat: the abcissa values 39 39 ydat: the ordinate values 40 40 mask: an optional mask … … 110 110 else: 111 111 if self.data is not None: 112 self.x = self.data.getab scissa()112 self.x = self.data.getabcissa() 113 113 self.y = self.data.getspectrum() 114 114 print "Fitting:" … … 229 229 self._p.clear() 230 230 tlab = 'Spectrum' 231 xlab = 'Ab scissa'231 xlab = 'Abcissa' 232 232 if self.data: 233 233 tlab = self.data._getsourcename(0) 234 xlab = self.data.getab scissalabel(0)234 xlab = self.data.getabcissalabel(0) 235 235 ylab = r'Flux' 236 236 m = self.data.getmask(0) … … 268 268 for k in range(scan.npol()): 269 269 scan.setpol(k) 270 self.x = scan.getab scissa()270 self.x = scan.getabcissa() 271 271 self.y = scan.getspectrum() 272 272 self.data = None -
trunk/python/scantable.py
r156 r158 293 293 return unit 294 294 295 def get_ab scissa(self, rowno=0):296 """ 297 Get the ab scissa in the current coordinate setup for the currently295 def get_abcissa(self, rowno=0): 296 """ 297 Get the abcissa in the current coordinate setup for the currently 298 298 selected Beam/IF/Pol 299 299 Parameters: 300 300 none 301 301 Returns: 302 The ab scissa values and it's format string.303 """ 304 ab sc = self.getabscissa(rowno)305 lbl = self.getab scissalabel(rowno)306 return ab sc, lbl302 The abcissa values and it's format string. 303 """ 304 abc = self.getabcissa(rowno) 305 lbl = self.getabcissalabel(rowno) 306 return abc, lbl 307 307 308 308 def create_mask(self, *args, **kwargs): … … 336 336 print "The current mask window unit is", u 337 337 n = self.nchan() 338 data = self.getab scissa()338 data = self.getabcissa() 339 339 msk = ones(n) 340 340 for window in args: … … 443 443 y.append(self._gettsys(k)) 444 444 else: 445 x,xlab = self.get_ab scissa(i)445 x,xlab = self.get_abcissa(i) 446 446 y = self.getspectrum(i) 447 447 ylab = r'Flux' -
trunk/src/SDMemTable.cc
r148 r158 321 321 } 322 322 323 std::vector<double> SDMemTable::getAb scissa(Int whichRow) {323 std::vector<double> SDMemTable::getAbcissa(Int whichRow) { 324 324 std::vector<double> absc(nChan()); 325 325 Vector<Double> absc1(nChan()); … … 416 416 } 417 417 418 std::string SDMemTable::getAb scissaString(Int whichRow)418 std::string SDMemTable::getAbcissaString(Int whichRow) 419 419 { 420 420 ROArrayColumn<uInt> fid(table_, "FREQID"); … … 864 864 oss << "None set" << endl; 865 865 } 866 oss << setw(15) << "Ab scissa:" << getAbscissaString() << endl;866 oss << setw(15) << "Abcissa:" << getAbcissaString() << endl; 867 867 oss << setw(15) << "Cursor:" << "Beam[" << getBeam() << "] " 868 868 << "IF[" << getIF() << "] " << "Pol[" << getPol() << "]" << endl; -
trunk/src/SDMemTable.h
r154 r158 152 152 casa::Int nCoordinates() const; 153 153 154 std::vector<double> getAb scissa(int whichRow=0);155 std::string getAb scissaString(casa::Int whichRow=0);154 std::vector<double> getAbcissa(int whichRow=0); 155 std::string getAbcissaString(casa::Int whichRow=0); 156 156 157 157 private: -
trunk/src/SDMemTableWrapper.h
r157 r158 76 76 } 77 77 78 std::vector<double> getAb scissa(int whichRow=0) const {79 return table_->getAb scissa(whichRow);78 std::vector<double> getAbcissa(int whichRow=0) const { 79 return table_->getAbcissa(whichRow); 80 80 } 81 std::string getAb scissaString(int whichRow=0) const {82 return table_->getAb scissaString(whichRow);81 std::string getAbcissaString(int whichRow=0) const { 82 return table_->getAbcissaString(whichRow); 83 83 } 84 84 -
trunk/src/python_SDMemTable.cc
r157 r158 52 52 .def("getspectrum", &SDMemTableWrapper::getSpectrum, 53 53 (boost::python::arg("whichRow")=0) ) 54 .def("getab scissa", &SDMemTableWrapper::getAbscissa,54 .def("getabcissa", &SDMemTableWrapper::getAbcissa, 55 55 (boost::python::arg("whichRow")=0) ) 56 .def("getab scissalabel", &SDMemTableWrapper::getAbscissaString,56 .def("getabcissalabel", &SDMemTableWrapper::getAbcissaString, 57 57 (boost::python::arg("whichRow")=0) ) 58 58 .def("getmask", &SDMemTableWrapper::getMask,
Note:
See TracChangeset
for help on using the changeset viewer.