Changeset 1777 for branches/mergetest

Timestamp:

07/29/10 18:05:26 (14 years ago)

Author:

Malte Marquarding

Message:

Created branch to test alma merge back into trunk

Location:

branches/mergetest

Files:

• . (copied) (copied from trunk )
• src/STFiller.cpp (modified) (3 diffs)
• src/STMath.cpp (modified) (2 diffs)
• src/python_asap.cpp (modified) (1 diff)
• src/python_asap.h (modified) (1 diff)

branches/mergetest/src/STFiller.cpp

@@ -118 +118 @@
   header_->npol = max(npols);
   header_->nbeam = nBeam_;
-  
+
   Int status = reader_->getHeader(header_->observer, header_->project,
                                   header_->antennaname, header_->antennaposition,
@@ -201 +201 @@
   //For MS, add the location of POINTING of the input MS so one get
   //pointing data from there, if necessary.
-  //Also find nrow in MS 
+  //Also find nrow in MS
   nInDataRow = 0;
   if (format == "MS2") {
-    Path datapath(inName); 
+    Path datapath(inName);
     String ptTabPath = datapath.absoluteName();
     Table inMS(ptTabPath);
@@ -317 +317 @@
 
     RecordFieldPtr<uInt> mfocusidCol(rec, "FOCUS_ID");
-    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi, 
+    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi,
                                   pksrec.focusTan, pksrec.focusRot);
     *mfocusidCol = id;

branches/mergetest/src/STMath.cpp

@@ -44 +44 @@
 #include <scimath/Functionals/Polynomial.h>
 
+#include <casa/Logging/LogIO.h>
+
 #include "MathUtils.h"
 #include "RowAccumulator.h"
@@ -74 +76 @@
                     "Use merge first."));
   WeightType wtype = stringToWeight(weight);
+  LogIO os( LogOrigin( "STMath", "average()", WHERE ) ) ;
+  os << "test" << LogIO::POST ;
 
   // output

branches/mergetest/src/python_asap.cpp

@@ -75 +75 @@
   asap::python::python_LineCatalog();
   asap::python::python_Logger();
+  asap::python::python_LogSink();
   asap::python::python_STCoordinate();
   asap::python::python_STAtmosphere();

branches/mergetest/src/python_asap.h

@@ -47 +47 @@
     void python_LineCatalog();
     void python_Logger();
+    void python_LogSink();
     void python_STCoordinate();
     void python_STAtmosphere();