Changeset 205

Timestamp:

01/18/05 17:24:55 (19 years ago)

Author:

mar637

Message:

• added fluxunit, epoch
• added restfrequencies
• fixed "defect" which was telling the user that incomplete scans where found in case of multi if data

File:

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

trunk/src/SDReader.cc

@@ -127 +127 @@
   }
   header_.nif = nIF_;
+  header_.fluxunit = "K";
+  header_.epoch = "UTC";
   // Apply selection criteria.
   Vector<Int> start(nIF_, 1);
@@ -136 +138 @@
   table_->putSDHeader(header_);
   frequencies_.setRefFrame(header_.freqref);
+  frequencies_.setRestFrequencyUnit("Hz");
   frequencies_.setEquinox(header_.equinox);
 }
@@ -157 +160 @@
 
   uInt stepsize = header_.nif*header_.nbeam;
-  //cerr << "SDReader stepsize = " << stepsize << endl;
   uInt seqi = 0;
   Bool getAll = False;
@@ -164 +166 @@
     // only needs to be create if in seq
     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++) {
@@ -181 +182 @@
         if (status == -1) {
           // EOF.
-          if (row < stepsize-1) cerr << "incomplete scan data.\n Probably means not all Beams/IFs/Pols within a scan a present." << endl;
+          if (row > 0 && row < stepsize-1) 
+            cerr << "incomplete scan data.\n Probably means not all Beams/IFs/Pols within a scan are present." << endl;
           //cerr << "EOF" << endl;
           table_->putSDFreqTable(frequencies_);
@@ -207 +209 @@
         Int refPix = header_.nchan/2+1;
         Int frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc);
+        frequencies_.addRestFrequency(restFreq);
         sc.setFrequencyMap(frqslot,IFno-1);
         sc.tcal[0] = tcal[0];sc.tcal[1] = tcal[1];