Changeset 1757 for branches/alma/external/atnf/PKSIO/SDFITSreader.h

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• external/atnf/PKSIO/SDFITSreader.h (modified) (6 diffs)

branches/alma/external/atnf/PKSIO/SDFITSreader.h

@@ -2 +2 @@
 //# SDFITSreader.h: ATNF CFITSIO interface class for SDFITS input.
 //#---------------------------------------------------------------------------
-//# Copyright (C) 2000-2006
-//# Associated Universities, Inc. Washington DC, USA.
+//# livedata - processing pipeline for single-dish, multibeam spectral data.
+//# Copyright (C) 2000-2009, Australia Telescope National Facility, CSIRO
 //#
-//# This library is free software; you can redistribute it and/or modify it
-//# under the terms of the GNU Library General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or (at your
-//# option) any later version.
+//# This file is part of livedata.
 //#
-//# This library is distributed in the hope that it will be useful, but WITHOUT
+//# livedata is free software: you can redistribute it and/or modify it under
+//# the terms of the GNU General Public License as published by the Free
+//# Software Foundation, either version 3 of the License, or (at your option)
+//# any later version.
+//#
+//# livedata is distributed in the hope that it will be useful, but WITHOUT
 //# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-//# License for more details.
+//# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+//# more details.
 //#
-//# You should have received a copy of the GNU Library General Public License
-//# along with this library; if not, write to the Free Software Foundation,
-//# Inc., 675 Massachusetts Ave, Cambridge, MA 02139, USA.
+//# You should have received a copy of the GNU General Public License along
+//# with livedata.  If not, see <http://www.gnu.org/licenses/>.
 //#
-//# Correspondence concerning this software should be addressed as follows:
-//#        Internet email: aips2-request@nrao.edu.
-//#        Postal address: AIPS++ Project Office
-//#                        National Radio Astronomy Observatory
-//#                        520 Edgemont Road
-//#                        Charlottesville, VA 22903-2475 USA
+//# Correspondence concerning livedata may be directed to:
+//#        Internet email: mcalabre@atnf.csiro.au
+//#        Postal address: Dr. Mark Calabretta
+//#                        Australia Telescope National Facility, CSIRO
+//#                        PO Box 76
+//#                        Epping NSW 1710
+//#                        AUSTRALIA
 //#
-//# $Id$
+//# http://www.atnf.csiro.au/computing/software/livedata.html
+//# $Id: SDFITSreader.h,v 19.22 2009-09-29 07:33:39 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The SDFITSreader class reads single dish FITS files such as those written
@@ -38 +41 @@
 
 #include <atnf/PKSIO/FITSreader.h>
-#include <atnf/PKSIO/PKSMBrecord.h>
+#include <atnf/PKSIO/MBrecord.h>
+
+#include <casa/Logging/LogIO.h>
 
 #include <fitsio.h>
+
+using namespace std;
+using namespace casa;
 
 // <summary>
@@ -76 +84 @@
         double antPos[3],
         char   obsMode[32],
+        char   bunit[32],
         float  &equinox,
         char   radecsys[32],
@@ -99 +108 @@
 
     // Read the next data record.
-    virtual int read(PKSMBrecord &record);
-
-    // Print out CFITSIO error messages.
-    void reportError(void);
+    virtual int read(MBrecord &record);
 
     // Close the SDFITS file.
@@ -108 +114 @@
 
   private:
-    int      cCycleNo, cExtraSysCal, cNAxis, cStatus;
-    long     cNAxes[5], cNRow, cReqax[4], cRow;
+    int      cCycleNo, cExtraSysCal, cNAxes, cStatus;
+    long     cBeamAxis, cDecAxis, cFreqAxis, cNAxis[5], cNAxisTime, cNRow,
+             cRaAxis, cRow, cStokesAxis, cTimeAxis, cTimeIdx;
     double   cLastUTC;
     fitsfile *cSDptr;
@@ -117 +124 @@
     int  cBeam_1rel, cIF_1rel;
 
+    // for GBT
+    int *cPols ;
+
     enum {SCAN, CYCLE, DATE_OBS, TIME, EXPOSURE, OBJECT, OBJ_RA, OBJ_DEC,
-          RESTFRQ, OBSMODE, BEAM, IF, FqRefPix, FqRefVal, FqDelt, RA, DEC,
-          SCANRATE, TSYS, CALFCTR, XCALFCTR, BASELIN, BASESUB, DATA, FLAGGED,
-          DATAXED, XPOLDATA, REFBEAM, TCAL, TCALTIME, AZIMUTH, ELEVATIO,
-          PARANGLE, FOCUSAXI, FOCUSTAN, FOCUSROT, TAMBIENT, PRESSURE,
-          HUMIDITY, WINDSPEE, WINDDIRE, NDATA};
+          RESTFRQ, OBSMODE, BEAM, IF, FqRefVal, FqDelt, FqRefPix, RA, DEC,
+          TimeRefVal, TimeDelt, TimeRefPix, SCANRATE, TSYS, CALFCTR, XCALFCTR,
+          BASELIN, BASESUB, DATA, FLAGGED, DATAXED, XPOLDATA, REFBEAM, TCAL,
+          TCALTIME, AZIMUTH, ELEVATIO, PARANGLE, FOCUSAXI, FOCUSTAN, FOCUSROT,
+          TAMBIENT, PRESSURE, HUMIDITY, WINDSPEE, WINDDIRE, STOKES, SIG, CAL, 
+          VFRAME, RVSYS, VELDEF, NDATA};
+
+    // Message handling.
+    void log(LogOrigin origin, LogIO::Command cmd, const char *msg = 0x0);
 
     void findData(int iData, char *name, int type);
+    void  findCol(char *name, int *colnum);
     int   readDim(int iData, long iRow, int *naxis, long naxes[]);
     int  readParm(char *name, int type, void *value);
     int  readData(char *name, int type, long iRow, void *value);
     int  readData(int iData, long iRow, void *value);
-    void  findCol(char *name, int *colnum);
+    int  readCol(int iData, void *value);
+    int  readTime(long iRow, int iPix, char *datobs, double &utc);
 
-    // These are for ALFA data, "BDFITS" or "CIMAFITS".
+    // These are for ALFA data: "BDFITS" or "CIMAFITS".  Statics are required
+    // for CIMAFITS v2.0 because CAL ON/OFF data is split into separate files.
+    static int  sInit, sReset;
+    static int  (*sALFAcalNon)[2], (*sALFAcalNoff)[2];
+    static float (*sALFAcal)[2], (*sALFAcalOn)[2], (*sALFAcalOff)[2];
+
     int   cALFA, cALFA_BD, cALFA_CIMA, cALFAscan, cScanNo;
-    float cALFAcal[8][2], cALFAcalOn[8][2], cALFAcalOff[8][2];
-    int   alfaCal(short iBeam, short iIF);
+    float cALFAacc;
+    int   alfaCal(short iBeam, short iIF, short iPol);
+    float alfaGain(float zd);
 
     // These are for GBT data.
     int   cGBT, cFirstScanNo;
+    double cGLastUTC[4] ;
+    int cGLastScan[4] ;
+    int cGCycleNo[4] ;
 };