Changes from branches/alma/external/atnf/PKSIO/PKSreader.cc at r1757 to trunk/external-alma/atnf/PKSIO/PKSreader.cc at r1883

File:

• trunk/external-alma/atnf/PKSIO/PKSreader.cc (modified) (2 diffs)

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

@@ -81 +81 @@
       buf[30] = '\0';
       if (String(buf) == "SIMPLE  =                    T") {
-        // Looks like SDFITS.
-        format = "SDFITS";
-        reader = new PKSFITSreader("SDFITS");
-
+        file.seek(560);
+        file.read(26, buf, False);
+        buf[26] = '\0' ;
+        if ( String(buf) == "ORIGIN  = 'NRAO Green Bank" ) {
+          // Looks like GBT SDFITS
+          format = "GBTFITS" ;
+          reader = new PKSFITSreader("GBTFITS") ;
+        }
+        else {
+          // Looks like SDFITS.
+          format = "SDFITS";
+          reader = new PKSFITSreader("SDFITS");
+        }
        } else {
          // Assume it's MBFITS.
@@ -93 +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