Changeset 158 for trunk

Timestamp:

12/26/04 21:57:09 (20 years ago)

Author:

kil064

Message:

Correct spelling 'abscissa' -> 'abcissa'

Location:

trunk

Files:

• python/asapfitter.py (modified) (4 diffs)
• python/scantable.py (modified) (3 diffs)
• src/SDMemTable.cc (modified) (3 diffs)
• src/SDMemTable.h (modified) (1 diff)
• src/SDMemTableWrapper.h (modified) (1 diff)
• src/python_SDMemTable.cc (modified) (1 diff)

trunk/python/asapfitter.py

@@ -31 +31 @@
     def set_data(self, xdat, ydat, mask=None):
         """
-        Set the abscissa and ordinate for the fit. Also set the mask
+        Set the absissa and ordinate for the fit. Also set the mask
         indicationg valid points.
         This can be used for data vectors retrieved from a scantable.
         For scantable fitting use 'fitter.set_scan(scan, mask)'.
         Parameters:
-            xdat:    the abscissa values
+            xdat:    the abcissa values
             ydat:    the ordinate values
             mask:    an optional mask
@@ -110 +110 @@
         else:
             if self.data is not None:
-                self.x = self.data.getabscissa()
+                self.x = self.data.getabcissa()
                 self.y = self.data.getspectrum()
                 print "Fitting:"
@@ -229 +229 @@
         self._p.clear()
         tlab = 'Spectrum'
-        xlab = 'Abscissa'
+        xlab = 'Abcissa'
         if self.data:
             tlab = self.data._getsourcename(0)
-            xlab = self.data.getabscissalabel(0)
+            xlab = self.data.getabcissalabel(0)
         ylab = r'Flux'
         m = self.data.getmask(0)
@@ -268 +268 @@
                 for k in range(scan.npol()):
                     scan.setpol(k)
-                    self.x = scan.getabscissa()
+                    self.x = scan.getabcissa()
                     self.y = scan.getspectrum()
                     self.data = None

trunk/python/scantable.py

@@ -293 +293 @@
         return unit
 
-    def get_abscissa(self, rowno=0):
-        """
-        Get the abscissa in the current coordinate setup for the currently
+    def get_abcissa(self, rowno=0):
+        """
+        Get the abcissa in the current coordinate setup for the currently
         selected Beam/IF/Pol
         Parameters:
             none
         Returns:
-            The abscissa values and it's format string.
-        """
-        absc = self.getabscissa(rowno)
-        lbl = self.getabscissalabel(rowno)
-        return absc, lbl
+            The abcissa values and it's format string.
+        """
+        abc = self.getabcissa(rowno)
+        lbl = self.getabcissalabel(rowno)
+        return abc, lbl
 
     def create_mask(self, *args, **kwargs):
@@ -336 +336 @@
             print "The current mask window unit is", u
         n = self.nchan()
-        data = self.getabscissa()
+        data = self.getabcissa()
         msk = ones(n)
         for  window in args:
@@ -443 +443 @@
                         y.append(self._gettsys(k))
                 else:
-                    x,xlab = self.get_abscissa(i)
+                    x,xlab = self.get_abcissa(i)
                     y = self.getspectrum(i)
                     ylab = r'Flux'

trunk/src/SDMemTable.cc

@@ -321 +321 @@
 }
 
-std::vector<double> SDMemTable::getAbscissa(Int whichRow) {
+std::vector<double> SDMemTable::getAbcissa(Int whichRow) {
   std::vector<double> absc(nChan());
   Vector<Double> absc1(nChan());
@@ -416 +416 @@
 }
 
-std::string SDMemTable::getAbscissaString(Int whichRow)
+std::string SDMemTable::getAbcissaString(Int whichRow)
 {
   ROArrayColumn<uInt> fid(table_, "FREQID");
@@ -864 +864 @@
       oss << "None set" << endl;
   }
-  oss << setw(15) << "Abscissa:" << getAbscissaString() << endl;
+  oss << setw(15) << "Abcissa:" << getAbcissaString() << endl;
   oss << setw(15) << "Cursor:" << "Beam[" << getBeam() << "] "
       << "IF[" << getIF() << "] " << "Pol[" << getPol() << "]" << endl;

trunk/src/SDMemTable.h

@@ -152 +152 @@
   casa::Int nCoordinates() const;
 
-  std::vector<double> getAbscissa(int whichRow=0);
-  std::string getAbscissaString(casa::Int whichRow=0);
+  std::vector<double> getAbcissa(int whichRow=0);
+  std::string getAbcissaString(casa::Int whichRow=0);
 
 private:

trunk/src/SDMemTableWrapper.h

@@ -76 +76 @@
   }
 
-  std::vector<double> getAbscissa(int whichRow=0) const {
-    return table_->getAbscissa(whichRow);
+  std::vector<double> getAbcissa(int whichRow=0) const {
+    return table_->getAbcissa(whichRow);
   }
-  std::string getAbscissaString(int whichRow=0) const {
-    return table_->getAbscissaString(whichRow);
+  std::string getAbcissaString(int whichRow=0) const {
+    return table_->getAbcissaString(whichRow);
   }
 

trunk/src/python_SDMemTable.cc

@@ -52 +52 @@
     .def("getspectrum", &SDMemTableWrapper::getSpectrum,
          (boost::python::arg("whichRow")=0) )
-    .def("getabscissa", &SDMemTableWrapper::getAbscissa,
+    .def("getabcissa", &SDMemTableWrapper::getAbcissa,
          (boost::python::arg("whichRow")=0) )
-    .def("getabscissalabel", &SDMemTableWrapper::getAbscissaString,
+    .def("getabcissalabel", &SDMemTableWrapper::getAbcissaString,
          (boost::python::arg("whichRow")=0) )
     .def("getmask", &SDMemTableWrapper::getMask,