Changeset 2022 for trunk/src

Timestamp:

03/02/11 16:09:10 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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...

Copy ASDM subtable that are optionally created by importasdm task.
For filler, their root names are stored as String in table keyword,
while for writer, existing tables are copied and are stored as Table
in table keyword.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (3 diffs)
• MSWriter.cpp (modified) (1 diff)

trunk/src/MSFiller.cpp

@@ -120 +120 @@
 
   os_ << "Parsing MS options" << endl ;
-  rec.print(cout) ;
   os_ << "   getPt = " << getPt_ << endl ;
   os_ << "   antenna = " << antenna_ << endl ;
@@ -950 +949 @@
 
   // save path to POINTING table
-  //Path datapath(mstable_.tableName()) ;
+  // 2011/3/2 TN
+  // So far, path to original POINTING table is always stored 
+  // since sd tasks and regressions don't support getpt control
+  //if ( !getPt_ ) {
   Path datapath( tablename_ ) ;
   String pTabName = datapath.absoluteName() + "/POINTING" ;
   stab.rwKeywordSet().define( "POINTING", pTabName ) ;
+  //}
 
   // for GBT
-  if ( antennaName == "GBT" ) {
+  if ( antennaName.matches( "GBT" ) ) {
     String goTabName = datapath.absoluteName() + "/GBT_GO" ;
     stab.rwKeywordSet().define( "GBT_GO", goTabName ) ;
   }
+
+  // for MS created from ASDM
+  //mstable_.keywordSet().print(cout) ;
+  const TableRecord &msKeys = mstable_.keywordSet() ;
+  uInt nfields = msKeys.nfields() ;
+  for ( uInt ifield = 0 ; ifield < nfields ; ifield++ ) {
+    String name = msKeys.name( ifield ) ;
+    //os_ << "name = " << name << LogIO::POST ;
+    if ( name.find( "ASDM" ) != String::npos ) {
+      String asdmpath = msKeys.asTable( ifield ).tableName() ;
+      os_ << "ASDM table: " << asdmpath << LogIO::POST ;
+      stab.rwKeywordSet().define( name, asdmpath ) ;
+    }
+  }
+
 //   double endSec = gettimeofday_sec() ;
 //   os_ << "end MSFiller::fill() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
@@ -1416 +1434 @@
     }
     if ( tidx[i] == -1 ) {
-      Double tsc = scTime[scnrow-1].get( "s" ).getValue() ;
-      Double dt = scInterval[scnrow-1] ;
+//       Double tsc = scTime[scnrow-1].get( "s" ).getValue() ;
+//       Double dt = scInterval[scnrow-1] ;
 //       if ( t <= tsc+0.5*dt ) {
 //         tidx[i] = scnrow-1 ;

trunk/src/MSWriter.cpp

@@ -503 +503 @@
     fillSysCal() ;
 
+  // ASDM tables 
+  const TableRecord &stKeys = table_->table().keywordSet() ;
+  TableRecord &msKeys = mstable_->rwKeywordSet() ;
+  uInt nfields = stKeys.nfields() ;
+  for ( uInt ifield = 0 ; ifield < nfields ; ifield++ ) {
+    String kname = stKeys.name( ifield ) ;
+    if ( kname.find( "ASDM" ) != String::npos ) {
+      String asdmpath = stKeys.asString( ifield ) ;
+      os_ << "found ASDM table: " << asdmpath << LogIO::POST ;
+      if ( Table::isReadable( asdmpath ) ) {
+        Table newAsdmTab( asdmpath, Table::Old ) ;
+        newAsdmTab.copy( filename_+"/"+kname, Table::New ) ;
+        os_ << "add subtable: " << kname << LogIO::POST ;
+        msKeys.defineTable( kname, Table( filename_+"/"+kname, Table::Old ) ) ;
+      }
+    }
+  }
+
   // replace POINTING table with original one if exists
   if ( ptTabName_ != "" ) {