Changeset 2664 for trunk/external-alma

Timestamp:

10/11/12 17:24:12 (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...

Fix for serious bug in NRO FITS reader, which sets BEAMNO to wrong value
when array number is larger than 9.

File:

• trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc (modified) (8 diffs)

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

@@ -620 +620 @@
   }
   // DEBUG
-//   nro_debug_output( "RX", ARYNM, RX ) ;
+  //nro_debug_output( "RX", ARYNM, RX ) ;
   //
   if ( readColumn( HPBW, "HPBW", sameEndian ) != 0 ) {
@@ -1022 +1022 @@
   strcpy( record_->ARRYT, str4.c_str() ) ;
   status = readTable( record_->ARRYT, "ARRYT", strlen(record_->ARRYT), i ) ;
-  record_->ARRYT[3] = '\0' ;
+  for (int j = strlen(record_->ARRYT)-1 ; j >= 0 ; j--) {
+    if (record_->ARRYT[j] == ' ') record_->ARRYT[j] = '\0';
+    else break;
+  }
   if ( status ) {
     os << LogIO::WARN << "Error while reading ARRYT." << LogIO::POST ;
@@ -1549 +1552 @@
   string arry3 ;
   string arry4 ;
+  char arytp[4];
   if ( readHeader( arry, "ARRY1" ) == 0 ) 
     arry1 = arry ;
@@ -1555 +1559 @@
   for ( int i = 0 ; i < 20 ; i++ ) {
     if ( arry1[i] == '1' ) {
-      char arytp[4] ;
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
       sprintf( arytp, "H%d", i+1 ) ;
       ARYTP[count++] = string( arytp ) ;
-      //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ; 
     }
   }
@@ -1565 +1568 @@
   else 
     arry2 = "00000000000000000000" ;
-  for ( int i = 0 ; i < 20 ; i++ ) {
+  for ( int i = 0 ; i < 10 ; i++ ) {
     if ( arry2[i] == '1' ) {
-      if ( i < 10 ) {
-        char arytp[4] ;
-        sprintf( arytp, "W%d", i+1 ) ;
-        ARYTP[count++] = string( arytp ) ;
-        //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ;
-      }
-      else if ( i < 15 ) {
-        char arytp[4] ;
-        sprintf( arytp, "U%d", i-9 ) ;
-        ARYTP[count++] = string( arytp ) ;
-        //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ;
-      }
-      else {
-        char arytp[4] ;
-        sprintf( arytp, "X%d", i-14 ) ;
-        ARYTP[count++] = string( arytp ) ;
-        //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ;
-      }
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
+      sprintf( arytp, "W%d", i+1 ) ;
+      ARYTP[count++] = string( arytp ) ;
+    }
+  }
+  for ( int i = 10 ; i < 15 ; i++ ) {
+    if ( arry2[i] == '1' ) {
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
+      sprintf( arytp, "U%d", i-9 ) ;
+      ARYTP[count++] = string( arytp ) ;
+    }
+  }
+  for ( int i = 15 ; i < 20 ; i++ ) {
+    if ( arry2[i] == '1' ) {
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
+      sprintf( arytp, "X%d", i-14 ) ;
+      ARYTP[count++] = string( arytp ) ;
     }
   }
@@ -1593 +1595 @@
   for ( int i = 0 ; i < 20 ; i++ ) {
     if ( arry3[i] == '1' ) {
-      char arytp[4] ;
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
       sprintf( arytp, "A%d", i+1 ) ;
       ARYTP[count++] = string( arytp ) ;
-      //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ;
     }
   }
@@ -1605 +1606 @@
   for ( int i = 0 ; i < 20 ; i++ ) {
     if ( arry4[i] == '1' ) {
-      char arytp[4] ;
+      for (int j = 0 ; j < 4 ; j++) arytp[j] = '\0';
       sprintf( arytp, "A%d", i+21 ) ;
       ARYTP[count++] = string( arytp ) ;
-      //cout << "ARYTP[" << count-1 << "] = " << ARYTP[count-1] << endl ;
     }
   }      
+  //nro_debug_output("ARYTP", ARYTP.size(), ARYTP);
 }
 
@@ -2234 +2235 @@
 uInt NROFITSDataset::getArrayId( string type )
 {
-  uInt ib = 99 ;
-  for ( uInt i = 0 ; i < arrayid_.size() ; i++ ) {
-    uInt len = ARYTP[i].size() ;
-    if ( type.compare( 0, len, ARYTP[i], 0, len ) == 0 ) {
+  uInt ib = 99;
+  uInt len0 = type.size();
+  for (uInt i = 0 ; i < arrayid_.size() ; i++) {
+    uInt len = ARYTP[i].size();
+    if ( len0 == len && type.compare( 0, len, ARYTP[i], 0, len ) == 0 ) {
       ib = i ;
       break ;