Changeset 2781 for trunk/external-alma/atnf/PKSIO/NRODataset.cc

Timestamp:

03/07/13 16:44:44 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Support SAM45 OTF data that is slightly different definition on
number of scans in the data (whether includes ZERO or not).

File:

• trunk/external-alma/atnf/PKSIO/NRODataset.cc (modified) (2 diffs)

trunk/external-alma/atnf/PKSIO/NRODataset.cc

@@ -280 +280 @@
 
   // fill NRODataset
-  int offset = getDataSize() + scanLen_ * i ;
+  long offset = getDataSize() + scanLen_ * i ;
   // DEBUG
   //cout << "NRODataset::fillRecord()  offset (header) = " << offset << endl ;
@@ -880 +880 @@
   //cout << "numArray=" << numArray << endl;
 }
+
+int NRODataset::getScanNum()
+{
+  long offset = getDataSize() + scanLen_ * NSCAN * ARYNM ;
+  fseek( fp_, offset, SEEK_SET ) ;
+  // try to read data
+  fgetc( fp_ ) ;
+  int eof = feof( fp_ ) ;
+  //cout << "eof=" << eof << endl;
+  // reset file pointer
+  fseek( fp_, 0, SEEK_SET ) ;
+  return NSCAN + (eof > 0 ? 0 : 1) ;
+}