Changeset 3012 for trunk/external-alma

Timestamp:

11/11/14 16:03:04 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6985

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified NRODataset::fillRecord() so that ASAP can correctly access NRO data larger than 2^{32 bytes.}

File:

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

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

@@ -1006 +1006 @@
 
   // fill NRODataset
-  long offset = getDataSize() + scanLen_ * i ;
+  long offset = (long)getDataSize() + (long)scanLen_ * (long)i ;
   // DEBUG
   //cout << "NRODataset::fillRecord()  offset (header) = " << offset << endl ;
@@ -1609 +1609 @@
 int NRODataset::getScanNum()
 {
-  long offset = getDataSize() + scanLen_ * NSCAN * ARYNM ;
+  long offset = (long)getDataSize() + (long)scanLen_ * (long)NSCAN * (long)ARYNM ;
   fseek( fp_, offset, SEEK_SET ) ;
   // try to read data