Changeset 1779 for branches/mergetest/external/atnf/PKSIO/PKSreader.cc

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• external/atnf/PKSIO/PKSreader.cc (modified) (7 diffs)

branches/mergetest/external/atnf/PKSIO/PKSreader.cc

@@ -85 +85 @@
         reader = new PKSFITSreader("SDFITS");
 
-      } else {
-        // Assume it's MBFITS.
-        format = "MBFITS";
-        reader = new PKSFITSreader("MBFITS", retry, interpolate);
-      }
+       } else {
+         // Assume it's MBFITS.
+         format = "MBFITS";
+         reader = new PKSFITSreader("MBFITS", retry, interpolate);
+       }
     }
 
@@ -106 +106 @@
     format = "UNRECOGNIZED INPUT FORMAT";
   }
-
   return reader;
 }
@@ -113 +112 @@
 
 // Search a list of directories for a Parkes Multibeam dataset and return an
-// appropriate PKSreader for it.
 
 PKSreader* getPKSreader(
@@ -145 +143 @@
 PKSreader* getPKSreader(
         const String name,
+        const String antenna,
         const Int retry,
         const Int interpolate,
@@ -160 +159 @@
   // Try to open it.
   if (reader) {
-    if (reader->open(name, beams, IFs, nChan, nPol, haveXPol, haveBase,
-                     haveSpectra)) {
+    if (reader->open(name, antenna, beams, IFs, nChan, nPol, haveXPol, 
+                     haveBase, haveSpectra)) {
       format += " OPEN ERROR";
       delete reader;
@@ -173 +172 @@
 //--------------------------------------------------------------- getPKSreader
 
-// Search a list of directories for a Parkes Multibeam dataset and open an
+// Search a list of directories for a Parkes Multibeam dataset and return an
 // appropriate PKSreader for it.
-
-PKSreader* getPKSreader(
-        const String name,
+PKSreader* getPKSreader(
+        const String name,
+        const String antenna,
         const Vector<String> directories,
         const Int retry,
@@ -196 +195 @@
   // Try to open it.
   if (reader) {
-    if (reader->open(name, beams, IFs, nChan, nPol, haveXPol, haveBase,
-                     haveSpectra)) {
+    if (reader->open(name, antenna, beams, IFs, nChan, nPol, haveXPol, 
+                     haveBase, haveSpectra)) {
       format += " OPEN ERROR";
       delete reader;