Changeset 1259 for trunk/src

Timestamp:

09/11/06 15:10:05 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk/src

Files:

• LineCatalog.cpp (modified) (3 diffs)
• LineCatalog.h (modified) (1 diff)
• Makefile (modified) (5 diffs)
• STMath.cpp (modified) (2 diffs)
• STPolCircular.cpp (modified) (1 diff)
• STWriter.cpp (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/LineCatalog.cpp

@@ -96 +96 @@
       oss << std::left << setw(20) << getName(i);
       oss << setw(12) << setprecision(8) << std::left << getFrequency(i);
+      oss << setw(12) << setprecision(8) << std::left << getStrength(i);
       oss << endl;
     }
@@ -103 +104 @@
         oss << std::left << setw(20) << getName(row);
         oss << setw(12) << setprecision(8) << std::left << getFrequency(row);
+        oss << setw(12) << setprecision(8) << std::left << getStrength(row);
         oss << endl;
       } else {
@@ -127 +129 @@
 }
 
+double asap::LineCatalog::getStrength(uint row) const
+{
+  ROScalarColumn<Double> col(table_, "Column3");
+  return col(row);
+}
+
 
 } // namespace

trunk/src/LineCatalog.h

@@ -85 +85 @@
 
   /**
+   * Return the line strength value for a specific row
+   * @param row the row number
+   * @return a double rest line strength value
+   */
+  double getStrength(uint row) const;
+
+  /**
    *
    * @param row

trunk/src/Makefile

@@ -25 +25 @@
 
 # cfitsio
-CFITSIOROOT := /usr
-# If aips++ is build with LFS (default) you need to have
-# libcfitsio with lfs support
-# this is default in cfitsio >= 3.0
+CFITSIOROOT := /usr/local
 CFITSIOINC := -I$(CFITSIOROOT)/include
-CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
+CFITSIOLIB := -L$(CFITSIOROOT)/lib -lcfitsio
 
 #rpfits
@@ -36 +33 @@
 RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
 
-G2CROOT := /usr
-G2CLIB := $(G2CROOT)/lib -lg2c
+G2CROOT := /usr/local
+G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
+G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
+G2CLIB := $(G2CROOT)/lib/libgfortran.a $(G2CARCH)
 
 # This assumes all casa libs are static only (*.a)
@@ -79 +78 @@
 
 # has to be build with same g++ version as casa
-BOOSTROOT := /usr
+BOOSTROOT := /usr/local
 BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
 BOOSTINC  := -I$(BOOSTROOT)/include/boost
@@ -92 +91 @@
              RowAccumulator.o \
              Logger.o \
+             LineCatalog.o \
              STAttr.o \
              STHeader.o \
@@ -124 +124 @@
              python_STFitEntry.o \
              python_STWriter.o \
+             python_LineCatalog.o \
              python_asap.o
 

trunk/src/STMath.cpp

@@ -350 +350 @@
   TableRow row(tout);
   ROScalarColumn<Double> offtimeCol(offs, "TIME");
-
   ArrayColumn<Float> outspecCol(tout, "SPECTRA");
   ROArrayColumn<Float> outtsysCol(tout, "TSYS");
@@ -359 +358 @@
     ROScalarColumn<Double> offtimeCol(offs, "TIME");
     Double mindeltat = min(abs(offtimeCol.getColumn() - ontime));
-    Table sel = offs( abs(offs.col("TIME")-ontime) <= mindeltat
+    // Timestamp may vary within a cycle ???!!!
+    // increase this by 0.5 sec in case of rounding errors...
+    // There might be a better way to do this.
+    mindeltat += 0.5;
+    Table sel = offs( abs(offs.col("TIME")-ontime) <= (mindeltat+0.5)
                        && offs.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
                        && offs.col("IFNO") == Int(rec.asuInt("IFNO"))
                        && offs.col("POLNO") == Int(rec.asuInt("POLNO")) );
 
+    if ( sel.nrow() < 1 )  {
+      throw(AipsError("No closest in time found... This could be a rounding "
+                      "issue. Try quotient instead."));
+    }
     TableRow offrow(sel);
     const TableRecord& offrec = offrow.get(0);//should only be one row

trunk/src/STPolCircular.cpp

@@ -35 +35 @@
     if ( index == 0 )
       out = Vector<Float>(getSpectrum(0) + getSpectrum(1));
+    else if ( index == 3 )
+      out = Vector<Float>(getSpectrum(0) - getSpectrum(1));
   }
   return out;

trunk/src/STWriter.cpp

@@ -298 +298 @@
 {
   String poltype = tab.keywordSet().asString("POLTYPE");
-  if ( poltype != "linear") {
+  if ( poltype == "stokes") {
     String msg = "poltype = " + poltype + " not yet supported in output.";
     throw(AipsError(msg));

trunk/src/python_Scantable.cpp

@@ -77 +77 @@
          (arg("whichrow")=0, arg("poltype")=std::string("")) )
     .def("poltype", &ScantableWrapper::getPolType )
-    .def("column_names", &ScantableWrapper::columnNames)
+    .def("get_column_names", &ScantableWrapper::columnNames)
     .def("_getpollabel", &ScantableWrapper::getPolarizationLabel)
     .def("_setspectrum",&ScantableWrapper::setSpectrum,