Changeset 859 for trunk/src

Timestamp:

03/01/06 11:51:18 (19 years ago)

Author:

mar637

Message:

reworked subtable handling
fixed bug in casa::Table construction, where Table::New was used instead of Table::Scratch

Location:

trunk/src

Files:

• Scantable.cpp (modified) (8 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -78 +78 @@
   historyTable_ = table_.keywordSet().asTable("HISTORY");
   fitTable_ = table_.keywordSet().asTable("FITS");
-  cout << "DEBUG" << endl;
-
   originalTable_ = table_;
   attach();
-  cout << "debug" << endl;
 }
 
@@ -98 +95 @@
   else
     table_ = tab;
-  freqTable_ = STFrequencies(table_.keywordSet().asTable("FREQUENCIES"));
-  focusTable_ = STFocus(table_.keywordSet().asTable("FOCUS"));
-  weatherTable_ = STWeather(table_.keywordSet().asTable("WEATHER"));
-  tcalTable_ = STTcal(table_.keywordSet().asTable("TCAL"));
-  moleculeTable_ = STMolecules(table_.keywordSet().asTable("MOLECULES"));
+  attachSubtables();
   originalTable_ = table_;
   attach();
@@ -111 +104 @@
 {
   // with or without data
-  if (clear) {
-    table_ = TableCopy::makeEmptyMemoryTable(String(generateName()),
-                                             other.table_, True);
+  String newname = String(generateName());
+  if ( other.table_.tableType() == Table::Memory ) {
+      if ( clear ) {
+        cout << "copy ctor memory clear" << endl;
+        table_ = TableCopy::makeEmptyMemoryTable(newname,
+                                                 other.table_, True);
+      } else
+        table_ = other.table_.copyToMemoryTable(newname);
   } else {
-    table_ = other.table_.copyToMemoryTable(String(generateName()));
-  }
-
+    if ( clear ) {
+      cout << "copy ctor clear" << endl;
+      other.table_.deepCopy(newname, Table::New);
+      cout << "reading table" << endl;
+      table_ = Table(newname, Table::Scratch);
+      cout << "removing rows" << endl;
+      table_.removeRow(table_.rowNumbers());
+
+    } else {
+      cout << "copy ctor no clear" << endl;
+      other.table_.deepCopy(newname, Table::Scratch);
+      table_ = Table(newname, Table::Scratch);
+    }
+  }
+  //table_.rwKeywordSet().renameTables(newname, table_.tableName());
+  //cout << table_.keywordSet().asTable("TCAL").tableName() << endl;
+  attachSubtables();
   originalTable_ = table_;
   attach();
+}
+
+void Scantable::attachSubtables()
+{
+  freqTable_ = STFrequencies(table_);
+  focusTable_ = STFocus(table_);
+  weatherTable_ = STWeather(table_);
+  tcalTable_ = STTcal(table_);
+  moleculeTable_ = STMolecules(table_);
 }
 
@@ -188 +209 @@
 
   // Now create Table SetUp from the description.
-  SetupNewTable aNewTab(generateName(), td, Table::New);
+  SetupNewTable aNewTab(generateName(), td, Table::Scratch);
   table_ = Table(aNewTab, type_, 0);
   originalTable_ = table_;
@@ -198 +219 @@
   TableDesc tdh("", "1", TableDesc::Scratch);
   tdh.addColumn(ScalarColumnDesc<String>("ITEM"));
-  SetupNewTable histtab("history", tdh, Table::New);
+  SetupNewTable histtab("history", tdh, Table::Scratch);
   Table histTable(histtab, Table::Memory);
   table_.rwKeywordSet().defineTable("HISTORY", histTable);
@@ -212 +233 @@
   td.addColumn(ArrayColumnDesc<Bool>("PARMASK"));
   td.addColumn(ArrayColumnDesc<String>("FRAMEINFO"));
-  SetupNewTable aNewTab("fits", td, Table::New);
+  SetupNewTable aNewTab("fits", td, Table::Scratch);
   Table aTable(aNewTab, Table::Memory);
   table_.rwKeywordSet().defineTable("FITS", aTable);
@@ -238 +259 @@
 
   mfitidCol_.attach(table_,"FIT_ID");
-  fitidCol_.attach(fitTable_,"FIT_ID");
+  //fitidCol_.attach(fitTable_,"FIT_ID");
 
   mfreqidCol_.attach(table_, "FREQ_ID");
@@ -378 +399 @@
   Path path(inname);
   inname = path.expandedName();
+  //cout << table_.tableName() << endl;
+  //cout << freqTable_.table().tableName() << endl;
   table_.deepCopy(inname, Table::New);
+  //Table t = Table(inname, Table::Update);
+  //cout << t.keywordSet().asTable("FREQUENCIES").tableName() << endl;
 }
 

trunk/src/Scantable.h

@@ -326 +326 @@
   void setupFitTable();
 
+  void attachSubtables();
   /**
    * Convert an "old" asap1 style row index into a new index