Changeset 1777 for branches


Ignore:
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:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/mergetest/src/STFiller.cpp

    r1725 r1777  
    118118  header_->npol = max(npols);
    119119  header_->nbeam = nBeam_;
    120  
     120
    121121  Int status = reader_->getHeader(header_->observer, header_->project,
    122122                                  header_->antennaname, header_->antennaposition,
     
    201201  //For MS, add the location of POINTING of the input MS so one get
    202202  //pointing data from there, if necessary.
    203   //Also find nrow in MS 
     203  //Also find nrow in MS
    204204  nInDataRow = 0;
    205205  if (format == "MS2") {
    206     Path datapath(inName); 
     206    Path datapath(inName);
    207207    String ptTabPath = datapath.absoluteName();
    208208    Table inMS(ptTabPath);
     
    317317
    318318    RecordFieldPtr<uInt> mfocusidCol(rec, "FOCUS_ID");
    319     id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi, 
     319    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi,
    320320                                  pksrec.focusTan, pksrec.focusRot);
    321321    *mfocusidCol = id;
  • branches/mergetest/src/STMath.cpp

    r1689 r1777  
    4444#include <scimath/Functionals/Polynomial.h>
    4545
     46#include <casa/Logging/LogIO.h>
     47
    4648#include "MathUtils.h"
    4749#include "RowAccumulator.h"
     
    7476                    "Use merge first."));
    7577  WeightType wtype = stringToWeight(weight);
     78  LogIO os( LogOrigin( "STMath", "average()", WHERE ) ) ;
     79  os << "test" << LogIO::POST ;
    7680
    7781  // output
  • branches/mergetest/src/python_asap.cpp

    r1715 r1777  
    7575  asap::python::python_LineCatalog();
    7676  asap::python::python_Logger();
     77  asap::python::python_LogSink();
    7778  asap::python::python_STCoordinate();
    7879  asap::python::python_STAtmosphere();
  • branches/mergetest/src/python_asap.h

    r1715 r1777  
    4747    void python_LineCatalog();
    4848    void python_Logger();
     49    void python_LogSink();
    4950    void python_STCoordinate();
    5051    void python_STAtmosphere();
Note: See TracChangeset for help on using the changeset viewer.