Changeset 3029 for trunk


Ignore:
Timestamp:
03/03/15 18:26:31 (10 years ago)
Author:
Kana Sugimoto
Message:

New Development: Yes

JIRA Issue: Yes (CAS-6929)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap as a whole

Description: committing Darrell's changes to make asap work with merged casacore.


Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r3027 r3029  
    643643# common include path
    644644#
    645 include_directories( ${CASACORE_INCLUDE_DIR}
     645include_directories( ${CASACORE_INCLUDE_DIR}/..
     646                     ${CASACORE_INCLUDE_DIR}
    646647                     ${Boost_INCLUDE_DIR}
    647648                     ${X11_INCLUDE_DIRS}

  • trunk/SConstruct

    r2998 r3029  
    163163            conf.env.AppendUnique(CPPPATH=[pth])
    164164            break
    165     cclibs = ["casa_images", "casa_ms", "casa_components",
     165    cclibs = ["casa_images", "casa_ms", #"casa_components",
    166166              "casa_coordinates", "casa_lattices",
    167167              "casa_fits", "casa_measures", "casa_scimath",

  • trunk/external-alma/atnf/PKSIO/FITSreader.cc

    r1757 r3029  
    3838
    3939#include <atnf/PKSIO/FITSreader.h>
    40 
    4140#include <algorithm>
     41#include <cstdlib>
    4242
    4343using namespace std;

  • trunk/external-alma/atnf/pks/pks_maths.cc

    r2998 r3029  
    3535
    3636// AIPS++ includes.
     37#include <complex>
    3738#include <casa/aips.h>
    3839#include <casa/math.h>

  • trunk/external-alma/components/SpectralComponents/SpectralElement.cc

    r2980 r3029  
    5353  _fixed(other._fixed.copy()),
    5454  _function(
    55                 std::tr1::shared_ptr<Function<Double, Double> >(
     55                SHARED_PTR<Function<Double, Double> >(
    5656                        other._function->clone()
    5757                )
    … …  
    7272                _fixed.resize(n);
    7373                _fixed = other._fixed.copy();
    74                 _function = std::tr1::shared_ptr<Function<Double, Double> >(
     74                _function = SHARED_PTR<Function<Double, Double> >(
    7575                        other._function->clone()
    7676                );
    … …  
    165165
    166166void SpectralElement::_setFunction(
    167         const std::tr1::shared_ptr<Function<Double, Double> >& f
     167        const SHARED_PTR<Function<Double, Double> >& f
    168168) {
    169169        _function = f;

  • trunk/external-alma/components/SpectralComponents/SpectralElement.h

    r2980 r3029  
    3030#define COMPONENTS_SPECTRALELEMENT_H
    3131
     32#include <memory>
    3233#include <casa/aips.h>
    3334#include <casa/Arrays/Vector.h>
    3435#include <casa/Containers/RecordInterface.h>
    35 ///#include <casa/Utilities/CountedPtr.h>
    36 #include <tr1/memory>
    3736
    3837namespace casa { //# NAMESPACE CASA - BEGIN
    … …  
    174173        void _setType(const Types type);
    175174
    176         void _setFunction(const std::tr1::shared_ptr<Function<Double, Double> >& f);
    177 
    178         virtual std::tr1::shared_ptr<Function<Double, Double> > _getFunction() const {
     175        void _setFunction(const SHARED_PTR<Function<Double, Double> >& f);
     176
     177        virtual SHARED_PTR<Function<Double, Double> > _getFunction() const {
    179178                return _function;
    180179        }
    … …  
    194193        Vector<Bool> _fixed;
    195194
    196         std::tr1::shared_ptr<Function<Double, Double> > _function;
     195        SHARED_PTR<Function<Double, Double> > _function;
    197196
    198197};

  • trunk/getsvnrev.sh

    r2998 r3029  
    44# we executed make.
    55
    6 # if we don't see the .svn directory, just return
    7 if test ! -d .svn; then
     6svn info > /dev/null 2>&1
     7if [ $? -ne 0 ]; then
    88   exit 0;
    99fi

  • trunk/src/CMakeLists.txt

    r3028 r3029  
    1010include_directories( ${SRCDIR}
    1111                     ${Boost_INCLUDE_DIR}
    12                      ${COMPONENTS_INCLUDE_DIR}
    1312                     ${ASAPROOT}/external-alma
    1413                     ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
    … …  
    138137                       ${ATNFLIB}
    139138                       #${CASACORE_LIBRARIES}
    140                        ${WCSLIB}
    141                        ${COMPONENTS_LIBRARY} )
     139                       ${WCSLIB} )
    142140target_link_libraries( ${ASAPPYLIB}
    143141                       ${ASAPLIB} )

  • trunk/src/PKSFiller.cpp

    r2907 r3029  
    292292      srctype =  Int(SrcType::PSOFF);
    293293    } else {
    294       srcname = pksrec.srcName.before(rx2);
     294      SubString sub = pksrec.srcName.before(rx2);
     295      srcname = string(sub.chars( ),sub.length( ));
    295296      srctype =  Int(SrcType::PSON);
    296297    }

  • trunk/src/STLineFinder.cpp

    r2961 r3029  
    8989                 const casa::Vector<casa::Bool>   &in_mask,
    9090                 const std::pair<int,int>         &in_edge,
    91                  int in_max_box_nchan) throw(AipsError);
     91                 int in_max_box_nchan);
    9292
    9393   // access to the statistics
    94    const casa::Float& getLinMean() const throw(AipsError);
    95    const casa::Float& getLinVariance() const throw(AipsError);
    96    casa::Float aboveMean() const throw(AipsError);
    97    int getChannel() const throw();
     94   const casa::Float& getLinMean() const;
     95   const casa::Float& getLinVariance() const;
     96   casa::Float aboveMean() const;
     97   int getChannel() const;
    9898
    9999   // actual number of channels in the box (max_box_nchan, if no channels
    100100   // are masked)
    101    int getNumberOfBoxPoints() const throw();
     101   int getNumberOfBoxPoints() const;
    102102
    103103   // next channel
    104    void next() throw(AipsError);
     104   void next();
    105105
    106106   // checking whether there are still elements
    107    casa::Bool haveMore() const throw();
     107   casa::Bool haveMore() const;
    108108
    109109   // go to start
    110    void rewind() throw(AipsError);
     110   void rewind();
    111111
    112112protected:
    … …  
    116116   // Channels, for which the mask is false or index is beyond the
    117117   // allowed range, are ignored
    118    void advanceRunningBox(int ch) throw(casa::AipsError);
     118   void advanceRunningBox(int ch);
    119119
    120120   // calculate derivative statistics. This function is const, because
    121121   // it updates the cache only
    122    void updateDerivativeStatistics() const throw(AipsError);
     122   void updateDerivativeStatistics() const;
    123123};
    124124
    … …  
    166166                    casa::Float in_threshold = 5,
    167167                    bool use_median = false,
    168                     int noise_sample_size = -1) throw();
    169    virtual ~LFAboveThreshold() throw();
     168                    int noise_sample_size = -1);
     169   virtual ~LFAboveThreshold();
    170170
    171171   // replace the detection criterion
    172    void setCriterion(int in_min_nchan, casa::Float in_threshold) throw();
     172   void setCriterion(int in_min_nchan, casa::Float in_threshold);
    173173
    174174   // return the array with signs of the value-current mean
    … …  
    176176   // This array is updated each time the findLines method is called and
    177177   // is used to search the line wings
    178    const casa::Vector<Int>& getSigns() const throw();
     178   const casa::Vector<Int>& getSigns() const;
    179179
    180180   // find spectral lines and add them into list
    … …  
    186186                  const casa::Vector<casa::Bool> &mask,
    187187                  const std::pair<int,int> &edge,
    188                   int max_box_nchan) throw(casa::AipsError);
     188                  int max_box_nchan);
    189189
    190190protected:
    … …  
    193193   // add a new line to the list, if necessary using processCurLine()
    194194   // detect=true indicates that the current channel satisfies the criterion
    195    void processChannel(Bool detect, const casa::Vector<casa::Bool> &mask)
    196                                                   throw(casa::AipsError);
     195   void processChannel(Bool detect, const casa::Vector<casa::Bool> &mask);
    197196
    198197   // process the interval of channels stored in curline
    199198   // if it satisfies the criterion, add this interval as a new line
    200    void processCurLine(const casa::Vector<casa::Bool> &mask)
    201                                                  throw(casa::AipsError);
     199   void processCurLine(const casa::Vector<casa::Bool> &mask);
    202200
    203201   // get the sign of runningBox->aboveMean(). The RunningBox pointer
    204202   // should be defined
    205    casa::Int getAboveMeanSign() const throw();
     203   casa::Int getAboveMeanSign() const;
    206204};
    207205
    … …  
    463461                       const casa::Vector<casa::Bool>   &in_mask,
    464462                       const std::pair<int,int>         &in_edge,
    465                        int in_max_box_nchan) throw(AipsError) :
     463                       int in_max_box_nchan) :
    466464        spectrum(in_spectrum), mask(in_mask), edge(in_edge),
    467465        max_box_nchan(in_max_box_nchan)
    … …  
    470468}
    471469
    472 void RunningBox::rewind() throw(AipsError) {
     470void RunningBox::rewind() {
    473471  // fill statistics for initial box
    474472  box_chan_cntr=0; // no channels are currently in the box
    … …  
    491489
    492490// access to the statistics
    493 const casa::Float& RunningBox::getLinMean() const throw(AipsError)
     491const casa::Float& RunningBox::getLinMean() const
    494492{
    495493  DebugAssert(cur_channel<edge.second, AipsError);
    … …  
    498496}
    499497
    500 const casa::Float& RunningBox::getLinVariance() const throw(AipsError)
     498const casa::Float& RunningBox::getLinVariance() const
    501499{
    502500  DebugAssert(cur_channel<edge.second, AipsError);
    … …  
    505503}
    506504
    507 casa::Float RunningBox::aboveMean() const throw(AipsError)
     505casa::Float RunningBox::aboveMean() const
    508506{
    509507  DebugAssert(cur_channel<edge.second, AipsError);
    … …  
    512510}
    513511
    514 int RunningBox::getChannel() const throw()
     512int RunningBox::getChannel() const
    515513{
    516514  return cur_channel;
    … …  
    519517// actual number of channels in the box (max_box_nchan, if no channels
    520518// are masked)
    521 int RunningBox::getNumberOfBoxPoints() const throw()
     519int RunningBox::getNumberOfBoxPoints() const
    522520{
    523521  return box_chan_cntr;
    … …  
    529527// Channels, for which the mask is false or index is beyond the
    530528// allowed range, are ignored
    531 void RunningBox::advanceRunningBox(int ch) throw(AipsError)
     529void RunningBox::advanceRunningBox(int ch)
    532530{
    533531  if (ch>=edge.first && ch<edge.second)
    … …  
    555553
    556554// next channel
    557 void RunningBox::next() throw(AipsError)
     555void RunningBox::next()
    558556{
    559557   AlwaysAssert(cur_channel<edge.second,AipsError);
    … …  
    564562
    565563// checking whether there are still elements
    566 casa::Bool RunningBox::haveMore() const throw()
     564casa::Bool RunningBox::haveMore() const
    567565{
    568566   return cur_channel<edge.second;
    … …  
    571569// calculate derivative statistics. This function is const, because
    572570// it updates the cache only
    573 void RunningBox::updateDerivativeStatistics() const throw(AipsError)
     571void RunningBox::updateDerivativeStatistics() const
    574572{
    575573  AlwaysAssert(box_chan_cntr, AipsError);
    … …  
    616614                                   casa::Float in_threshold,
    617615                                   bool use_median,
    618                                    int noise_sample_size) throw() :
     616                                   int noise_sample_size) :
    619617             min_nchan(in_min_nchan), threshold(in_threshold),
    620618             lines(in_lines), running_box(NULL), itsUseMedian(use_median),
    621619             itsNoiseSampleSize(noise_sample_size) {}
    622620
    623 LFAboveThreshold::~LFAboveThreshold() throw()
     621LFAboveThreshold::~LFAboveThreshold()
    624622{
    625623  if (running_box!=NULL) delete running_box;
    … …  
    628626// replace the detection criterion
    629627void LFAboveThreshold::setCriterion(int in_min_nchan, casa::Float in_threshold)
    630                                  throw()
    631628{
    632629  min_nchan=in_min_nchan;
    … …  
    636633// get the sign of runningBox->aboveMean(). The RunningBox pointer
    637634// should be defined
    638 casa::Int LFAboveThreshold::getAboveMeanSign() const throw()
     635casa::Int LFAboveThreshold::getAboveMeanSign() const
    639636{
    640637  const Float buf=running_box->aboveMean();
    … …  
    648645// add a new line to the list, if necessary
    649646void LFAboveThreshold::processChannel(Bool detect,
    650                  const casa::Vector<casa::Bool> &mask) throw(casa::AipsError)
     647                 const casa::Vector<casa::Bool> &mask)
    651648{
    652649  try {
    … …  
    680677// if it satisfies the criterion, add this interval as a new line
    681678void LFAboveThreshold::processCurLine(const casa::Vector<casa::Bool> &mask)
    682                                    throw(casa::AipsError)
    683679{
    684680  try {
    … …  
    714710// This array is updated each time the findLines method is called and
    715711// is used to search the line wings
    716 const casa::Vector<Int>& LFAboveThreshold::getSigns() const throw()
     712const casa::Vector<Int>& LFAboveThreshold::getSigns() const
    717713{
    718714  return signs;
    … …  
    724720                              const std::pair<int,int> &edge,
    725721                              int max_box_nchan)
    726                         throw(casa::AipsError)
    727722{
    728723  const int minboxnchan=4;
    … …  
    811806// common channel, and false otherwise
    812807// line2 - range of the second line: start channel and stop+1
    813 bool LFLineListOperations::IntersectsWith::operator()(const std::pair<int,int> &line2)
    814                           const throw()
     808bool LFLineListOperations::IntersectsWith::operator()(const std::pair<int,int> &line2) const
    815809{
    816810  if (line2.second<line1.first) return false; // line2 is at lower channels
    … …  
    835829// provided there is no gap between the lines
    836830void LFLineListOperations::BuildUnion::operator()(const std::pair<int,int> &new_line)
    837                                    throw()
    838831{
    839832  if (new_line.first<temp_line.first) temp_line.first=new_line.first;
    … …  
    842835
    843836// return the result (temp_line)
    844 const std::pair<int,int>& LFLineListOperations::BuildUnion::result() const throw()
     837const std::pair<int,int>& LFLineListOperations::BuildUnion::result() const
    845838{
    846839  return temp_line;
    … …  
    864857// in the ordered list (so, it is at greater channel numbers)
    865858bool LFLineListOperations::LaterThan::operator()(const std::pair<int,int> &line2)
    866                           const throw()
     859                          const
    867860{
    868861  if (line2.second<line1.first) return false; // line2 is at lower channels
    … …  
    884877//
    885878
    886 STLineFinder::STLineFinder() throw() : edge(0,0), err("spurious")
     879STLineFinder::STLineFinder() : edge(0,0), err("spurious")
    887880{
    888881  useScantable = true;
    … …  
    918911                              const casa::Float &in_box_size,
    919912                              const casa::Float &in_noise_box,
    920                               const casa::Bool &in_median) throw()
     913                              const casa::Bool &in_median)
    921914{
    922915  threshold=in_threshold;
    … …  
    928921}
    929922
    930 STLineFinder::~STLineFinder() throw(AipsError) {}
     923STLineFinder::~STLineFinder() {}
    931924
    932925// set scan to work with (in_scan parameter)
    933 void STLineFinder::setScan(const ScantableWrapper &in_scan) throw(AipsError)
     926void STLineFinder::setScan(const ScantableWrapper &in_scan)
    934927{
    935928  scan=in_scan.getCP();
    … …  
    957950int STLineFinder::findLines(const std::vector<bool> &in_mask,
    958951                            const std::vector<int> &in_edge,
    959                             const casa::uInt &whichRow) throw(casa::AipsError)
     952                            const casa::uInt &whichRow)
    960953{
    961954  if (useScantable && scan.null())
    … …  
    11051098// reducing the spectral resolution if the baseline shape is bad
    11061099void STLineFinder::subtractBaseline(const casa::Vector<casa::Bool> &temp_mask,
    1107                       const casa::Int &order) throw(casa::AipsError)
     1100                      const casa::Int &order)
    11081101{
    11091102  AlwaysAssert(spectrum.nelements(),AipsError);
    … …  
    11311124void STLineFinder::averageAdjacentChannels(casa::Vector<casa::Bool> &mask2update,
    11321125                                   const casa::Int &boxsize)
    1133                             throw(casa::AipsError)
    11341126{
    11351127  DebugAssert(mask2update.nelements()==spectrum.nelements(), AipsError);
    … …  
    11631155//       in setScan) are still excluded regardless on the invert option
    11641156std::vector<bool> STLineFinder::getMask(bool invert)
    1165                                         const throw(casa::AipsError)
     1157                                        const
    11661158{
    11671159  try {
    … …  
    12051197// get range for all lines found. The same units as used in the scan
    12061198// will be returned (e.g. velocity instead of channels).
    1207 std::vector<double> STLineFinder::getLineRanges()
    1208                              const throw(casa::AipsError)
     1199std::vector<double> STLineFinder::getLineRanges() const
    12091200{
    12101201  std::vector<double> vel;
    … …  
    12301221// The same as getLineRanges, but channels are always used to specify
    12311222// the range
    1232 std::vector<int> STLineFinder::getLineRangesInChannels()
    1233                                    const throw(casa::AipsError)
     1223std::vector<int> STLineFinder::getLineRangesInChannels() const
    12341224{
    12351225  try {
    … …  
    12801270                  std::list<std::pair<int, int> > &lines2update,
    12811271                  int max_box_nchan)
    1282                                    throw (casa::AipsError)
    12831272{
    12841273  try {
    … …  
    13391328void LFLineListOperations::addNewSearchResult(const std::list<pair<int, int> > &newlines,
    13401329                         std::list<std::pair<int, int> > &lines_list)
    1341                         throw(AipsError)
    13421330{
    13431331  try {
    … …  
    13861374           const casa::Vector<casa::Int> &signs,
    13871375           const casa::Vector<casa::Bool> &mask,
    1388            const std::pair<int,int> &edge) throw(casa::AipsError)
     1376           const std::pair<int,int> &edge)
    13891377{
    13901378  try {

  • trunk/src/STLineFinder.h

    r2943 r3029  
    6262   // the new line
    6363   static void addNewSearchResult(const std::list<std::pair<int, int> >
    64                   &newlines, std::list<std::pair<int, int> > &lines_list)
    65                            throw(casa::AipsError);
     64                  &newlines, std::list<std::pair<int, int> > &lines_list);
    6665
    6766   // extend all line ranges to the point where a value stored in the
    … …  
    7372                       const casa::Vector<casa::Int> &signs,
    7473                       const casa::Vector<casa::Bool> &mask,
    75                        const std::pair<int,int> &edge)
    76                            throw(casa::AipsError);
     74                       const std::pair<int,int> &edge);
    7775protected:
    7876
    … …  
    8684        // return true if line2 intersects with line1 with at least one
    8785        // common channel, and false otherwise
    88         bool operator()(const std::pair<int,int> &line2) const throw();
     86        bool operator()(const std::pair<int,int> &line2) const;
    8987   };
    9088
    … …  
    9896        // update temp_line with a union of temp_line and new_line
    9997        // provided there is no gap between the lines
    100         void operator()(const std::pair<int,int> &new_line) throw();
     98        void operator()(const std::pair<int,int> &new_line);
    10199        // return the result (temp_line)
    102         const std::pair<int,int>& result() const throw();
     100        const std::pair<int,int>& result() const;
    103101   };
    104102
    … …  
    113111        // return true if line2 should be placed later than line1
    114112        // in the ordered list (so, it is at greater channel numbers)
    115         bool operator()(const std::pair<int,int> &line2) const throw();
     113        bool operator()(const std::pair<int,int> &line2) const;
    116114   };
    117115
    … …  
    129127
    130128struct STLineFinder : protected LFLineListOperations {
    131    STLineFinder() throw();
    132    virtual ~STLineFinder() throw(casa::AipsError);
     129   STLineFinder();
     130   virtual ~STLineFinder();
    133131
    134132   // set the parameters controlling algorithm
    … …  
    160158                   const casa::Float &in_box_size=0.2,
    161159                   const casa::Float &in_noise_box=-1.,
    162                    const casa::Bool &in_median = casa::False) throw();
     160                   const casa::Bool &in_median = casa::False);
    163161
    164162   void setDetailedOptions( const casa::Int &order=9 ) ;
    165163
    166164   // set the scan to work with (in_scan parameter)
    167    void setScan(const ScantableWrapper &in_scan) throw(casa::AipsError);
     165   void setScan(const ScantableWrapper &in_scan);
    168166
    169167   // set spectrum data to work with. this is a method to allow linefinder work
    … …  
    182180   int findLines(const std::vector<bool> &in_mask,
    183181                 const std::vector<int> &in_edge = std::vector<int>(),
    184                  const casa::uInt &whichRow = 0) throw(casa::AipsError);
     182                 const casa::uInt &whichRow = 0);
    185183
    186184   // get the mask to mask out all lines that have been found (default)
    … …  
    189187   //       in setScan) or dropped out by the edge parameter (in_edge
    190188   //       in setScan) are still excluded regardless on the invert option
    191    std::vector<bool> getMask(bool invert=false) const throw(casa::AipsError);
     189   std::vector<bool> getMask(bool invert=false) const;
    192190
    193191   // get range for all lines found. The same units as used in the scan
    194192   // will be returned (e.g. velocity instead of channels).
    195    std::vector<double>   getLineRanges() const throw(casa::AipsError);
     193   std::vector<double>   getLineRanges() const;
    196194   // The same as getLineRanges, but channels are always used to specify
    197195   // the range
    198    std::vector<int> getLineRangesInChannels() const throw(casa::AipsError);
     196   std::vector<int> getLineRangesInChannels() const;
    199197protected:
    200198   // auxiliary function to average adjacent channels and update the mask
    … …  
    205203   // boxsize - a number of adjacent channels to average
    206204   void averageAdjacentChannels(casa::Vector<casa::Bool> &mask2update,
    207                                const casa::Int &boxsize)
    208                                throw(casa::AipsError);
     205                               const casa::Int &boxsize);
    209206
    210207   // auxiliary function to fit and subtract a polynomial from the current
    … …  
    212209   // reducing the spectral resolution if the baseline shape is bad
    213210   void subtractBaseline(const casa::Vector<casa::Bool> &temp_mask,
    214                          const casa::Int &order) throw(casa::AipsError);
     211                         const casa::Int &order);
    215212
    216213   // an auxiliary function to remove all lines from the list, except the
    … …  
    229226   void keepStrongestOnly(const casa::Vector<casa::Bool> &temp_mask,
    230227                          std::list<std::pair<int, int> > &lines2update,
    231                           int max_box_nchan)
    232                                       throw (casa::AipsError);
     228                          int max_box_nchan);
    233229private:
    234230   casa::CountedPtr<Scantable> scan; // the scan to work with

  • trunk/src/python_asap.cpp

    r2921 r3029  
    126126  casa::pyrap::register_convert_std_vector<double>();
    127127  casa::pyrap::register_convert_std_vector<std::string>();
     128//////////////see error below//////////////////////////////
    128129  casa::pyrap::register_convert_std_vector<bool>();
     130///////////////////////////////////////////////////////////
    129131  casa::pyrap::register_convert_casa_valueholder();
    130132  casa::pyrap::register_convert_casa_record();
    … …  
    132134#endif
    133135}
     136//[ 79%] Building CXX object src/CMakeFiles/_asap.dir/python_asap.cpp.o
     137//cd ...trunk/asap/build/src && /usr/bin/clang++   -DAIPS_AUTO_STL -DAIPS_DEBUG -DAIPS_STDLIB -DCASACORE_NEEDS_RETHROW -DCASA_USECASAPATH -DENABLE_PLOTTER2 -DHAVE_LIBPYRAP -DNOPKSMS -DUSE_CASAPY -DWITHOUT_ACS -D_GNU_SOURCE -D_asap_EXPORTS -pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment -ggdb3 -O0 -fno-omit-frame-pointer -fPIC -I...trunk/darwin/include/casacore -I...trunk/darwin/include/casacore/.. -I/opt/casa/01/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include -I...trunk/asap/src -I...trunk/asap/external-alma -I...trunk/asap/external/libpyrap/pyrap-0.3.2    -o CMakeFiles/_asap.dir/python_asap.cpp.o -c ...trunk/asap/src/python_asap.cpp
     138//warning: unknown warning option '-Wno-non-template-friend'; did you mean '-Wno-unsupported-friend'? [-Wunknown-warning-option]
     139//In file included from ...trunk/asap/src/python_asap.cpp:32:
     140//In file included from /opt/casa/01/include/boost/python.hpp:29:
     141//In file included from /opt/casa/01/include/boost/python/exec.hpp:9:
     142///opt/casa/01/include/boost/python/str.hpp:185:57: warning: unused parameter 'end' [-Wunused-parameter]
     143//    long count(T1 const& sub,T2 const& start, T3 const& end) const
     144//                                                        ^
     145//In file included from ...trunk/asap/src/python_asap.cpp:32:
     146//In file included from /opt/casa/01/include/boost/python.hpp:49:
     147///opt/casa/01/include/boost/python/opaque_pointer_converter.hpp:172:1: warning: missing field 'tp_version_tag' initializer [-Wmissing-field-initializers]
     148//};
     149//^
     150//In file included from ...trunk/asap/src/python_asap.cpp:32:
     151//In file included from /opt/casa/01/include/boost/python.hpp:52:
     152//In file included from /opt/casa/01/include/boost/python/overloads.hpp:11:
     153///opt/casa/01/include/boost/python/detail/defaults_def.hpp:92:30: warning: unused parameter 'kw' [-Wunused-parameter]
     154//      , keyword_range const& kw // ignored
     155//                             ^
     156//In file included from ...trunk/asap/src/python_asap.cpp:46:
     157//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:95:9: warning: cast from
     158//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'boost::python::converter::rvalue_from_python_storage<String> *' increases required alignment
     159//      from 8 to 16 [-Wcast-align]
     160//        (boost::python::converter::rvalue_from_python_storage<String>*)
     161//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     162//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     163//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<asap::ScantableWrapper,
     164//      std::__1::allocator<asap::ScantableWrapper> > > *' increases required alignment from 8 to 16 [-Wcast-align]
     165//        (rvalue_from_python_storage<ContainerType>*)
     166//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     167//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     168//      'casa::pyrap::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
     169//      casa::pyrap::stl_variable_capacity_policy>::construct' requested here
     170//        &construct,
     171//         ^
     172//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     173//      'casa::pyrap::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
     174//      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
     175//        from_python_sequence < std::vector < T >,
     176//        ^
     177//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     178//      'casa::pyrap::convert_std_vector<asap::ScantableWrapper>::reg' requested here
     179//    { convert_std_vector<T>::reg(); }
     180//                             ^
     181//...trunk/asap/src/python_asap.cpp:122:16: note: in instantiation of function template specialization
     182//      'casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>' requested here
     183//  casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>();
     184//               ^
     185//In file included from ...trunk/asap/src/python_asap.cpp:46:
     186//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     187//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<int, std::__1::allocator<int> > > *' increases
     188//      required alignment from 8 to 16 [-Wcast-align]
     189//        (rvalue_from_python_storage<ContainerType>*)
     190//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     191//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     192//      'casa::pyrap::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
     193//        &construct,
     194//         ^
     195//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     196//      'casa::pyrap::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
     197//      requested here
     198//        from_python_sequence < std::vector < T >,
     199//        ^
     200//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     201//      'casa::pyrap::convert_std_vector<int>::reg' requested here
     202//    { convert_std_vector<T>::reg(); }
     203//                             ^
     204//...trunk/asap/src/python_asap.cpp:123:16: note: in instantiation of function template specialization
     205//      'casa::pyrap::register_convert_std_vector<int>' requested here
     206//  casa::pyrap::register_convert_std_vector<int>();
     207//               ^
     208//In file included from ...trunk/asap/src/python_asap.cpp:46:
     209//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     210//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >
     211//      > *' increases required alignment from 8 to 16 [-Wcast-align]
     212//        (rvalue_from_python_storage<ContainerType>*)
     213//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     214//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     215//      'casa::pyrap::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >, casa::pyrap::stl_variable_capacity_policy>::construct'
     216//      requested here
     217//        &construct,
     218//         ^
     219//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     220//      'casa::pyrap::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >,
     221//      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
     222//        from_python_sequence < std::vector < T >,
     223//        ^
     224//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     225//      'casa::pyrap::convert_std_vector<unsigned int>::reg' requested here
     226//    { convert_std_vector<T>::reg(); }
     227//                             ^
     228//...trunk/asap/src/python_asap.cpp:124:16: note: in instantiation of function template specialization
     229//      'casa::pyrap::register_convert_std_vector<unsigned int>' requested here
     230//  casa::pyrap::register_convert_std_vector<uint>();
     231//               ^
     232//In file included from ...trunk/asap/src/python_asap.cpp:46:
     233//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     234//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<float, std::__1::allocator<float> > > *'
     235//      increases required alignment from 8 to 16 [-Wcast-align]
     236//        (rvalue_from_python_storage<ContainerType>*)
     237//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     238//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     239//      'casa::pyrap::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
     240//        &construct,
     241//         ^
     242//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     243//      'casa::pyrap::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
     244//      requested here
     245//        from_python_sequence < std::vector < T >,
     246//        ^
     247//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     248//      'casa::pyrap::convert_std_vector<float>::reg' requested here
     249//    { convert_std_vector<T>::reg(); }
     250//                             ^
     251//...trunk/asap/src/python_asap.cpp:125:16: note: in instantiation of function template specialization
     252//      'casa::pyrap::register_convert_std_vector<float>' requested here
     253//  casa::pyrap::register_convert_std_vector<float>();
     254//               ^
     255//In file included from ...trunk/asap/src/python_asap.cpp:46:
     256//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     257//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<double, std::__1::allocator<double> > > *'
     258//      increases required alignment from 8 to 16 [-Wcast-align]
     259//        (rvalue_from_python_storage<ContainerType>*)
     260//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     261//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     262//      'casa::pyrap::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested
     263//      here
     264//        &construct,
     265//         ^
     266//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     267//      'casa::pyrap::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
     268//      requested here
     269//        from_python_sequence < std::vector < T >,
     270//        ^
     271//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     272//      'casa::pyrap::convert_std_vector<double>::reg' requested here
     273//    { convert_std_vector<T>::reg(); }
     274//                             ^
     275//...trunk/asap/src/python_asap.cpp:126:16: note: in instantiation of function template specialization
     276//      'casa::pyrap::register_convert_std_vector<double>' requested here
     277//  casa::pyrap::register_convert_std_vector<double>();
     278//               ^
     279//In file included from ...trunk/asap/src/python_asap.cpp:46:
     280//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     281//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<std::__1::basic_string<char>,
     282//      std::__1::allocator<std::__1::basic_string<char> > > > *' increases required alignment from 8 to 16 [-Wcast-align]
     283//        (rvalue_from_python_storage<ContainerType>*)
     284//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     285//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     286//      'casa::pyrap::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
     287//      casa::pyrap::stl_variable_capacity_policy>::construct' requested here
     288//        &construct,
     289//         ^
     290//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     291//      'casa::pyrap::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
     292//      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
     293//        from_python_sequence < std::vector < T >,
     294//        ^
     295//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     296//      'casa::pyrap::convert_std_vector<std::__1::basic_string<char> >::reg' requested here
     297//    { convert_std_vector<T>::reg(); }
     298//                             ^
     299//...trunk/asap/src/python_asap.cpp:127:16: note: in instantiation of function template specialization
     300//      'casa::pyrap::register_convert_std_vector<std::__1::basic_string<char> >' requested here
     301//  casa::pyrap::register_convert_std_vector<std::string>();
     302//               ^
     303//In file included from ...trunk/asap/src/python_asap.cpp:32:
     304//In file included from /opt/casa/01/include/boost/python.hpp:11:
     305//In file included from /opt/casa/01/include/boost/python/args.hpp:25:
     306//In file included from /opt/casa/01/include/boost/python/object_core.hpp:14:
     307//In file included from /opt/casa/01/include/boost/python/call.hpp:15:
     308///opt/casa/01/include/boost/python/converter/arg_to_python.hpp:209:9: error: no matching constructor for initialization of
     309//      'boost::python::converter::detail::arg_to_python_base'
     310//      : arg_to_python_base(&x, registered<T>::converters)
     311//        ^                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     312///opt/casa/01/include/boost/python/converter/arg_to_python.hpp:256:7: note: in instantiation of member function
     313//      'boost::python::converter::detail::value_arg_to_python<std::__1::__bit_const_reference<std::__1::vector<bool, std::__1::allocator<bool> > >
     314//      >::value_arg_to_python' requested here
     315//    : base(x)
     316//      ^
     317///opt/casa/01/include/boost/python/object_core.hpp:393:33: note: in instantiation of member function
     318//      'boost::python::converter::arg_to_python<std::__1::__bit_const_reference<std::__1::vector<bool, std::__1::allocator<bool> > > >::arg_to_python' requested here
     319//          return python::incref(converter::arg_to_python<T>(x).get());
     320//                                ^
     321///opt/casa/01/include/boost/python/object_core.hpp:312:10: note: in instantiation of function template specialization
     322//      'boost::python::api::object_initializer_impl<false, false>::get<std::__1::__bit_const_reference<std::__1::vector<bool, std::__1::allocator<bool> > > >'
     323//      requested here
     324//      >::get(
     325//         ^
     326///opt/casa/01/include/boost/python/object_core.hpp:334:23: note: in instantiation of function template specialization
     327//      'boost::python::api::object_base_initializer<std::__1::__bit_const_reference<std::__1::vector<bool, std::__1::allocator<bool> > > >' requested here
     328//        : object_base(object_base_initializer(x))
     329//                      ^
     330///opt/casa/01/include/boost/python/list.hpp:72:22: note: in instantiation of function template specialization
     331//      'boost::python::api::object::object<std::__1::__bit_const_reference<std::__1::vector<bool, std::__1::allocator<bool> > > >' requested here
     332//        base::append(object(x));
     333//                     ^
     334//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:219:9: note: (skipping 3 contexts in backtrace; use
     335//      -ftemplate-backtrace-limit=0 to see all)
     336//        result.append(*i);
     337//               ^
     338///opt/casa/01/include/boost/python/to_python_converter.hpp:88:22: note: in instantiation of member function
     339//      'boost::python::converter::as_to_python_function<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::to_list<std::__1::vector<bool,
     340//      std::__1::allocator<bool> > > >::convert' requested here
     341//        &normalized::convert
     342//                     ^
     343//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:317:7: note: in instantiation of member function
     344//      'boost::python::to_python_converter<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::to_list<std::__1::vector<bool, std::__1::allocator<bool>
     345//      > >, false>::to_python_converter' requested here
     346//      boost::python::to_python_converter < std::vector < T >,
     347//      ^
     348//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:542:2: note: in instantiation of member function
     349//      'casa::pyrap::std_vector_to_list<bool>::std_vector_to_list' requested here
     350//        std_vector_to_list < T > ();
     351//        ^
     352//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     353//      'casa::pyrap::convert_std_vector<bool>::reg' requested here
     354//    { convert_std_vector<T>::reg(); }
     355//                             ^
     356//...trunk/asap/src/python_asap.cpp:128:16: note: in instantiation of function template specialization
     357//      'casa::pyrap::register_convert_std_vector<bool>' requested here
     358//  casa::pyrap::register_convert_std_vector<bool>();
     359//               ^
     360///opt/casa/01/include/boost/python/converter/arg_to_python_base.hpp:20:7: note: candidate constructor not viable: no known conversion from
     361//      '__bit_iterator<std::__1::vector<bool, std::__1::allocator<bool> >, true>' to 'const volatile void *' for 1st argument
     362//      arg_to_python_base(void const volatile* source, registration const&);
     363//      ^
     364///opt/casa/01/include/boost/python/converter/arg_to_python_base.hpp:15:28: note: candidate constructor (the implicit copy constructor) not viable: requires 1
     365//      argument, but 2 were provided
     366//  struct BOOST_PYTHON_DECL arg_to_python_base
     367//                           ^
     368//In file included from ...trunk/asap/src/python_asap.cpp:46:
     369//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     370//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<bool, std::__1::allocator<bool> > > *' increases
     371//      required alignment from 8 to 16 [-Wcast-align]
     372//        (rvalue_from_python_storage<ContainerType>*)
     373//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     374//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     375//      'casa::pyrap::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
     376//        &construct,
     377//         ^
     378//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     379//      'casa::pyrap::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
     380//      requested here
     381//        from_python_sequence < std::vector < T >,
     382//        ^
     383//...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     384//      'casa::pyrap::convert_std_vector<bool>::reg' requested here
     385//    { convert_std_vector<T>::reg(); }
     386//                             ^
     387//...trunk/asap/src/python_asap.cpp:128:16: note: in instantiation of function template specialization
     388//      'casa::pyrap::register_convert_std_vector<bool>' requested here
     389//  casa::pyrap::register_convert_std_vector<bool>();
     390//               ^
     391//12 warnings and 1 error generated.
     392//make[2]: *** [src/CMakeFiles/_asap.dir/python_asap.cpp.o] Error 1
     393//make[1]: *** [src/CMakeFiles/_asap.dir/all] Error 2
     394//make: *** [all] Error 2
     395//
     396//
Note: See TracChangeset for help on using the changeset viewer.