Changeset 1757 for branches/alma/src/STAsciiWriter.cpp

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/STAsciiWriter.cpp (modified) (2 diffs)

branches/alma/src/STAsciiWriter.cpp

@@ -89 +89 @@
 
    String rootName(fileName);
-   if (rootName.length()==0) rootName = String("ascii");
 
   Block<String> cols(4);
@@ -104 +103 @@
     String dirtype = stable.getDirectionRefString();
     ostringstream onstr;
-    onstr << "SCAN" << rec.asuInt("SCANNO")
-    << "_CYCLE" << rec.asuInt("CYCLENO")
-    << "_BEAM" << rec.asuInt("BEAMNO")
-    << "_IF" << rec.asuInt("IFNO");
+
+    if (rootName.length()==0) {
+      rootName = String("ascii");
+    }
+    if (tab.nrow() > 1) {
+      if (stable.nscan() > 1) 
+        onstr << "_SCAN" << rec.asuInt("SCANNO");
+      if (stable.ncycle(rec.asuInt("SCANNO")) > 1) 
+        onstr << "_CYCLE" << rec.asuInt("CYCLENO");
+      if (stable.nbeam(rec.asuInt("SCANNO")) > 1) 
+        onstr << "_BEAM" << rec.asuInt("BEAMNO");
+      if (stable.nif(rec.asuInt("SCANNO")) > 1) 
+        onstr << "_IF" << rec.asuInt("IFNO");
+    }
+
     String fName = rootName + String(onstr) + String(".txt");
     ofstream of(fName.chars(), ios::trunc);