Changeset 281 for trunk

Timestamp:

01/24/05 17:13:36 (20 years ago)

Author:

mar637

Message:

• revamped summary Function, added postion and number of integr. per scan
• added formatDirection
• modified getTime to return Header time on whichRow=-1

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (10 diffs)
• SDMemTable.h (modified) (2 diffs)

trunk/src/SDMemTable.cc

@@ -56 +56 @@
 #include <coordinates/Coordinates/CoordinateUtil.h>
 #include <casa/Quanta/MVTime.h>
+#include <casa/Quanta/MVAngle.h>
 
 #include "SDDefs.h"
@@ -181 +182 @@
 }
 
-std::string SDMemTable::getTime(Int whichRow) const
-{
-  ROScalarColumn<Double> src(table_, "TIME");
+std::string SDMemTable::getTime(Int whichRow, Bool showDate) const
+{
   Double tm;
-  src.get(whichRow, tm);
+  if (whichRow > -1) {
+    ROScalarColumn<Double> src(table_, "TIME");
+    src.get(whichRow, tm);
+  } else {
+    table_.keywordSet().get("UTC",tm);
+  }
   MVTime mvt(tm);
-  mvt.setFormat(MVTime::TIME);
+  if (showDate)
+    mvt.setFormat(MVTime::YMD);
+  else 
+    mvt.setFormat(MVTime::TIME);
   ostringstream oss;
   oss << mvt;
-  String str(oss);
-  return str;
-}
+  return String(oss);
+}
+
 double SDMemTable::getInterval(Int whichRow) const
 {
@@ -620 +628 @@
 }
 
-MDirection SDMemTable::getDirection(Int whichRow) const
+MDirection SDMemTable::getDirection(Int whichRow, Bool refBeam) const
 {
   MDirection::Types mdr = getDirectionReference();
@@ -917 +925 @@
   Double xcop = x;
   MVTime mvt(xcop/24./3600.);  // make days
+  
   if (x < 59.95)
-    return  String("   ") + mvt.string(MVTime::TIME_CLEAN_NO_HM, 7)+"s";
-  return mvt.string(MVTime::TIME_CLEAN_NO_H, 7)+" ";
+    return  String("      ") + mvt.string(MVTime::TIME_CLEAN_NO_HM, 7)+"s";
+  else if (x < 3599.95) 
+    return String("   ") + mvt.string(MVTime::TIME_CLEAN_NO_H,7)+" ";
+  else {
+    ostringstream oss;
+    oss << setw(2) << std::right << setprecision(1) << mvt.hour();
+    oss << ":" << mvt.string(MVTime::TIME_CLEAN_NO_H,7) << " ";
+    return String(oss);
+  }   
 };
+
+String SDMemTable::formatDirection(const MDirection& md) const
+{
+  Vector<Double> t = md.getAngle(Unit(String("rad"))).getValue();
+  Int prec = 7;
+
+  MVAngle mvLon(t[0]);
+  String sLon = mvLon.string(MVAngle::TIME,prec);
+  MVAngle mvLat(t[1]);
+  String sLat = mvLat.string(MVAngle::ANGLE+MVAngle::DIG2,prec);
+
+   return sLon + String(" ") + sLat;
+}
+
 
 std::string SDMemTable::getFluxUnit() const
@@ -953 +983 @@
   ROScalarColumn<Int> scans(table_, "SCANID");
   ROScalarColumn<String> srcs(table_, "SRCNAME");
+
+  // get number of integrations per scan
+  int cIdx = 0;
+  int idx = 0;
+  int scount = 0;
+  std::vector<int> cycles;
+  for (uInt i=0; i<scans.nrow();++i) {
+    while (idx == cIdx && i<scans.nrow()) {
+      scans.getScalar(++i,cIdx);
+      ++scount;
+    }
+    idx = cIdx;
+    cycles.push_back(scount);
+    scount=0;
+    --i;
+  }  
+
+
   ostringstream oss;
   oss << endl;
@@ -967 +1015 @@
   table_.keywordSet().get("Observer", tmp);
   oss << setw(15) << "Observer:" << tmp << endl;
+  oss << setw(15) << "Obs Date:" << getTime(-1,True) << endl;
   table_.keywordSet().get("Project", tmp);
   oss << setw(15) << "Project:" << tmp << endl;
@@ -992 +1041 @@
   Int previous = -1;Int current=0;
   Int integ = 0;
+  String dirtype ="Position ("+
+    MDirection::showType(getDirectionReference())+
+    ")";
   oss << setw(6) << "Scan"
-      << setw(12) << "Source"
-      << setw(21) << "Time"
-      << setw(11) << "Integration" << endl;
-  oss << "--------------------------------------------------" << endl;
+      << setw(15) << "Source"
+      << setw(26) << dirtype
+      << setw(10) << "Time"
+      << setw(13) << "Integration" << endl;
+  oss << "-------------------------------------------------------------------------------" << endl;
+  
+  std::vector<int>::iterator it = cycles.begin();
   for (uInt i=0; i< scans.nrow();i++) {
     scans.getScalar(i,current);
@@ -1003 +1058 @@
       previous = current;
       String t = formatSec(Double(getInterval(i)));
-      oss << setw(6) << count << setw(12) << name << setw(21) << getTime(i)
-          << setw(2) << setprecision(1)
-          << t << endl;
+      String posit = formatDirection(getDirection(i,True));
+      oss << setw(6) << count 
+          << setw(15) << name
+          << setw(26) << posit
+          << setw(10) << getTime(i,False)
+          << setw(3) << std::right << *it << " x "
+          << setw(10) 
+          << t << std::left << endl;
       count++;
+      it++;
     } else {
       integ++;
@@ -1014 +1075 @@
   oss << "Table contains " << table_.nrow() << " integration(s)." << endl;
   oss << "in " << count << " scan(s)." << endl;
-  oss << "--------------------------------------------------";
+  oss << "-------------------------------------------------------------------------------";
   return String(oss);
 }
@@ -1101 +1162 @@
 }
 
-MDirection::Types SDMemTable::getDirectionReference () const
+MDirection::Types SDMemTable::getDirectionReference() const
 {  
   Float eq;

trunk/src/SDMemTable.h

@@ -93 +93 @@
   std::vector<double> getRestFreqs() const;
   
-  // get info for current row
-  std::string getTime(casa::Int whichRow=0) const ;
+  // get info for current row  
+  // if whichRow == -1 the Header time is given
+  std::string getTime(casa::Int whichRow=0, 
+                      casa::Bool showDate=casa::False) const ;
   std::string getSourceName(casa::Int whichRow=0) const;
   double getInterval(casa::Int whichRow=0) const;
@@ -173 +175 @@
 
 // Get MDirection for this row
-  casa::MDirection getDirection(casa::Int whichRow=0) const; 
+  casa::MDirection getDirection(casa::Int whichRow=0,
+                                casa::Bool refBeam=casa::False) const; 
 
 // Get gloabl Direction reference 
-  casa::MDirection::Types getDirectionReference () const;
+  casa::MDirection::Types getDirectionReference() const;
 
 // Get global Time reference
-  casa::MEpoch::Types getTimeReference () const;
+  casa::MEpoch::Types getTimeReference() const;
 
 // Helper function to check instrument (antenna) name and give enum
-  static Instrument convertInstrument (const casa::String& instrument,
-                                       casa::Bool throwIt);
+  static Instrument convertInstrument(const casa::String& instrument,
+                                      casa::Bool throwIt);
 
 private:
   // utility func for nice printout
   casa::String formatSec(casa::Double x) const;
+  casa::String formatDirection(const casa::MDirection& md) const;
   void setup();
   // the current cursor into the array