Changeset 2221 for trunk/src

Timestamp:

07/13/11 18:36:34 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No

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...

Default flux unit changed from "" to "K".

File:

• trunk/src/MSFiller.cpp (modified) (3 diffs)

trunk/src/MSFiller.cpp

@@ -712 +712 @@
                   if ( dataColKeys.isDefined( "UNIT" ) )
                     sdh.fluxunit = dataColKeys.asString( "UNIT" ) ;
+                  else if ( dataColKeys.isDefined( "QuantumUnits" ) ) 
+                    sdh.fluxunit = dataColKeys.asString( "QuantumUnits" ) ;
                 } 
               }
@@ -752 +754 @@
                   if ( dataColKeys.isDefined( "UNIT" ) )
                     sdh.fluxunit = dataColKeys.asString( "UNIT" ) ;
+                  else if ( dataColKeys.isDefined( "QuantumUnits" ) ) 
+                    sdh.fluxunit = dataColKeys.asString( "QuantumUnits" ) ;
                 } 
               }
@@ -977 +981 @@
     sdh.freqref = "SOURCE";
   }
+  //if ( sdh.fluxunit == "" )
+  if ( sdh.fluxunit == "" || sdh.fluxunit == "CNTS" )
+    sdh.fluxunit = "K" ;
   table_->setHeader( sdh ) ;