Changeset 260

Timestamp:

01/22/05 16:42:38 (20 years ago)

Author:

vor010

Message:

SDMemTable & SDMemTableWrapper: formatSec and summary are now const functions.
Makefile has been updated to use the same version for both Narrabri and Epping

Location:

trunk/src

Files:

• Makefile (modified) (2 diffs)
• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (2 diffs)
• SDMemTableWrapper.h (modified) (1 diff)

trunk/src/Makefile

@@ -1 +1 @@
 TARGET   := ../lib/_asap.so
 
+ifdef NARRABRI_ASAP
+CXX      := /usr/bin/g++
+else
 CXX      := g++-3.2.3
+endif
+
 CXXFLAGS := -O -fPIC
 #CXXFLAGS += -fpermissive # This should be removed.
@@ -28 +33 @@
 BOOSTLIB  := /nfs/atapplic/boost/linux/lib/libboost_python2.3-gcc-mt.a
 BOOSTINC  := -I/usr/local/include/boost
+
 
 PYTHONINC := -I/usr/local/include/python2.3

trunk/src/SDMemTable.cc

@@ -892 +892 @@
 }
 
-String SDMemTable::formatSec(Double x)
+String SDMemTable::formatSec(Double x) const
 {
   Double xcop = x;
@@ -928 +928 @@
 }
 
-std::string SDMemTable::summary()   {
+std::string SDMemTable::summary() const  {
   ROScalarColumn<Int> scans(table_, "SCANID");
   ROScalarColumn<String> srcs(table_, "SRCNAME");
@@ -953 +953 @@
   table_.keywordSet().get("FluxUnit", tmp);
   oss << setw(15) << "Flux Unit:" << tmp << endl;
-  Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
+  Table t = table_.keywordSet().asTable("FREQUENCIES");
   Vector<Double> vec;
   t.keywordSet().get("RESTFREQS",vec);

trunk/src/SDMemTable.h

@@ -130 +130 @@
 
   // get a summary of the table
-  virtual std::string summary();
+  virtual std::string summary() const;
 
   std::vector<std::string> history(int whichRow=0) const;
@@ -185 +185 @@
 private:
   // utility func for nice printout
-  casa::String formatSec(casa::Double x);
+  casa::String formatSec(casa::Double x) const;
   void setup();
   // the current cursor into the array

trunk/src/SDMemTableWrapper.h

@@ -157 +157 @@
   casa::CountedPtr<SDMemTable> getCP() const {return table_;}
   SDMemTable* getPtr() {return &(*table_);}
-  std::string summary() { return table_->summary(); }
+  std::string summary() const { return table_->summary(); }
   
   std::vector<std::string> history(int whichRow=0) {