Changeset 16 for trunk/src/SDReader.cc

Timestamp:

06/30/04 11:00:23 (20 years ago)

Author:

mmarquar

Message:

Updated data container. Changed the axis order in the spectrum/flag arrays to [nBeam,nIF,nPol,nChan]

File:

• trunk/src/SDReader.cc (modified) (9 diffs)

trunk/src/SDReader.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 #include <atnf/PKSIO/PKSreader.h>
-
+#include <aips/Quanta/MVTime.h>
 #include "SDContainer.h"
 #include "SDReader.h"
 
 using namespace atnf_sd;
+
+void SDHeader::print() const {
+  MVTime mvt(this->utc);
+
+  cout << "Observer: " << this->observer << endl 
+       << "Project: " << this->project << endl
+       << "Obstype: " << this->obstype << endl
+       << "Antenna: " << this->antennaname << endl
+       << "Ant. Position: " << this->antennaposition << endl
+       << "Equinox: " << this->equinox << endl
+       << "Freq. ref.: " << this->freqref << endl
+       << "Ref. frequency: " << this->reffreq << endl
+       << "Bandwidth: "  << this->bandwidth << endl
+       << "Time (utc): " 
+       << mvt.string()
+       << endl;
+  //setprecision(10) << this->utc << endl;
+}
+
 
 SDReader::SDReader() :
@@ -85 +104 @@
   
   // Get basic parameters.
-  Double bandwidth, refFreq;
   header_ = SDHeader();
   header_.nchan = nChan_;
@@ -152 +170 @@
   while ( (cursor_ <= seq[n-1]) || getAll) {
     // only needs to be create if in seq
-    SDContainer sc(header_.nbeam,header_.nif,header_.nchan,header_.npol);
+    SDContainer sc(header_.nbeam,header_.nif,header_.npol,header_.nchan);
 
     // iterate over one correlator integration cycle = nBeam*nIF
     for (uInt row=0; row < stepsize; row++) {
-
-      //cerr << "SDReader starting reading process row = " << row << endl;
-
       // add scanid from GROUP field -- this will remove the need for
       // stepsize as well
@@ -171 +186 @@
                              tsys, sigma, calFctr, baseLin, baseSub, 
                              spectra, flagtra, xCalFctr, xPol);          
-
-      // cerr << "SDReader row  read"<< endl;
-
       if (status) {
         if (status == -1) {
@@ -183 +195 @@
       }      
       // if in the given list
-      if ( cursor_ == seq[seqi]) {
-
-        //cerr << "SDReader cursor == seq[i]" << endl;
-        
+      if (cursor_ == seq[seqi]) {
         // add integration cycle
         if (row==0) {
@@ -193 +202 @@
           //focusRot, temperature, pressure, humidity, windSpeed,
           //windAz  srcDir, srcPM, srcVel
+          sc.timestamp = mjd;
+          sc.interval = interval;         
+          sc.sourcename = srcName;
         }
-
-        // cerr << "SDReader::read -  before SDContainer" << endl;
-
         // add specific info
         // IFno beamNo are 1-relative
-        // refPix = nChan/2+1 in  Integer arith.!
-        
-        uInt refPix = header_.nchan/2+1; 
+        // refPix = nChan/2+1 in  Integer arith.!       
+        //uInt refPix = header_.nchan/2+1; 
         //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
 
@@ -208 +216 @@
           prevName = srcName;//temp
         }//temp
-
-        sc.sourcename = srcName;
-        sc.timestamp = mjd;
-        sc.interval = interval;
         sc.scanid = scanid;
         //sc.setFrequencyMap(frqslot,IFno-1);
@@ -218 +222 @@
         sc.setTsys(tsys, beamNo-1, IFno-1);
         //sc.addPointing(direction, beamNo-1);
-
-        // cerr << "SDReader::read -  after SDContainer" << endl;
-        
       }
     }
@@ -226 +227 @@
       // insert container into table/list
       table_->putSDContainer(sc);
-      //cout << "Reading integration " << seqi << endl;
       seqi++;// next in list
     }
-    cursor_++;
+    cursor_++;// increment position in file
   }
   return status;