Changeset 2784 for trunk/external-alma


Ignore:
Timestamp:
03/08/13 17:51:11 (11 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Removed unused arguments for some protected/private methods.


Location:
trunk/external-alma/atnf/PKSIO
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r2783 r2784  
    6666
    6767  // field names, units, and sizes
    68   readHeader( numField_, "TFIELDS", same_ ) ;
     68  readHeader( numField_, "TFIELDS" ) ;
    6969  names_.resize( numField_ ) ;
    7070  units_.resize( numField_ ) ;
    … …  
    9696  // initialization
    9797  int status = 0 ;
    98   status = readHeader( ARYNM, "ARYNM", same_ ) ;
     98  status = readHeader( ARYNM, "ARYNM" ) ;
    9999  if ( status != 0 )
    100100    ARYNM = 1 ;
    101   readHeader( rowNum_, "NAXIS2", same_ ) ;
    102   readHeader( scanLen_, "NAXIS1", same_ ) ;
     101  readHeader( rowNum_, "NAXIS2" ) ;
     102  readHeader( scanLen_, "NAXIS1" ) ;
    103103  status = 0 ;
    104104  scanNum_ = rowNum_ / ARYNM ;
    … …  
    264264  //cout << "LOETM = \'" << LOETM << "\'" << endl ;
    265265  //
    266   if ( readHeader( NSCAN, "NAXIS2", sameEndian ) != 0 ) {
     266  if ( readHeader( NSCAN, "NAXIS2" ) != 0 ) {
    267267    os << LogIO::WARN << "Error while reading data NSCAN." << LogIO::POST ;
    268268    return -1 ;
    … …  
    295295  //cout << "OBJ = \'" << OBJ << "\'" << endl ;
    296296  //
    297   if ( readHeader( ftmp, "EPOCH", sameEndian ) != 0 ) {
     297  if ( readHeader( ftmp, "EPOCH" ) != 0 ) {
    298298    os << LogIO::WARN << "Error while reading data EPOCH." << LogIO::POST ;
    299299    return -1 ;
    … …  
    327327  //cout << "DEC0 = " << DEC0 << endl ;
    328328  //
    329   if ( readHeader( GLNG0, "GL0", sameEndian ) != 0 ) {
     329  if ( readHeader( GLNG0, "GL0" ) != 0 ) {
    330330    os << LogIO::WARN << "Error while reading data GLNG0." << LogIO::POST ;
    331331    return -1 ;
    … …  
    334334  //cout << "GLNG0 = " << GLNG0 << endl ;
    335335  //
    336   if ( readHeader( GLAT0, "GB0", sameEndian ) != 0 ) {
     336  if ( readHeader( GLAT0, "GB0" ) != 0 ) {
    337337    os << LogIO::WARN << "Error while reading data GLAT0." << LogIO::POST ;
    338338    return -1 ;
    … …  
    341341  //cout << "GLAT0 = " << GLAT0 << endl ;
    342342  //
    343   if ( readHeader( NCALB, "NCALB", sameEndian ) != 0 ) {
     343  if ( readHeader( NCALB, "NCALB" ) != 0 ) {
    344344    os << LogIO::WARN << "Error while reading data NCALB." << LogIO::POST ;
    345345    return -1 ;
    … …  
    348348  //cout << "NCALB = " << NCALB << endl ;
    349349  //
    350   if ( readHeader( SCNCD, "SCNCD", sameEndian ) != 0 ) {
     350  if ( readHeader( SCNCD, "SCNCD" ) != 0 ) {
    351351    os << LogIO::NORMAL << "SCNCD set to 0 (RADEC)." << LogIO::POST ;
    352352    SCNCD = 0 ;
    … …  
    398398  //cout << "SCMOD = \'" << SCMOD << "\'" << endl ;
    399399  //
    400   if ( readHeader( URVEL, "VEL", sameEndian ) != 0 ) {
     400  if ( readHeader( URVEL, "VEL" ) != 0 ) {
    401401    os << LogIO::WARN << "Error while reading data URVEL." << LogIO::POST ;
    402402    return -1 ;
    … …  
    426426  //cout << "SWMOD = \'" << SWMOD << "\'" << endl ;
    427427  //
    428   if ( readHeader( FRQSW, "FRQSW", sameEndian ) != 0 ) {
     428  if ( readHeader( FRQSW, "FRQSW" ) != 0 ) {
    429429    os << LogIO::NORMAL << "FRQSW set to 0." << LogIO::POST ;
    430430    FRQSW = 0.0 ;
    … …  
    433433  //cout << "FRQSW = " << FRQSW << endl ;
    434434  //
    435   if ( readHeader( DBEAM, "DBEAM", sameEndian ) != 0 ) {
     435  if ( readHeader( DBEAM, "DBEAM" ) != 0 ) {
    436436    os << LogIO::WARN << "Error while reading data DBEAM." << LogIO::POST ;
    437437    return -1 ;
    … …  
    440440  //cout << "DBEAM = " << DBEAM << endl ;
    441441  //
    442   if ( readHeader( MLTOF, "MLTOF", sameEndian ) != 0 ) {
     442  if ( readHeader( MLTOF, "MLTOF" ) != 0 ) {
    443443    os << LogIO::NORMAL << "MLTOF set to 0." << LogIO::POST ;
    444444    MLTOF = 0.0 ;
    … …  
    447447  //cout << "MLTOF = " << MLTOF << endl ;
    448448  //
    449   if ( readHeader( CMTQ, "CMTQ", sameEndian ) != 0 ) {
     449  if ( readHeader( CMTQ, "CMTQ" ) != 0 ) {
    450450    os << LogIO::WARN << "Error while reading data CMTQ." << LogIO::POST ;
    451451    return -1 ;
    … …  
    454454  //cout << "CMTQ = " << CMTQ << endl ;
    455455  //
    456   if ( readHeader( CMTE, "CMTE", sameEndian ) != 0 ) {
     456  if ( readHeader( CMTE, "CMTE" ) != 0 ) {
    457457    os << LogIO::WARN << "Error while reading data CMTE." << LogIO::POST ;
    458458    return -1 ;
    … …  
    461461  //cout << "CMTE = " << CMTE << endl ;
    462462  //
    463   if ( readHeader( CMTSOM, "CMTSOM", sameEndian ) != 0 ) {
     463  if ( readHeader( CMTSOM, "CMTSOM" ) != 0 ) {
    464464    os << LogIO::WARN << "Error while reading data CMTSOM." << LogIO::POST ;
    465465    return -1 ;
    … …  
    468468  //cout << "CMTSOM = " << CMTSOM << endl ;
    469469  //
    470   if ( readHeader( CMTNODE, "CMTNODE", sameEndian ) != 0 ) {
     470  if ( readHeader( CMTNODE, "CMTNODE" ) != 0 ) {
    471471    os << LogIO::WARN << "Error while reading data CMTNODE." << LogIO::POST ;
    472472    return -1 ;
    … …  
    475475  //cout << "CMTNODE = " << CMTNODE << endl ;
    476476  //
    477   if ( readHeader( CMTI, "CMTI", sameEndian ) != 0 ) {
     477  if ( readHeader( CMTI, "CMTI" ) != 0 ) {
    478478    os << LogIO::WARN << "Error while reading data CMTI." << LogIO::POST ;
    479479    return -1 ;
    … …  
    489489  //cout << "CMTTM = \'" << CMTTM << "\'" << endl ;
    490490  //
    491   if ( readHeader( SBDX, "SDBX", sameEndian ) != 0 ) {
     491  if ( readHeader( SBDX, "SDBX" ) != 0 ) {
    492492    os << LogIO::WARN << "Error while reading data SBDX." << LogIO::POST ;
    493493    return -1 ;
    … …  
    496496  //cout << "SBDX = " << SBDX << endl ;
    497497  //
    498   if ( readHeader( SBDY, "SDBY", sameEndian ) != 0 ) {
     498  if ( readHeader( SBDY, "SDBY" ) != 0 ) {
    499499    os << LogIO::WARN << "Error while reading data SBDY." << LogIO::POST ;
    500500    return -1 ;
    … …  
    503503  //cout << "SBDY = " << SBDY << endl ;
    504504  //
    505   if ( readHeader( SBDZ1, "SDBZ1", sameEndian ) != 0 ) {
     505  if ( readHeader( SBDZ1, "SDBZ1" ) != 0 ) {
    506506    os << LogIO::WARN << "Error while reading data SBDZ1." << LogIO::POST ;
    507507    return -1 ;
    … …  
    510510  //cout << "SBDZ1 = " << SBDZ1 << endl ;
    511511  //
    512   if ( readHeader( SBDZ2, "SDBZ2", sameEndian ) != 0 ) {
     512  if ( readHeader( SBDZ2, "SDBZ2" ) != 0 ) {
    513513    os << LogIO::WARN << "Error while reading data SBDZ2." << LogIO::POST ;
    514514    return -1 ;
    … …  
    517517  //cout << "SBDZ2 = " << SBDZ2 << endl ;
    518518  //
    519   if ( readHeader( DAZP, "DAZP", sameEndian ) != 0 ) {
     519  if ( readHeader( DAZP, "DAZP" ) != 0 ) {
    520520    os << LogIO::NORMAL << "DAZP set to 0." << LogIO::POST ;
    521521    DAZP = 0.0 ;
    … …  
    524524  //cout << "DAZP = " << DAZP << endl ;
    525525  //
    526   if ( readHeader( DELP, "DELP", sameEndian ) != 0 ) {
     526  if ( readHeader( DELP, "DELP" ) != 0 ) {
    527527    os << LogIO::NORMAL << "DELP set to 0." << LogIO::POST ;
    528528    DELP = 0.0 ;
    … …  
    531531  //cout << "DELP = " << DELP << endl ;
    532532  //
    533   if ( readHeader( CHBIND, "CHBIND", sameEndian ) != 0 ) {
     533  if ( readHeader( CHBIND, "CHBIND" ) != 0 ) {
    534534    os << LogIO::NORMAL << "CHBIND set to 1." << LogIO::POST ;
    535535    CHBIND = 1 ;
    … …  
    538538  //cout << "CHBIND = " << CHBIND << endl ;
    539539  //
    540   if ( readHeader( NUMCH, "NCH", sameEndian ) != 0 ) {
     540  if ( readHeader( NUMCH, "NCH" ) != 0 ) {
    541541    if ( readTable( NUMCH, "NCH", sameEndian ) != 0 ) {
    542542      os << LogIO::NORMAL << "NUMCH set to " << chmax_ << "." << LogIO::POST ;
    … …  
    547547  //cout << "NUMCH = " << NUMCH << endl ;
    548548  //
    549   if ( readHeader( CHMIN, "CHMIN", sameEndian ) != 0 ) {
     549  if ( readHeader( CHMIN, "CHMIN" ) != 0 ) {
    550550    os << LogIO::NORMAL << "CHMIN set to 1." << LogIO::POST ;
    551551    CHMIN = 1 ;
    … …  
    554554  //cout << "CHMIN = " << CHMIN << endl ;
    555555  //
    556   if ( readHeader( CHMAX, "CHMAX", sameEndian ) != 0 ) {
     556  if ( readHeader( CHMAX, "CHMAX" ) != 0 ) {
    557557    os << LogIO::NORMAL << "CHMAX set to " << chmax_ << "." << LogIO::POST ;
    558558    CHMAX = chmax_ ;
    … …  
    561561  //cout << "CHMAX = " << CHMAX << endl ;
    562562  //
    563   if ( readHeader( ALCTM, "ALCTM", sameEndian ) != 0 ) {
     563  if ( readHeader( ALCTM, "ALCTM" ) != 0 ) {
    564564    if ( readTable( ALCTM, "ALCTM", sameEndian ) != 0 ) {
    565565      os << LogIO::WARN << "Error while reading data ALCTM." << LogIO::POST ;
    … …  
    571571  //
    572572  int itmp ;
    573   if ( readHeader( itmp, "INTEG", sameEndian ) != 0 ) {
     573  if ( readHeader( itmp, "INTEG" ) != 0 ) {
    574574    if ( readTable( itmp, "INTEG", sameEndian ) != 0 ) {
    575575      os << LogIO::WARN << "Error while reading data IPTIM." << LogIO::POST ;
    … …  
    581581  //cout << "IPTIM = " << IPTIM << endl ;
    582582  //
    583   if ( readHeader( PA, "PA", sameEndian ) != 0 ) {
     583  if ( readHeader( PA, "PA" ) != 0 ) {
    584584    if ( readTable( PA, "PA", sameEndian ) != 0 ) {
    585585      os << LogIO::WARN << "Error while reading data PA." << LogIO::POST ;
    … …  
    804804//   nro_debug_output( "CWCAL", ARYNM, 10, CWCAL ) ;
    805805  //
    806   if ( readHeader( SCNLEN, "NAXIS1", sameEndian ) != 0 ) {
     806  if ( readHeader( SCNLEN, "NAXIS1" ) != 0 ) {
    807807    os << LogIO::WARN << "Error while reading data SCNLEN." << LogIO::POST ;
    808808    return -1 ;
    … …  
    811811  //cout << "SCNLEN = " << SCNLEN << endl ;
    812812  //
    813   if ( readHeader( SBIND, "SBIND", sameEndian ) != 0 ) {
     813  if ( readHeader( SBIND, "SBIND" ) != 0 ) {
    814814    os << LogIO::NORMAL << "SBIND set to 0." << LogIO::POST ;
    815815    SBIND = 0 ;
    … …  
    818818  //cout << "SBIND = " << SBIND << endl ;
    819819  //
    820   if ( readHeader( IBIT, "IBIT", sameEndian ) != 0 ) {
     820  if ( readHeader( IBIT, "IBIT" ) != 0 ) {
    821821    os << LogIO::NORMAL << "IBIT set to 8." << LogIO::POST ;
    822822    IBIT = 8 ;  // 8 bit? 12 bit?
    … …  
    18021802}
    18031803
    1804 int NROFITSDataset::readHeader( int &v, char *name, int /*b*/ )
     1804int NROFITSDataset::readHeader( int &v, char *name )
    18051805{
    18061806  //
    … …  
    18381838
    18391839
    1840 int NROFITSDataset::readHeader( float &v, char *name, int /*b*/ )
     1840int NROFITSDataset::readHeader( float &v, char *name )
    18411841{
    18421842  //
    … …  
    18721872}
    18731873
    1874 int NROFITSDataset::readHeader( double &v, char *name, int /*b*/ )
     1874int NROFITSDataset::readHeader( double &v, char *name )
    18751875{
    18761876  //

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

    r2783 r2784  
    8383  virtual void initialize() ;
    8484
    85 //   // fill header from file
    86 //   virtual int fillHeader() ;
    87 
    8885  // fill data record
    8986  virtual  int fillRecord( int i ) ;
    … …  
    110107
    111108  // Read int data
    112   int readHeader( int &v, char *name, int b ) ;
     109  int readHeader( int &v, char *name) ;
    113110  int readTable( int &v, char *name, int b, int idx=0 ) ;
    114111  int readTable( vector<int> &v, char *name, int b, int idx=0 ) ;
    … …  
    116113
    117114  // Read float data
    118   int readHeader( float &v, char *name, int b ) ;
     115  int readHeader( float &v, char *name) ;
    119116  int readTable( float &v, char *name, int b, int idx=0 ) ;
    120117  int readTable( vector<float> &v, char *name, int b, int idx=0 ) ;
    … …  
    122119
    123120  // Read double data
    124   int readHeader( double &v, char *name, int b ) ;
     121  int readHeader( double &v, char *name) ;
    125122  int readTable( double &v, char *name, int b, int idx=0 ) ;
    126123  int readTable( vector<double> &v, char *name, int b, int idx=0 ) ;
Note: See TracChangeset for help on using the changeset viewer.