Changeset 3089 for trunk


Ignore:
Timestamp:
12/09/15 16:07:02 (9 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description: fixes to get rid of clang build warnings.


Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r1757 r3089  
    4141
    4242#include <atnf/PKSIO/MBrecord.h>
    43 
    44 using namespace std;
    4543
    4644

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

    r3067 r3089  
    5858const double TWOPI = 2.0 * PI;
    5959const double HALFPI = PI / 2.0;
     60#ifdef PKSIO_DEBUG
    6061const double R2D = 180.0 / PI;
     62#endif
    6163
    6264// Class name

  • trunk/external-alma/atnf/PKSIO/MBFITSreader.h

    r1757 r3089  
    4343#include <atnf/PKSIO/MBrecord.h>
    4444
    45 using namespace std;
    4645
    4746// <summary>

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

    r1868 r3089  
    3636//#---------------------------------------------------------------------------
    3737
     38#include <string.h>
     39
    3840#include <atnf/PKSIO/MBrecord.h>
    3941#include <atnf/PKSIO/SrcType.h>
    40 
    41 #include <string.h>
    4242
    4343//--------------------------------------------------------- MBrecord::MBrecord

  • trunk/external-alma/atnf/PKSIO/MBrecord.h

    r1868 r3089  
    6161#define ATNF_MBRECORD_H
    6262
    63 using namespace std;
    6463
    6564// <summary>

  • trunk/src/MSWriter.cpp

    r3084 r3089  
    15781578  CountedPtr<DataHolder> holder;
    15791579  String ptName;
    1580   Bool useFloat;
    15811580  String poltype;
    15821581  Bool addScanrate_;

  • trunk/src/STFiller.h

    r2658 r3089  
    119119  casa::String filename_;
    120120  casa::CountedPtr< Scantable > table_;
    121   casa::Int nIF_, nBeam_, nPol_, nChan_, nInDataRow;
     121  casa::Int nIF_, nBeam_, /* nPol_, nChan_,*/ nInDataRow;
    122122  casa::uInt ifOffset_, beamOffset_;
    123123  casa::Vector<casa::Bool> haveXPol_;

  • trunk/src/STMath.cpp

    r3084 r3089  
    15111511  //float tcal1=7.0;
    15121512  //float tcal2=4.0;
    1513   sig1 = dototalpower(sctables[0], sctables[1], tcal=tcal);
    1514   ref1 = dototalpower(sctables[2], sctables[3], tcal=tcal);
    1515   ref2 = dototalpower(sctables[4], sctables[5], tcal=tcal);
    1516   sig2 = dototalpower(sctables[6], sctables[7], tcal=tcal);
     1513  sig1 = dototalpower(sctables[0], sctables[1], tcal);
     1514  ref1 = dototalpower(sctables[2], sctables[3], tcal);
     1515  ref2 = dototalpower(sctables[4], sctables[5], tcal);
     1516  sig2 = dototalpower(sctables[6], sctables[7], tcal);
    15171517
    15181518  // correction of user-specified tsys for elevation here
    … …  
    16331633  types.clear() ;
    16341634
    1635   calsig = dototalpower(sigwcal, sig, tcal=tcal);
    1636   calref = dototalpower(refwcal, ref, tcal=tcal);
     1635  calsig = dototalpower(sigwcal, sig, tcal);
     1636  calref = dototalpower(refwcal, ref, tcal);
    16371637
    16381638  out1=dosigref(calsig,calref,smoothref,tsysv,tau);
Note: See TracChangeset for help on using the changeset viewer.