Changeset 1883 for trunk/external-alma

Timestamp:

08/20/10 18:03:31 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: read MS in reference table

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on is_scantable() and similar routine in the codes.
They are now able to recognize reference table correctly.

splitant() is working with reference table. Thus, performance
is a bit improved since deep copy is no longer necessary.

File:

• trunk/external-alma/atnf/PKSIO/PKSreader.cc (modified) (1 diff)

trunk/external-alma/atnf/PKSIO/PKSreader.cc

@@ -102 +102 @@
 
   } else if (inFile.isDirectory()) {
-    if (File(name + "/DATA_DESCRIPTION").exists()) {
+    Bool isMS = ( (File(name+"/table.info").exists()) 
+                  && File(name+"/table.dat").exists() );
+    if (isMS) {
+      RegularFileIO ifs(name+"/table.info") ;
+      char buf[128] ;
+      ifs.read(sizeof(buf),buf,False) ;
+      if ( strstr( buf, "Measurement Set" ) == NULL ) 
+        isMS = False ;
+    }
+    //if (File(name + "/DATA_DESCRIPTION").exists()) {
+    if (isMS) {
       // MS version 2.
       #ifdef NOPKSMS