Changeset 33
- Timestamp:
- 07/07/04 18:03:50 (20 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/SDReader.cc
r25 r33 62 62 if (reader_) delete reader_; reader_ = 0; 63 63 Bool haveBase, haveSpectra, haveXPol; 64 //Int nChan, nIF, nPol;65 64 String inName(filename); 66 65 String format; … … 77 76 return; 78 77 } 79 80 78 nBeam_ = beams.nelements(); 81 79 // Get basic parameters. … … 113 111 reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol); 114 112 table_->putSDHeader(header_); 113 frequencies_.setRefFrame(header_.freqref); 114 frequencies_.setEquinox(header_.equinox); 115 115 } 116 116 … … 133 133 134 134 uInt stepsize = header_.nif*header_.nbeam; 135 cerr << "SDReader stepsize = " << stepsize << endl;135 //cerr << "SDReader stepsize = " << stepsize << endl; 136 136 uInt seqi = 0; 137 //SDFrequencyTable sdft();138 137 Bool getAll = False; 139 138 if (seq[n-1] == -1) getAll = True; … … 161 160 if (row < stepsize-1) cerr << "incomplete integration data." << endl; 162 161 cerr << "EOF" << endl; 162 table_->putSDFreqTable(frequencies_); 163 163 return status; 164 164 } 165 165 } 166 166 // if in the given list 167 if (cursor_ == seq[seqi] ) {167 if (cursor_ == seq[seqi] || getAll) { 168 168 // add integration cycle 169 169 if (row==0) { … … 179 179 // IFno beamNo are 1-relative 180 180 // refPix = nChan/2+1 in Integer arith.! 181 //uInt refPix = header_.nchan/2+1; 182 //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc); 181 Int refPix = header_.nchan/2+1; 182 Int frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc); 183 sc.setFrequencyMap(frqslot,IFno-1); 183 184 184 185 sc.scanid = scanNo; 185 //sc.setFrequencyMap(frqslot,IFno-1);186 186 sc.setSpectrum(spectra, beamNo-1, IFno-1); 187 187 sc.setFlags(flagtra, beamNo-1, IFno-1); … … 190 190 } 191 191 } 192 if (cursor_ == seq[seqi] ) {192 if (cursor_ == seq[seqi] || getAll) { 193 193 // insert container into table/list 194 194 table_->putSDContainer(sc); … … 197 197 cursor_++;// increment position in file 198 198 } 199 table_->putSDFreqTable(frequencies_); 199 200 return status; 200 201 } -
trunk/src/SDReader.h
r18 r33 75 75 PKSreader* reader_; 76 76 SDHeader header_; 77 SDFrequencyTable frequencies_; 77 78 CountedPtr<SDMemTable> table_; 78 79 String filename_;
Note:
See TracChangeset
for help on using the changeset viewer.