Changeset 865 for trunk

Timestamp:

03/06/06 10:39:18 (19 years ago)

Author:

mar637

Message:

added getAbcissa and several inline get functions. Full support of Table::Plain now (Ger modifications incasa::Table)

Location:

trunk/src

Files:

• Scantable.cpp (modified) (8 diffs)
• Scantable.h (modified) (4 diffs)

trunk/src/Scantable.cpp

@@ -85 +85 @@
   type_(ttype)
 {
-  Table tab(name);
+  Table tab(name, Table::Update);
   Int version;
   tab.keywordSet().get("VERSION", version);
@@ -104 +104 @@
   // with or without data
   String newname = String(generateName());
+  type_ = other.table_.tableType();
   if ( other.table_.tableType() == Table::Memory ) {
       if ( clear ) {
-        cout << "copy ctor memory clear" << endl;
         table_ = TableCopy::makeEmptyMemoryTable(newname,
                                                  other.table_, True);
@@ -112 +112 @@
         table_ = other.table_.copyToMemoryTable(newname);
   } else {
-    if ( clear ) {
-      cout << "copy ctor clear" << endl;
-      other.table_.deepCopy(newname, Table::New);
-      cout << "reading table" << endl;
-      table_ = Table(newname, Table::Scratch);
-      cout << "removing rows" << endl;
-      table_.removeRow(table_.rowNumbers());
-
-    } else {
-      cout << "copy ctor no clear" << endl;
-      other.table_.deepCopy(newname, Table::Scratch);
-      table_ = Table(newname, Table::Scratch);
-    }
-  }
-  //table_.rwKeywordSet().renameTables(newname, table_.tableName());
-  //cout << table_.keywordSet().asTable("TCAL").tableName() << endl;
+      other.table_.deepCopy(newname, Table::New, False, Table::AipsrcEndian,
+                            Bool(clear));
+      table_ = Table(newname, Table::Update);
+      copySubtables(other);
+      table_.markForDelete();
+  }
+
   attachSubtables();
   originalTable_ = table_;
   attach();
+}
+
+void Scantable::copySubtables(const Scantable& other) {
+  Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
+  TableCopy::copyRows(t, other.freqTable_.table());
+  t = table_.rwKeywordSet().asTable("FOCUS");
+  TableCopy::copyRows(t, other.focusTable_.table());
+  t = table_.rwKeywordSet().asTable("WEATHER");
+  TableCopy::copyRows(t, other.weatherTable_.table());
+  t = table_.rwKeywordSet().asTable("TCAL");
+  TableCopy::copyRows(t, other.tcalTable_.table());
+  t = table_.rwKeywordSet().asTable("MOLECULES");
+  TableCopy::copyRows(t, other.moleculeTable_.table());
+  t = table_.rwKeywordSet().asTable("HISTORY");
+  TableCopy::copyRows(t, other.historyTable_.table());
 }
 
@@ -235 +241 @@
   specCol_.attach(table_, "SPECTRA");
   flagsCol_.attach(table_, "FLAGTRA");
-  tsCol_.attach(table_, "TSYS");
+  tsysCol_.attach(table_, "TSYS");
   cycleCol_.attach(table_,"CYCLENO");
   scanCol_.attach(table_, "SCANNO");
@@ -390 +396 @@
   Path path(inname);
   inname = path.expandedName();
-  //cout << table_.tableName() << endl;
-  //cout << freqTable_.table().tableName() << endl;
   table_.deepCopy(inname, Table::New);
-  //Table t = Table(inname, Table::Update);
-  //cout << t.keywordSet().asTable("FREQUENCIES").tableName() << endl;
 }
 
@@ -551 +553 @@
   }
   pushLog(String(oss));
+}
+
+void Scantable::flag()
+{
+  if ( selector_.empty() )
+    throw(AipsError("Trying to flag whole scantable. Aborted."));
 }
 
@@ -726 +734 @@
 }
 
+std::vector< double > asap::Scantable::getAbcissa( int whichrow ) const
+{
+  if ( whichrow > table_.nrow() ) throw(AipsError("Illegal ro number"));
+  std::vector<double> stlout;
+  int nchan = specCol_(whichrow).nelements();
+  cout << nchan << endl;
+  String us = freqTable_.getUnitString();
+  if ( us == "" || us == "pixel" || us == "channel" ) {
+    for (int i=0; i<nchan; ++i) {
+      stlout.push_back(double(i));
+    }
+    return stlout;
+  }
+
+  const MPosition& mp = getAntennaPosition();
+  const MDirection& md = dirCol_(whichrow);
+  const MEpoch& me = timeCol_(whichrow);
+  Double rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
+  SpectralCoordinate spc =
+    freqTable_.getSpectralCoordinate(md, mp, me, rf, mfreqidCol_(whichrow));
+  Vector<Double> pixel(nchan);
+  Vector<Double> world;
+  indgen(pixel);
+  if ( Unit(us) == Unit("Hz") ) {
+    for ( int i=0; i < nchan; ++i) {
+      Double world;
+      spc.toWorld(world, pixel[i]);
+      stlout.push_back(double(world));
+    }
+  } else if ( Unit(us) == Unit("km/s") ) {
+    Vector<Double> world;
+    spc.pixelToVelocity(world, pixel);
+    world.tovector(stlout);
+  }
+  return stlout;
+}
+
 std::string Scantable::getAbcissaLabel( int whichrow ) const
 {
@@ -774 +819 @@
 }
 
+
+
 }//namespace asap

trunk/src/Scantable.h

@@ -227 +227 @@
   int getIF(int whichrow) const;
   int getPol(int whichrow) const;
+  int getCycle(int whichrow) const { return cycleCol_(whichrow); }
+  int getScan(int whichrow) const { return scanCol_(whichrow); }
 
   double getInterval(int whichrow) const
     { return integrCol_(whichrow); }
 
-  float getTsys(int whichrow) const;
+  float getTsys(int whichrow) const
+    { return casa::Vector<casa::Float>(tsysCol_(whichrow))(0); }
   float getElevation(int whichrow) const
     { return elCol_(whichrow); }
   float getAzimuth(int whichrow) const
     { return azCol_(whichrow); }
-  float getParangle(int whichrow) const
+  float getParAngle(int whichrow) const
     { return paraCol_(whichrow); }
+
+  std::string getSourceName(int whichrow) const
+    { return srcnCol_(whichrow); }
 
   std::vector<bool> getMask(int whichrow) const;
@@ -277 +283 @@
   void setCoordInfo(std::vector<string> theinfo)
     { return freqTable_.setInfo(theinfo); };
+
+
+  std::vector<double> getAbcissa(int whichrow) const;
 
   std::string getAbcissaLabel(int whichrow) const;
@@ -329 +338 @@
 
   void attachSubtables();
+  void copySubtables(const Scantable& other);
+
   /**
    * Convert an "old" asap1 style row index into a new index
@@ -365 +376 @@
   casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_;
   casa::ScalarColumn<casa::Int> rbeamCol_;
-  casa::ArrayColumn<casa::Float> specCol_, tsCol_;
+  casa::ArrayColumn<casa::Float> specCol_, tsysCol_;
   casa::ArrayColumn<casa::uChar> flagsCol_;