Changeset 1521 for branches

Timestamp:

03/06/09 11:42:46 (16 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1043

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): atnf

Description:

Changes due to an update of NROReader.

File:

• branches/alma/src/STFiller.cpp (modified) (4 diffs)

branches/alma/src/STFiller.cpp

@@ -479 +479 @@
     return ;
   }
-
-  // DEBUG
-  //cout << "STFiller::openNRO()  getHeaderInfo " << endl ;
-  //
 
   ifOffset_ = 0;
@@ -607 +603 @@
   Array<Double> scanrate ;
   for ( i = 0 ; i < imax ; i++ ) {
-    if( nreader_->getData( i ) != 0 ) {
-      cerr << "STFiller::readNRO()  error while reading row " << i << endl ;
-      return -1 ;
-    }
+//     if( nreader_->getDataset()->getRecord( i ) == NULL ) {
+//       cerr << "STFiller::readNRO()  error while reading row " << i << endl ;
+//       return -1 ;
+//     }
 
     string scanType = nreader_->getScanType( i ) ;
     Int srcType = -1 ;
     if ( scanType.compare( 0, 2, "ON") == 0 ) {
+      // cout << "ON srcType: " << i << endl ;
       srcType = 0 ;
     }
@@ -799 +796 @@
 Bool STFiller::fileCheck()
 {
+  bool bval = false ;
+
   // if filename_ is directory, return false
   File inFile( filename_ ) ;
   if ( inFile.isDirectory() )
-    return false ;
+    return bval ;
   
   // if beginning of header data is "RW", return true
@@ -808 +807 @@
   FILE *fp = fopen( filename_.c_str(), "r" ) ;
   char buf[9] ;
+  char buf2[80] ;
   fread( buf, 4, 1, fp ) ;
   buf[4] = '\0' ;
-  if ( ( strncmp( buf, "RW", 2 ) == 0 ) )
-    return true ;
-
-  return false ;
+  fseek( fp, 640, SEEK_SET ) ;
+  fread( buf2, 80, 1, fp ) ;
+  if ( ( strncmp( buf, "RW", 2 ) == 0 ) || ( strstr( buf2, "NRO45M" ) != NULL ) ) {
+    bval = true ;
+  }
+  fclose( fp ) ;
+  return bval ;
 }