Changeset 33 for trunk/src

Timestamp:

07/07/04 18:03:50 (20 years ago)

Author:

mmarquar

Message:

Added reading of frequency information. Also added the getAll flag to get all integrations in the file.

Location:

trunk/src

Files:

• SDReader.cc (modified) (8 diffs)
• SDReader.h (modified) (1 diff)

trunk/src/SDReader.cc

@@ -62 +62 @@
   if (reader_) delete reader_; reader_ = 0;
   Bool   haveBase, haveSpectra, haveXPol;
-  //Int    nChan, nIF, nPol;
   String inName(filename);
   String format;
@@ -77 +76 @@
     return;
   }
-
   nBeam_ = beams.nelements();
   // Get basic parameters.
@@ -113 +111 @@
   reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol);
   table_->putSDHeader(header_);
+  frequencies_.setRefFrame(header_.freqref);
+  frequencies_.setEquinox(header_.equinox);
 }
 
@@ -133 +133 @@
 
   uInt stepsize = header_.nif*header_.nbeam;
-  cerr << "SDReader stepsize = " << stepsize << endl;
+  //cerr << "SDReader stepsize = " << stepsize << endl;
   uInt seqi = 0;
-  //SDFrequencyTable sdft();
   Bool getAll = False;
   if (seq[n-1] == -1) getAll = True;
@@ -161 +160 @@
           if (row < stepsize-1) cerr << "incomplete integration data." << endl;
           cerr << "EOF" << endl;
+          table_->putSDFreqTable(frequencies_);
           return status;
         }
       }      
       // if in the given list
-      if (cursor_ == seq[seqi]) {
+      if (cursor_ == seq[seqi] || getAll) {
         // add integration cycle
         if (row==0) {
@@ -179 +179 @@
         // IFno beamNo are 1-relative
         // refPix = nChan/2+1 in  Integer arith.!       
-        //uInt refPix = header_.nchan/2+1; 
-        //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
+        Int refPix = header_.nchan/2+1; 
+        Int frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc);
+        sc.setFrequencyMap(frqslot,IFno-1);
 
         sc.scanid = scanNo;
-        //sc.setFrequencyMap(frqslot,IFno-1);
         sc.setSpectrum(spectra, beamNo-1, IFno-1);
         sc.setFlags(flagtra,  beamNo-1, IFno-1);
@@ -190 +190 @@
       }
     }
-    if (cursor_ == seq[seqi]) {
+    if (cursor_ == seq[seqi] || getAll) {
       // insert container into table/list
       table_->putSDContainer(sc);
@@ -197 +197 @@
     cursor_++;// increment position in file
   }
+  table_->putSDFreqTable(frequencies_);
   return status;
 }

trunk/src/SDReader.h

@@ -75 +75 @@
   PKSreader* reader_;  
   SDHeader header_;
+  SDFrequencyTable frequencies_;
   CountedPtr<SDMemTable> table_;
   String filename_;