Changeset 2030 for trunk/src

Timestamp:

03/04/11 14:09:52 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2815 (Trac #236)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Commented out workaround in Scantable::makePersistent() since
essential bug in casacore is fixed (r20889 in google code).

File:

• trunk/src/Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -524 +524 @@
   /// @todo reindex SCANNO, recompute nbeam, nif, npol
   inname = path.expandedName();
-  // WORKAROUND !!! for Table bug
-  // Remove when fixed in casacore
-  if ( table_.tableType() == Table::Memory  && !selector_.empty() ) {
-    Table tab = table_.copyToMemoryTable(generateName());
-    tab.deepCopy(inname, Table::New);
-    tab.markForDelete();
-
-  } else {
-    table_.deepCopy(inname, Table::New);
-  }
+  // 2011/03/04 TN
+  // We can comment out this workaround since the essential bug is 
+  // fixed in casacore (r20889 in google code).
+  table_.deepCopy(inname, Table::New);
+//   // WORKAROUND !!! for Table bug
+//   // Remove when fixed in casacore
+//   if ( table_.tableType() == Table::Memory  && !selector_.empty() ) {
+//     Table tab = table_.copyToMemoryTable(generateName());
+//     tab.deepCopy(inname, Table::New);
+//     tab.markForDelete();
+//
+//   } else {
+//     table_.deepCopy(inname, Table::New);
+//   }
 }