Changeset 2005 for trunk/src

Timestamp:

02/23/11 19:19:36 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-2817/ASAP-232)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added a new function SrcType::getName(int)

Test Programs: sdlist (CASA) or scantable.summary()

Put in Release Notes: No

Module(s): scantable, sdlist, sdplot

Description:

Added a new function SrcType::getName(int srctype) which returns
a source type in string.
The source type of each scan is retuned by Scantable::summary.

Location:

trunk/src

Files:

• STWriter.cpp (modified) (1 diff)
• Scantable.cpp (modified) (3 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/STWriter.cpp

@@ -387 +387 @@
 String STWriter::getObsTypes( Int srctype )
 {
-  String obsType ;
-  switch( srctype ) {
-  case Int(SrcType::PSON):
-    obsType = "PSON" ;
-    break ;
-  case Int(SrcType::PSOFF):
-    obsType = "PSOFF" ;
-    break ;
-  case Int(SrcType::NOD):
-    obsType = "NOD" ;
-    break ;
-  case Int(SrcType::FSON):
-    obsType = "FSON" ;
-    break ;
-  case Int(SrcType::FSOFF):
-    obsType = "FSOFF" ;
-    break ;
-  case Int(SrcType::SKY):
-    obsType = "SKY" ;
-    break ;
-  case Int(SrcType::HOT):
-    obsType = "HOT" ;
-    break ;
-  case Int(SrcType::WARM):
-    obsType = "WARM" ;
-    break ;
-  case Int(SrcType::COLD):
-    obsType = "COLD" ;
-    break ;
-  case Int(SrcType::PONCAL):
-    obsType = "PSON:CALON" ;
-    break ;
-  case Int(SrcType::POFFCAL):
-    obsType = "PSOFF:CALON" ;
-    break ;
-  case Int(SrcType::NODCAL):
-    obsType = "NOD:CALON" ;
-    break ;
-  case Int(SrcType::FONCAL):
-    obsType = "FSON:CALON" ;
-    break ;
-  case Int(SrcType::FOFFCAL):
-    obsType = "FSOFF:CALOFF" ;
-    break ;
-  case Int(SrcType::FSLO):
-    obsType = "FSLO" ;
-    break ;
-  case Int(SrcType::FLOOFF):
-    obsType = "FS:LOWER:OFF" ;
-    break ;
-  case Int(SrcType::FLOSKY):
-    obsType = "FS:LOWER:SKY" ;
-    break ;
-  case Int(SrcType::FLOHOT):
-    obsType = "FS:LOWER:HOT" ;
-    break ;
-  case Int(SrcType::FLOWARM):
-    obsType = "FS:LOWER:WARM" ;
-    break ;
-  case Int(SrcType::FLOCOLD):
-    obsType = "FS:LOWER:COLD" ;
-    break ;
-  case Int(SrcType::FSHI):
-    obsType = "FSHI" ;
-    break ;
-  case Int(SrcType::FHIOFF):
-    obsType = "FS:HIGHER:OFF" ;
-    break ;
-  case Int(SrcType::FHISKY):
-    obsType = "FS:HIGHER:SKY" ;
-    break ;
-  case Int(SrcType::FHIHOT):
-    obsType = "FS:HIGHER:HOT" ;
-    break ;
-  case Int(SrcType::FHIWARM):
-    obsType = "FS:HIGHER:WARM" ;
-    break ;
-  case Int(SrcType::FHICOLD):
-    obsType = "FS:HIGHER:COLD" ;
-    break ;
-  default:
-    obsType = "NOTYPE" ;
-  }
-
-  return obsType ;
-}
-
-}
+  return SrcType::getName(srctype) ;
+}
+
+}

trunk/src/Scantable.cpp

@@ -61 +61 @@
 #include <coordinates/Coordinates/CoordinateUtil.h>
 
+#include <atnf/PKSIO/SrcType.h>
 #include "Scantable.h"
 #include "STPolLinear.h"
@@ -994 +995 @@
                   + ")";
   oss << setw(5) << "Scan" << setw(15) << "Source"
-      << setw(10) << "Time" << setw(18) << "Integration" << endl;
+      << setw(10) << "Time" << setw(18) << "Integration" 
+      << setw(15) << "Source Type" << endl;
   oss << setw(5) << "" << setw(5) << "Beam" << setw(3) << "" << dirtype << endl;
   oss << setw(10) << "" << setw(3) << "IF" << setw(3) << ""
@@ -1020 +1022 @@
     }
     oss << setw(3) << std::right << nint  << setw(3) << " x " << std::left
-        << setw(6) <<  formatSec(rec.asFloat("INTERVAL")) << endl;
+        << setw(11) <<  formatSec(rec.asFloat("INTERVAL")) << setw(1) << ""
+        << setw(15) << SrcType::getName(rec.asInt("SRCTYPE")) << endl;
 
     TableIterator biter(subt, "BEAMNO");

trunk/src/Scantable.h

@@ -501 +501 @@
 
   /**
-   * Turns a time vale into a formatted string
+   * Turns a time value into a formatted string
    * @param x
    * @return