Changeset 1552 for trunk/src

Timestamp:

03/27/09 21:25:44 (16 years ago)

Author:

Malte Marquarding

Message:

Enhancement Ticket #155; chnaged the wy output filenames are generated.

Location:

trunk/src

Files:

• STAsciiWriter.cpp (modified) (2 diffs)
• STFITSImageWriter.cpp (modified) (3 diffs)

trunk/src/STAsciiWriter.cpp

@@ -88 +88 @@
 
    String rootName(fileName);
-   if (rootName.length()==0) rootName = String("ascii");
-
+   
   Block<String> cols(4);
   cols[0] = String("SCANNO");
@@ -103 +102 @@
     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);

trunk/src/STFITSImageWriter.cpp

@@ -121 +121 @@
   TableIterator iter(tab, cols);
   // Open data file
+
   while ( !iter.pastEnd() ) {
     Table t = iter.table();
@@ -127 +128 @@
     String dirtype = stable.getDirectionRefString();
     ostringstream onstr;
-    onstr << "SCAN" << rec.asuInt("SCANNO")
-    << "_CYCLE" << rec.asuInt("CYCLENO")
-    << "_BEAM" << rec.asuInt("BEAMNO")
-    << "_IF" << rec.asuInt("IFNO")
-    << "_POL" << rec.asuInt("POLNO");
+    if (rootName.length()==0) {
+      rootName = "fits";
+    }
+    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");
+      if (stable.npol(rec.asuInt("SCANNO")) > 1) 
+        onstr << "_POL" << rec.asuInt("POLNO");
+    }
     String fileName = rootName + String(onstr) + String(".fits");
     int row0 = t.rowNumbers(tab)[0];
@@ -258 +269 @@
     }
     fits_close_file(fptr, &status);
-  
+    ostringstream oss;
+    oss << "Wrote " << fileName;
+    pushLog(String(oss));  
     //pushLog(String(oss));
     ++iter;