Changeset 1399 for trunk/external


Ignore:
Timestamp:
11/16/07 13:36:15 (16 years ago)
Author:
Malte Marquarding
Message:

Mark C added brightness unit to getHeader()

Location:
trunk/external/atnf/PKSIO
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r1325 r1399  
    22//# FITSreader.h: ATNF single-dish FITS reader.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Mark Calabretta, ATNF
    66//#
    … …  
    2727//#                        AUSTRALIA
    2828//#
    29 //# $Id: FITSreader.h,v 19.5 2006/05/19 02:18:02 mcalabre Exp $
     29//# $Id: FITSreader.h,v 19.6 2007/11/12 03:37:56 cal103 Exp $
    3030//#---------------------------------------------------------------------------
    3131//# The FITSreader class is an abstract base class for the Parkes Multibeam
    … …  
    7474        double antPos[3],
    7575        char   obsType[32],
     76        char   bunit[32],
    7677        float  &equinox,
    7778        char   radecsys[32],

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

    r1372 r1399  
    2727//#                        AUSTRALIA
    2828//#
    29 //# $Id: MBFITSreader.cc,v 19.34 2007/07/02 06:12:18 cal103 Exp $
     29//# $Id: MBFITSreader.cc,v 19.36 2007/11/12 03:37:56 cal103 Exp $
    3030//#---------------------------------------------------------------------------
    3131//# The MBFITSreader class reads single dish RPFITS files (such as Parkes
    … …  
    317317        double antPos[3],
    318318        char   obsType[32],
     319        char   bunit[32],
    319320        float  &equinox,
    320321        char   radecsys[32],
    … …  
    392393  obsType[j] = '\0';
    393394
     395  // Brightness unit.
     396  sprintf(bunit, "%-16.16s", names_.bunit);
     397  if (strcmp(bunit, "JY") == 0) {
     398    bunit[1] = 'y';
     399  } else if (strcmp(bunit, "JY/BEAM") == 0) {
     400    strcpy(bunit, "Jy/beam");
     401  }
     402
    394403  // Coordinate frames.
    395404  equinox = 2000.0f;
    … …  
    613622        }
    614623
     624        // Check for change-of-day.
     625        if (cUTC < cPrevUTC - 85800.0) {
     626          cUTC += 86400.0;
     627        }
     628
     629        if (cNBin > 1) {
     630          // Binning mode: correct the time.
     631          cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
     632        }
     633
     634        // New integration cycle?
     635        if (cUTC > cPrevUTC) {
     636          cCycleNo++;
     637          cPrevUTC = cUTC + 0.0001;
     638        }
     639
    615640        // Apply beam selection.
    616641        beamNo = int(cBaseline / 256.0);
    … …  
    626651
    627652        sprintf(cDateObs, "%-10.10s", names_.datobs);
    628 
    629         // Check for change-of-day.
    630         if (cUTC < cPrevUTC - 85800.0) {
    631           cUTC += 86400.0;
    632         }
    633 
    634         if (cNBin > 1) {
    635           // Binning mode: correct the time.
    636           cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
    637         }
    638 
    639         // New integration cycle?
    640         if (cUTC > cPrevUTC) {
    641           cCycleNo++;
    642           cPrevUTC = cUTC + 0.0001;
    643         }
    644653
    645654        // Compute buffer number.
    … …  
    895904    if (!cFlushing) {
    896905      // Buffer this MBrec.
    897       if (cCycleNo == 1 && iMBuff->IFno[0]) {
     906      if ((cScanNo > iMBuff->scanNo) && iMBuff->IFno[0]) {
    898907        // Sanity check on the number of IFs in the new scan.
    899908        if (if_.n_if != cNIF) {

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

    r1372 r1399  
    2727//#                        AUSTRALIA
    2828//#
    29 //# $Id: MBFITSreader.h,v 19.13 2007/07/02 06:11:22 cal103 Exp $
     29//# $Id: MBFITSreader.h,v 19.14 2007/11/12 03:37:56 cal103 Exp $
    3030//#---------------------------------------------------------------------------
    3131//# The MBFITSreader class reads single dish RPFITS files (such as Parkes
    … …  
    7878        double antPos[3],
    7979        char   obsType[32],
     80        char   bunit[32],
    8081        float  &equinox,
    8182        char   radecsys[32],

  • trunk/external/atnf/PKSIO/PKSFITSreader.cc

    r1325 r1399  
    1 //#---------------------------------------------------------------------------
    21//# PKSFITSreader.cc: Class to read Parkes multibeam data from a FITS file.
    32//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     3//# Copyright (C) 2000-2007
    54//# Associated Universities, Inc. Washington DC, USA.
    65//#
    … …  
    2625//#                        Charlottesville, VA 22903-2475 USA
    2726//#
    28 //# $Id: PKSFITSreader.cc,v 19.12 2006/07/05 04:49:57 mcalabre Exp $
     27//# $Id: PKSFITSreader.cc,v 19.13 2007/11/12 03:37:56 cal103 Exp $
    2928//#---------------------------------------------------------------------------
    3029//# Original: 2000/08/02, Mark Calabretta, ATNF
    … …  
    138137        Vector<Double> &antPosition,
    139138        String &obsType,
     139        String &bunit,
    140140        Float  &equinox,
    141141        String &dopplerFrame,
    … …  
    144144        Double &bandwidth)
    145145{
    146   char   datobs[32], dopplerFrame_[32], observer_[32], obsType_[32],
    147          project_[32], radecsys[32], telescope[32];
     146  char   bunit_[32], datobs[32], dopplerFrame_[32], observer_[32],
     147         obsType_[32], project_[32], radecsys[32], telescope[32];
    148148  float  equinox_;
    149149  double antPos[3], utc;
    150150
    151151  if (cReader->getHeader(observer_, project_, telescope, antPos, obsType_,
    152                          equinox_, radecsys, dopplerFrame_, datobs, utc,
    153                          refFreq, bandwidth)) {
     152                         bunit_, equinox_, radecsys, dopplerFrame_,
     153                         datobs, utc, refFreq, bandwidth)) {
    154154    return 1;
    155155  }
    … …  
    163163  antPosition(2) = antPos[2];
    164164  obsType = trim(obsType_);
     165  bunit   = trim(bunit_);
    165166  equinox = equinox_;
    166167  dopplerFrame = trim(dopplerFrame_);

  • trunk/external/atnf/PKSIO/PKSFITSreader.h

    r1325 r1399  
    22//# PKSFITSreader.h: Class to read Parkes Multibeam data from a FITS file.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSFITSreader.h,v 19.11 2006/07/05 04:49:57 mcalabre Exp $
     28//# $Id: PKSFITSreader.h,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# This class is basically a wrapper class for reading data from either an
    … …  
    8282        Vector<Double> &antPosition,
    8383        String &obsType,
     84        String &bunit,
    8485        Float  &equinox,
    8586        String &dopplerFrame,

  • trunk/external/atnf/PKSIO/PKSMS2reader.cc

    r1325 r1399  
    22//# PKSMS2reader.cc: Class to read Parkes Multibeam data from a v2 MS.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSMS2reader.cc,v 19.11 2006/07/05 04:59:20 mcalabre Exp $
     28//# $Id: PKSMS2reader.cc,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# Original: 2000/08/03, Mark Calabretta, ATNF
    … …  
    249249        Vector<Double> &antPosition,
    250250        String &obsMode,
     251        String &bunit,
    251252        Float  &equinox,
    252253        String &dopplerFrame,
    … …  
    277278  }
    278279
     280  // Brightness units.
     281  bunit = cPKSMS.unit(MSMainEnums::FLOAT_DATA);
    279282
    280283  // Coordinate equinox.

  • trunk/external/atnf/PKSIO/PKSMS2reader.h

    r1325 r1399  
    22//# PKSMS2reader.h: Class to read Parkes Multibeam data from a v2 MS.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSMS2reader.h,v 19.12 2006/07/05 04:55:45 mcalabre Exp $
     28//# $Id: PKSMS2reader.h,v 19.13 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# Original: 2000/08/03, Mark Calabretta, ATNF
    … …  
    7979        Vector<Double> &antPosition,
    8080        String &obsMode,
     81        String &bunit,
    8182        Float  &equinox,
    82         String &freqRef,
     83        String &dopplerFrame,
    8384        Double &mjd,
    8485        Double &refFreq,

  • trunk/external/atnf/PKSIO/PKSMS2writer.cc

    r1325 r1399  
    22//# PKSMS2writer.cc: Class to write Parkes multibeam data to a measurementset.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSMS2writer.cc,v 19.11 2006/11/06 22:25:22 mmarquar Exp $
     28//# $Id: PKSMS2writer.cc,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030
    … …  
    7676        const Vector<Double> antPosition,
    7777        const String obsMode,
     78        const String bunit,
    7879        const Float  equinox,
    7980        const String dopplerFrame,
    … …  
    100101  MS::addColumnToDesc(pksDesc, MS::FLOAT_DATA, 2);
    101102  pksDesc.rwColumnDesc(MS::columnName(MS::FLOAT_DATA)).rwKeywordSet().
    102                 define("UNIT", String("Jy"));
     103                define("UNIT", bunit);
    103104  pksDesc.rwColumnDesc(MS::columnName(MS::FLOAT_DATA)).rwKeywordSet().
    104105                define("MEASURE_TYPE", "");
    … …  
    120121    MS::addColumnToDesc(pksDesc, MS::DATA, 2);
    121122    pksDesc.rwColumnDesc(MS::columnName(MS::DATA)).rwKeywordSet().
    122                 define("UNIT", "Jy");
     123                define("UNIT", bunit);
    123124    pksDesc.rwColumnDesc(MS::columnName(MS::DATA)).rwKeywordSet().
    124125                define("MEASURE_TYPE", "");
    … …  
    567568    delete cXCalFctrCol; cXCalFctrCol=0;
    568569  }
    569  
     570
    570571  // Release all subtables.
    571572  cAntenna         = MSAntenna();

  • trunk/external/atnf/PKSIO/PKSMS2writer.h

    r1325 r1399  
    22//# PKSMS2writer.h: Class to write Parkes Multibeam data to a measurementset.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSMS2writer.h,v 19.11 2006/07/05 05:35:31 mcalabre Exp $
     28//# $Id: PKSMS2writer.h,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030
    … …  
    6464        const Vector<Double> antPosition,
    6565        const String obsMode,
     66        const String bunit,
    6667        const Float  equinox,
    6768        const String dopplerFrame,

  • trunk/external/atnf/PKSIO/PKSSDwriter.cc

    r1325 r1399  
    22//# PKSSDwriter.cc: Class to write Parkes multibeam data to an SDFITS file.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSSDwriter.cc,v 19.11 2006/07/05 05:41:12 mcalabre Exp $
     28//# $Id: PKSSDwriter.cc,v 19.13 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030
    … …  
    6363        const Vector<Double> antPosition,
    6464        const String obsMode,
     65        const String bunit,
    6566        const Float  equinox,
    6667        const String dopplerFrame,
    … …  
    101102  Int status = cSDwriter.create((char *)sdName.chars(),
    102103        (char *)observer.chars(), (char *)project.chars(),
    103         (char *)antName.chars(), antPos, (char *)obsMode.chars(), equinox,
    104         (char *)dopplerFrame.chars(), cNIF,
     104        (char *)antName.chars(), antPos, (char *)obsMode.chars(),
     105        (char *)bunit.chars(), equinox, (char *)dopplerFrame.chars(), cNIF,
    105106        (int *)cNChan.getStorage(deleteIt),
    106107        (int *)cNPol.getStorage(deleteIt),
    … …  
    316317}
    317318
     319//------------------------------------------------------- PKSSDwriter::history
     320
     321// Write a history record.
     322
     323Int PKSSDwriter::history(const String text)
     324{
     325  return cSDwriter.history((char *)text.chars());
     326}
     327
     328Int PKSSDwriter::history(const char *text)
     329{
     330  return cSDwriter.history((char *)text);
     331}
     332
    318333//--------------------------------------------------------- PKSSDwriter::close
    319334

  • trunk/external/atnf/PKSIO/PKSSDwriter.h

    r1325 r1399  
    11//#---------------------------------------------------------------------------
    2 //# PKSSDWriter.h: Class to write Parkes multibeam data to an SDFITS file.
     2//# PKSSDwriter.h: Class to write Parkes multibeam data to an SDFITS file.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSSDwriter.h,v 19.12 2006/07/05 05:37:32 mcalabre Exp $
     28//# $Id: PKSSDwriter.h,v 19.14 2007/11/12 03:37:56 cal103 Exp $
    2929//# Original: 2000/07/21, Mark Calabretta, ATNF
    3030//#---------------------------------------------------------------------------
    … …  
    6464        const Vector<Double> antPosition,
    6565        const String obsMode,
     66        const String bunit,
    6667        const Float  equinox,
    6768        const String dopplerFrame,
    … …  
    115116        const Vector<Complex> &xPol);
    116117
     118    // Write a history record.
     119    virtual Int history(const String text);
     120    virtual Int history(const char *text);
     121
    117122    // Close the SDFITS file.
    118123    virtual void close();

  • trunk/external/atnf/PKSIO/PKSreader.h

    r1325 r1399  
    22//# PKSreader.h: Class to read Parkes multibeam data.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSreader.h,v 19.11 2006/07/05 05:00:21 mcalabre Exp $
     28//# $Id: PKSreader.h,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# Original: 2000/08/02, Mark Calabretta, ATNF
    … …  
    101101        Vector<Double> &antPosition,
    102102        String &obsType,
     103        String &bunit,
    103104        Float  &equinox,
    104105        String &dopplerFrame,

  • trunk/external/atnf/PKSIO/PKSwriter.h

    r1325 r1399  
    22//# PKSwriter.h: Class to write out Parkes multibeam data.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: PKSwriter.h,v 19.12 2006/07/05 05:33:31 mcalabre Exp $
     28//# $Id: PKSwriter.h,v 19.14 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030
    … …  
    5757        const Vector<Double> antPosition,
    5858        const String obsMode,
     59        const String bunit,
    5960        const Float  equinox,
    6061        const String dopplerFrame,
    … …  
    108109        const Vector<Complex> &xPol) = 0;
    109110
     111    // Write a history record.
     112    virtual Int history(const String text) {return 0;};
     113    virtual Int history(const char *text)  {return 0;};
     114
    110115    // Close the output file.
    111116    virtual void close() = 0;

  • trunk/external/atnf/PKSIO/SDFITSreader.cc

    r1325 r1399  
    22//# SDFITSreader.cc: ATNF CFITSIO interface class for SDFITS input.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: SDFITSreader.cc,v 19.22 2006/07/12 00:14:26 mcalabre Exp $
     28//# $Id: SDFITSreader.cc,v 19.23 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# The SDFITSreader class reads single dish FITS files such as those written
    … …  
    5757    long nelem;         // Column data repeat count; < 0 for vardim.
    5858    int  tdimcol;       // TDIM column number; 0 for keyword; -1 absent.
     59    char units[32];     // Units from TUNITn keyword.
    5960};
    6061
    … …  
    182183
    183184    if (cALFA_BD) {
    184       // ALFA BDFITS: variable length arrays don't actually vary and there is 
     185      // ALFA BDFITS: variable length arrays don't actually vary and there is
    185186      // no TDIM (or MAXISn) card; use the LAGS_IN value.
    186187      cNAxis = 5;
    … …  
    725726        double antPos[3],
    726727        char   obsMode[32],
     728        char   bunit[32],
    727729        float  &equinox,
    728730        char   radecsys[32],
    … …  
    773775  readData(OBSMODE, 1, obsMode);                        // Shared.
    774776
     777  // Brightness unit.
     778  strcpy(bunit, cData[DATA].units);
     779  if (strcmp(bunit, "JY") == 0) {
     780    bunit[1] = 'y';
     781  } else if (strcmp(bunit, "JY/BEAM") == 0) {
     782    strcpy(bunit, "Jy/beam");
     783  }
     784
    775785  readParm("EQUINOX",  TFLOAT,  &equinox);              // Shared.
    776786  if (cStatus == 405) {
    … …  
    12421252
    12431253  // Source identification.
    1244   readData(OBJECT,  cRow, mbrec.srcName);
     1254  readData(OBJECT, cRow, mbrec.srcName);
    12451255
    12461256  readData(OBJ_RA,  cRow, &mbrec.srcRA);
    … …  
    17371747    long nelem, width;
    17381748    fits_get_coltype(cSDptr, colnum, &coltype, &nelem, &width, &cStatus);
     1749    fits_get_bcolparms(cSDptr, colnum, 0x0, cData[iData].units, 0x0, 0x0, 0x0,
     1750      0x0, 0x0, 0x0, &cStatus);
    17391751
    17401752    // Look for a TDIMnnn keyword or column.

  • trunk/external/atnf/PKSIO/SDFITSreader.h

    r1325 r1399  
    22//# SDFITSreader.h: ATNF CFITSIO interface class for SDFITS input.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Associated Universities, Inc. Washington DC, USA.
    66//#
    … …  
    2626//#                        Charlottesville, VA 22903-2475 USA
    2727//#
    28 //# $Id: SDFITSreader.h,v 19.12 2006/07/05 05:24:35 mcalabre Exp $
     28//# $Id: SDFITSreader.h,v 19.13 2007/11/12 03:37:56 cal103 Exp $
    2929//#---------------------------------------------------------------------------
    3030//# The SDFITSreader class reads single dish FITS files such as those written
    … …  
    7676        double antPos[3],
    7777        char   obsMode[32],
     78        char   bunit[32],
    7879        float  &equinox,
    7980        char   radecsys[32],

  • trunk/external/atnf/PKSIO/SDFITSwriter.cc

    r1325 r1399  
    22//# SDFITSwriter.cc: ATNF CFITSIO interface class for SDFITS output.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Mark Calabretta, ATNF
    66//#
    … …  
    2727//#                        AUSTRALIA
    2828//#
    29 //# $Id: SDFITSwriter.cc,v 19.10 2006/07/05 05:44:52 mcalabre Exp $
     29//# $Id: SDFITSwriter.cc,v 19.12 2007/11/12 03:37:56 cal103 Exp $
    3030//#---------------------------------------------------------------------------
    3131//# Original: 2000/07/24, Mark Calabretta, ATNF
    … …  
    7676        double antPos[3],
    7777        char*  obsMode,
     78        char*  bunit,
    7879        float  equinox,
    7980        char*  dopplerFrame,
    … …  
    113114      break;
    114115    }
    115    
     116
    116117    if (cNChan[iIF] != cNChan[0] || cNPol[iIF] != cNPol[0]) {
    117118      // Varying channels and/or polarizations, need a TDIM column at least.
    … …  
    159160  char version[7];
    160161  char date[11];
    161   sscanf("$Revision: 19.10 $", "%*s%s", version);
    162   sscanf("$Date: 2006/07/05 05:44:52 $", "%*s%s", date);
     162  sscanf("$Revision: 19.12 $", "%*s%s", version);
     163  sscanf("$Date: 2007/11/12 03:37:56 $", "%*s%s", date);
    163164  sprintf(text, "SDFITSwriter (v%s, %s)", version, date);
    164165  fits_write_key_str(cSDptr, "ORIGIN", text, "output class", &cStatus);
    … …  
    355356  fits_insert_col(cSDptr, ++ncol, "TSYS", tform, &cStatus);
    356357  sprintf(tunit, "TUNIT%d", ncol);
    357   fits_write_key_str(cSDptr, tunit, "Jy", "units of field", &cStatus);
     358  fits_write_key_str(cSDptr, tunit, bunit, "units of field", &cStatus);
    358359
    359360  // CALFCTR (additional, real).
    … …  
    396397
    397398  sprintf(tunit, "TUNIT%d", ncol);
    398   fits_write_key_str(cSDptr, tunit, "Jy", "units of field", &cStatus);
     399  fits_write_key_str(cSDptr, tunit, bunit, "units of field", &cStatus);
    399400
    400401  // FLAGGED (additional, logical).
    … …  
    444445
    445446    sprintf(tunit, "TUNIT%d", ncol);
    446     fits_write_key_str(cSDptr, tunit, "Jy", "units of field", &cStatus);
     447    fits_write_key_str(cSDptr, tunit, bunit, "units of field", &cStatus);
    447448  }
    448449
    … …  
    743744
    744745
     746//------------------------------------------------------ SDFITSwriter::history
     747
     748// Write a history record.
     749
     750int SDFITSwriter::history(char *text)
     751
     752{
     753  fits_write_history(cSDptr, text, &cStatus);
     754
     755  return cStatus;
     756}
     757
    745758//-------------------------------------------------- SDFITSwriter::reportError
    746759

  • trunk/external/atnf/PKSIO/SDFITSwriter.h

    r1325 r1399  
    22//# SDFITSwriter.h: ATNF CFITSIO interface class for SDFITS output.
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2000-2006
     4//# Copyright (C) 2000-2007
    55//# Mark Calabretta, ATNF
    66//#
    … …  
    2727//#                        AUSTRALIA
    2828//#
    29 //# $Id: SDFITSwriter.h,v 19.5 2006/05/19 02:19:58 mcalabre Exp $
     29//# $Id: SDFITSwriter.h,v 19.7 2007/11/12 03:37:56 cal103 Exp $
    3030//#---------------------------------------------------------------------------
    3131//# Original: 2000/07/24, Mark Calabretta, ATNF
    … …  
    6060        double antPos[3],
    6161        char*  obsMode,
     62        char*  bunit,
    6263        float  equinox,
    6364        char*  dopplerFrame,
    … …  
    7172    // Store time-variable data.
    7273    int write(PKSMBrecord &record);
     74
     75    // Write a history record.
     76    int history(char* text);
    7377
    7478    // Print out CFITSIO error messages.
Note: See TracChangeset for help on using the changeset viewer.