Changeset 856

Timestamp:

03/01/06 11:46:16 (18 years ago)

Author:

mar637

Message:

added name()
reworked copy constructor for (Table tab) to also pass name to base class

Location:

trunk/src

Files:

• STFocus.cpp (modified) (1 diff)
• STFocus.h (modified) (1 diff)
• STFrequencies.cpp (modified) (1 diff)
• STFrequencies.h (modified) (1 diff)
• STMolecules.cpp (modified) (1 diff)
• STMolecules.h (modified) (1 diff)
• STTcal.cpp (modified) (1 diff)
• STTcal.h (modified) (1 diff)
• STWeather.cpp (modified) (1 diff)
• STWeather.h (modified) (1 diff)

trunk/src/STFocus.cpp

@@ -34 +34 @@
 }
 
-asap::STFocus::STFocus( casa::Table tab ) : STSubTable(tab)
+asap::STFocus::STFocus( casa::Table tab ) : STSubTable(tab, name_)
 {
   rotationCol_.attach(table_,"ROTATION");

trunk/src/STFocus.h

@@ -43 +43 @@
                        casa::Float& ftan, casa::uInt id);
 
+  const casa::String& name() const { return name_; }
+
 private:
   void setup();

trunk/src/STFrequencies.cpp

@@ -38 +38 @@
   STSubTable(parent, name_)
 {
-  cout << "STFrequencies(const Scantable& parent" << endl;
   setup();
-  cout << "after setup" << endl;
 }
 
 asap::STFrequencies::STFrequencies( casa::Table tab ) :
-  STSubTable(tab)
+  STSubTable(tab, name_)
 {
   refpixCol_.attach(table_,"REFPIX");

trunk/src/STFrequencies.h

@@ -144 +144 @@
   void setInfo( const std::vector<std::string>& theinfo );
 
+  const casa::String& name() const { return name_; }
+
 private:
 

trunk/src/STMolecules.cpp

@@ -34 +34 @@
 }
 
-asap::STMolecules::STMolecules( casa::Table tab ) : STSubTable(tab)
+asap::STMolecules::STMolecules( casa::Table tab ) : STSubTable(tab, name_)
 {
   restfreqCol_.attach(table_,"RESTFREQUENCY");

trunk/src/STMolecules.h

@@ -45 +45 @@
   std::vector<double> getRestFrequencies() const;
 
+  const casa::String& name() const { return name_; }
+
 private:
   void setup();

trunk/src/STTcal.cpp

@@ -46 +46 @@
 }
 
-asap::STTcal::STTcal( casa::Table tab ) : STSubTable(tab)
+asap::STTcal::STTcal( casa::Table tab ) : STSubTable(tab, name_)
 {
   timeCol_.attach(table_,"TIME");

trunk/src/STTcal.h

@@ -43 +43 @@
                  casa::uInt id );
 
+  const casa::String& name() const { return name_; }
+
 private:
   void setup();

trunk/src/STWeather.cpp

@@ -35 +35 @@
 
 
-asap::STWeather::STWeather( casa::Table tab ) : STSubTable(tab)
+asap::STWeather::STWeather( casa::Table tab ) : STSubTable(tab, name_)
 {
   temperatureCol_.attach(table_,"TEMPERATURE");

trunk/src/STWeather.h

@@ -46 +46 @@
                        casa::uInt id);
 
+  const casa::String& name() const { return name_; }
+
 private:
   void setup();