Changeset 2766 for trunk/external-alma

Timestamp:

02/07/13 18:08:16 (12 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...

Use CountedPtr for NRODataRecord object instead of raw C pointer.

Location:

trunk/external-alma/atnf/PKSIO

Files:

• NRODataset.cc (modified) (10 diffs)
• NRODataset.h (modified) (4 diffs)
• NROFITSDataset.cc (modified) (2 diffs)
• NROReader.cc (modified) (3 diffs)

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

@@ -187 +187 @@
 }
 
-void NRODataset::convertEndian( NRODataRecord *r ) 
-{
-  convertEndian( r->ISCAN ) ;
-  convertEndian( r->DSCX ) ;
-  convertEndian( r->DSCY ) ;
-  convertEndian( r->SCX ) ;
-  convertEndian( r->SCY ) ;
-  convertEndian( r->PAZ ) ;
-  convertEndian( r->PEL ) ;
-  convertEndian( r->RAZ ) ;
-  convertEndian( r->REL ) ;
-  convertEndian( r->XX ) ;
-  convertEndian( r->YY ) ;
-  convertEndian( r->TEMP ) ; 
-  convertEndian( r->PATM ) ;
-  convertEndian( r->PH2O ) ;
-  convertEndian( r->VWIND ) ;
-  convertEndian( r->DWIND ) ;
-  convertEndian( r->TAU ) ;  
-  convertEndian( r->TSYS ) ; 
-  convertEndian( r->BATM ) ; 
-  convertEndian( r->LINE ) ;
+void NRODataset::convertEndian( NRODataRecord &r ) 
+{
+  convertEndian( r.ISCAN ) ;
+  convertEndian( r.DSCX ) ;
+  convertEndian( r.DSCY ) ;
+  convertEndian( r.SCX ) ;
+  convertEndian( r.SCY ) ;
+  convertEndian( r.PAZ ) ;
+  convertEndian( r.PEL ) ;
+  convertEndian( r.RAZ ) ;
+  convertEndian( r.REL ) ;
+  convertEndian( r.XX ) ;
+  convertEndian( r.YY ) ;
+  convertEndian( r.TEMP ) ; 
+  convertEndian( r.PATM ) ;
+  convertEndian( r.PH2O ) ;
+  convertEndian( r.VWIND ) ;
+  convertEndian( r.DWIND ) ;
+  convertEndian( r.TAU ) ;  
+  convertEndian( r.TSYS ) ; 
+  convertEndian( r.BATM ) ; 
+  convertEndian( r.LINE ) ;
   for ( int i = 0 ; i < 4 ; i++ ) 
-    convertEndian( r->IDMY1[i] ) ;
-  convertEndian( r->VRAD ) ;
-  convertEndian( r->FREQ0 ) ;
-  convertEndian( r->FQTRK ) ;
-  convertEndian( r->FQIF1 ) ;
-  convertEndian( r->ALCV ) ; 
+    convertEndian( r.IDMY1[i] ) ;
+  convertEndian( r.VRAD ) ;
+  convertEndian( r.FREQ0 ) ;
+  convertEndian( r.FQTRK ) ;
+  convertEndian( r.FQIF1 ) ;
+  convertEndian( r.ALCV ) ; 
   for ( int i = 0 ; i < 2 ; i++ )
     for ( int j = 0 ; j < 2 ; j++ ) 
-      convertEndian( r->OFFCD[i][j] ) ;
-  convertEndian( r->IDMY0 ) ;
-  convertEndian( r->IDMY2 ) ;
-  convertEndian( r->DPFRQ ) ;
-  convertEndian( r->SFCTR ) ;
-  convertEndian( r->ADOFF ) ;
+      convertEndian( r.OFFCD[i][j] ) ;
+  convertEndian( r.IDMY0 ) ;
+  convertEndian( r.IDMY2 ) ;
+  convertEndian( r.DPFRQ ) ;
+  convertEndian( r.SFCTR ) ;
+  convertEndian( r.ADOFF ) ;
 }
 
 void NRODataset::releaseRecord()
 {
-  if ( record_ ) {
+  if ( !record_.null() ) {
     record_ = NULL ;
   }
@@ -248 +248 @@
 
   if ( i == dataid_ ) {
-    return record_ ;
+    return &(*record_) ;
   }
 
@@ -267 +267 @@
   }
 
-  return record_ ;
+  return &(*record_) ;
 }
 
@@ -285 +285 @@
   //cout << "NRODataset::fillRecord()  sizeof(NRODataRecord) = " << sizeof( NRODataRecord ) << " byte" << endl ;
   fseek( fp_, offset, SEEK_SET ) ;
-  if ( (int)fread( record_, 1, SCAN_HEADER_SIZE, fp_ ) != SCAN_HEADER_SIZE ) {
+  if ( (int)fread( &(*record_), 1, SCAN_HEADER_SIZE, fp_ ) != SCAN_HEADER_SIZE ) {
     //cerr << "Failed to read scan header: " << i << endl ;
     LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ;
@@ -299 +299 @@
 
   if ( same_ == 0 ) {
-    convertEndian( record_ ) ;
+    convertEndian( *record_ ) ;
   } 
 
@@ -358 +358 @@
   //
 
-  NRODataRecord *record = getRecord( i ) ;
+  const NRODataRecord *record = getRecord( i ) ;
 
   const int bit = IBIT ;   // fixed to 12 bit
@@ -467 +467 @@
   //cout << "NRODataset::getIndex()  start" << endl ;
   //
-  NRODataRecord *record = getRecord( irow ) ;
-  string str = record->ARRYT ;
+  const NRODataRecord *record = getRecord( irow ) ;
+  const string str = record->ARRYT ;
   // DEBUG
   //cout << "NRODataset::getIndex()  str = " << str << endl ;
@@ -541 +541 @@
 double NRODataset::getStartIntTime( int i ) 
 {
-  NRODataRecord *record = getRecord( i ) ;
-
-  char *t = record->LAVST ;
+  const NRODataRecord *record = getRecord( i ) ;
+
+  const char *t = record->LAVST ;
   return getMJD( t ) ;
 }
 
-double NRODataset::getMJD( char *time ) 
+double NRODataset::getMJD( const char *time ) 
 {
   // TODO: should be checked which time zone the time depends on
@@ -592 +592 @@
       f[1] = f[1] - f[0] * f[2] ;
     }
-    NRODataRecord *record = getRecord( i ) ;
+    const NRODataRecord *record = getRecord( i ) ;
     f[3] = record->FREQ0 ;
     if ( v.size() == 0 ) {
@@ -629 +629 @@
   vector<double> v( 3, 0.0 ) ;
 
-  NRODataRecord *record = getRecord( i ) ;
+  const NRODataRecord *record = getRecord( i ) ;
   string arryt = string( record->ARRYT ) ;
   uInt ib = getArrayId( arryt ) ;

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

@@ -42 +42 @@
 #include <casa/Logging/LogIO.h>
 #include <casa/Containers/Record.h>
+#include <casa/Utilities/CountedPtr.h>
 #include <atnf/PKSIO/NRODataRecord.h>
 #include <casa/namespace.h>
@@ -194 +195 @@
   virtual double getStartIntTime( int i ) ;
   virtual double getScanTime( int i ) ;
-  virtual double getMJD( char *time ) ;
+  virtual double getMJD( const char *time ) ;
   virtual std::vector<bool> getIFs() ;
   virtual std::vector<double> getFrequencies( int i ) ;
@@ -214 +215 @@
 
   // Endian conversion for NRODataRecord
-  void convertEndian( NRODataRecord *r ) ;
+  void convertEndian( NRODataRecord &r ) ;
 
   // Read char data
@@ -500 +501 @@
 
   // Data record
-  NRODataRecord *record_ ;
+  CountedPtr<NRODataRecord> record_ ;
 
   // input filename

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

@@ -1225 +1225 @@
   vector<double> spec( chmax_, 0.0 ) ;
   vector<double> specout( chmax_, 0.0 ) ;
-  NRODataRecord *record = getRecord( i ) ;
+  const NRODataRecord *record = getRecord( i ) ;
   double scale = record->SFCTR ;
   double offset = record->ADOFF ;
@@ -1415 +1415 @@
 int NROFITSDataset::getIndex( int irow ) 
 {
-  NRODataRecord *record = getRecord( irow ) ;
+  const NRODataRecord *record = getRecord( irow ) ;
   string str = record->ARRYT ;
   string::size_type pos = str.find( " " ) ;

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

@@ -345 +345 @@
 {
   Vector<Double> v( 2 ) ;
-  NRODataRecord *record = dataset_->getRecord( i ) ;
+  const NRODataRecord *record = dataset_->getRecord( i ) ;
   char epoch[5] ;
   strncpy( epoch, (dataset_->getEPOCH()).c_str(), 5 ) ;
@@ -479 +479 @@
   freqref = freqRefFromVREF_ ? vref : "REST" ; 
   //cout << "freqref = " << freqref << endl ;
-  NRODataRecord *record = dataset_->getRecord( 0 ) ;
+  const NRODataRecord *record = dataset_->getRecord( 0 ) ;
   reffreq = record->FREQ0 ; // rest frequency
 
@@ -520 +520 @@
 string NROReader::getScanType( int i )
 {
-  NRODataRecord *record = dataset_->getRecord( i ) ;
+  const NRODataRecord *record = dataset_->getRecord( i ) ;
   string s = record->SCANTP ;