Changeset 1399 for trunk/external/atnf/PKSIO/SDFITSreader.cc

Timestamp:

11/16/07 13:36:15 (17 years ago)

Author:

Malte Marquarding

Message:

Mark C added brightness unit to getHeader()

File:

• trunk/external/atnf/PKSIO/SDFITSreader.cc (modified) (8 diffs)

trunk/external/atnf/PKSIO/SDFITSreader.cc

@@ -2 +2 @@
 //# SDFITSreader.cc: ATNF CFITSIO interface class for SDFITS input.
 //#---------------------------------------------------------------------------
-//# Copyright (C) 2000-2006
+//# Copyright (C) 2000-2007
 //# Associated Universities, Inc. Washington DC, USA.
 //#
@@ -26 +26 @@
 //#                        Charlottesville, VA 22903-2475 USA
 //#
-//# $Id: SDFITSreader.cc,v 19.22 2006/07/12 00:14:26 mcalabre Exp $
+//# $Id: SDFITSreader.cc,v 19.23 2007/11/12 03:37:56 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The SDFITSreader class reads single dish FITS files such as those written
@@ -57 +57 @@
     long nelem;         // Column data repeat count; < 0 for vardim.
     int  tdimcol;       // TDIM column number; 0 for keyword; -1 absent.
+    char units[32];     // Units from TUNITn keyword.
 };
 
@@ -182 +183 @@
 
     if (cALFA_BD) {
-      // ALFA BDFITS: variable length arrays don't actually vary and there is 
+      // ALFA BDFITS: variable length arrays don't actually vary and there is
       // no TDIM (or MAXISn) card; use the LAGS_IN value.
       cNAxis = 5;
@@ -725 +726 @@
         double antPos[3],
         char   obsMode[32],
+        char   bunit[32],
         float  &equinox,
         char   radecsys[32],
@@ -773 +775 @@
   readData(OBSMODE, 1, obsMode);                        // Shared.
 
+  // Brightness unit.
+  strcpy(bunit, cData[DATA].units);
+  if (strcmp(bunit, "JY") == 0) {
+    bunit[1] = 'y';
+  } else if (strcmp(bunit, "JY/BEAM") == 0) {
+    strcpy(bunit, "Jy/beam");
+  }
+
   readParm("EQUINOX",  TFLOAT,  &equinox);              // Shared.
   if (cStatus == 405) {
@@ -1242 +1252 @@
 
   // Source identification.
-  readData(OBJECT,  cRow,  mbrec.srcName);
+  readData(OBJECT, cRow, mbrec.srcName);
 
   readData(OBJ_RA,  cRow, &mbrec.srcRA);
@@ -1737 +1747 @@
     long nelem, width;
     fits_get_coltype(cSDptr, colnum, &coltype, &nelem, &width, &cStatus);
+    fits_get_bcolparms(cSDptr, colnum, 0x0, cData[iData].units, 0x0, 0x0, 0x0,
+      0x0, 0x0, 0x0, &cStatus);
 
     // Look for a TDIMnnn keyword or column.