Changeset 3097 for trunk

Timestamp:

03/29/16 19:56:26 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...

Bug fix on string handling in NRO data filler. Remove trailing null character ('\0').

File:

• trunk/external-alma/atnf/PKSIO/NROReader.cc (modified) (5 diffs)

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

@@ -56 +56 @@
 
 using namespace std ;
+
+namespace {
+// to limit template argument to specified type
+template<class T>
+constexpr inline bool type_guard() {
+  return false;
+}
+template<>
+constexpr inline bool type_guard<string>() {
+  return true;
+}
+template<>
+constexpr inline bool type_guard<String>() {
+  return true;
+}
+
+// T must be std::string or casa::String
+template<class T>
+inline String trim_nro_string(T const &s) {
+  static_assert(type_guard<T>(), "");
+  return s.substr(0, s.find_first_of('\0'));
+}
+}
 
 //
@@ -469 +492 @@
   npol = getPolarizationNum() ;
   //cout << "npol = " << npol << endl ;
-  observer = dataset_->getOBSVR() ;
-  //cout << "observer = " << observer << endl ;
-  project = dataset_->getPROJ() ;
-  //cout << "project = " << project << endl ;
-  obstype = dataset_->getSWMOD() ;
-  //cout << "obstype = " << obstype << endl ;
-  antname = dataset_->getSITE() ;
-  //cout << "antname = " << antname << endl ;
+  observer = trim_nro_string(dataset_->getOBSVR()) ;
+  //cout << "observer = \"" << observer << "\" (size " << observer.size() << ")" << endl ;
+  project = trim_nro_string(dataset_->getPROJ()) ;
+  //cout << "project = \"" << project << "\" (size " << project.size() << ")" << endl ;
+  obstype = trim_nro_string(dataset_->getSWMOD()) ;
+  //cout << "obstype = \"" << obstype << "\" (size " << obstype.size() << ")" << endl ;
+  antname = trim_nro_string(dataset_->getSITE()) ;
+  //cout << "antname = \"" << antname << "\" (size " << antname.size() << ")" << endl ;
   // TODO: should be investigated antenna position since there are 
   //       no corresponding information in the header
@@ -514 +537 @@
   //freqref = "LSRK" ;
   //freqref = "REST" ;
-  freqref = freqRefFromVREF_ ? vref : "REST" ; 
-  //cout << "freqref = " << freqref << endl ;
+  freqref = freqRefFromVREF_ ? trim_nro_string(vref) : "REST" ;
+  //cout << "freqref = \"" << freqref << "\" (size " << freqref.size() << ")" << endl ;
   const NRODataRecord *record = dataset_->getRecord( 0 ) ;
   reffreq = record->FREQ0 ; // rest frequency
@@ -528 +551 @@
   epoch = "UTC" ;  
   //cout << "epoch = " << epoch << endl ;
-  string poltp = dataset_->getPOLTP()[0] ;
-  //cout << "poltp = '" << poltp << "'" << endl ;
+  string poltp = trim_nro_string(dataset_->getPOLTP()[0]) ;
+  //cout << "poltp = \"" << poltp << "\" (size " << poltp.size() << ")" << endl ;
   if ( poltp.empty() || poltp[0] == ' ' || poltp[0] == '\0' ) 
     //poltp = "None" ;
@@ -660 +683 @@
 
   // srcname
-  srcname = String( dataset_->getOBJ() ) ;
-  //cout << "srcname = " << srcname << endl ;
+  srcname = trim_nro_string( dataset_->getOBJ() ) ;
+  //cout << "srcname = \"" << srcname << "\" (size " << srcname.size() << ")" << endl ;
 
   // fieldname
-  fieldname = String( dataset_->getOBJ() ) ;
-  //cout << "fieldname = " << fieldname << endl ;
+  fieldname = trim_nro_string( dataset_->getOBJ() ) ;
+  //cout << "fieldname = \"" << fieldname << "\" (size " << fieldname.size() << ")" << endl ;
 
   // spectra