Changeset 2863 for trunk

Timestamp:

10/23/13 17:11:24 (11 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): sd

Description: Describe your changes here...

Bug fix on sdsave.
Properly handle the case when empty restfrequency row is mixed with
rows with restfrequency.

File:

• trunk/src/MSWriter.cpp (modified) (4 diffs)

trunk/src/MSWriter.cpp

@@ -2499 +2499 @@
 
   Int srcId = 0 ;
-  Vector<Double> restFreq ;
-  Vector<String> molName ;
-  Vector<String> fMolName ;
 
   // row based
@@ -2558 +2555 @@
 
       // get necessary information
+      Vector<Double> restFreq ;
+      Vector<String> molName ;
+      Vector<String> fMolName ;
       ROScalarColumn<uInt> molIdCol( t1, "MOLECULE_ID" ) ;
       uInt molId = molIdCol( 0 ) ;
@@ -2568 +2568 @@
 
       // REST_FREQUENCY
-      *restfreqRF = restFreq ;
+      restfreqRF.define(restFreq);
 
       // TRANSITION
-      //*transitionRF = fMolName ;
       Vector<String> transition ;
       if ( fMolName.size() != 0 ) {
@@ -2583 +2582 @@
         transition = "" ;
       }
-      *transitionRF = transition ;
-
-      // SYSVEL 
+      transitionRF.define(transition);
+
+      // SYSVEL
       Vector<Double> sysvelArr( numFreq, srcVel ) ;
-      *sysvelRF = sysvelArr ;
+      sysvelRF.define(sysvelArr);
 
       //