Changeset 8282 for trunk

Timestamp:

02/01/07 12:28:19 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (2 diffs)
• mjobs/MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -33 +33 @@
      - added option to use median/dev instead of mean/rms
      - switched Grid on
+
+   * mjobs/MSequence.cc, mjobs/MDataSet.cc:
+     - small improvements to splitting number rows
+     - handle possible tabs correctly
 
 

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -112 +112 @@
 
     data.Set(0);
-    runs = runs.Strip(TString::kTrailing);
+
+    runs.ReplaceAll("\t", " ");
+    runs = runs.Strip(TString::kBoth);
 
     while (!runs.IsNull())
@@ -120 +122 @@
         if (num.IsNull())
         {
-            *fLog << warn << "WARNING - Sequence is NaN (not a number): " << runs << endl;
+            *fLog << warn << "WARNING - Sequence is NaN (not a number): '" << runs << "'" << endl;
             break;
         }

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -164 +164 @@
 
     data.Set(0);
-    runs = runs.Strip(TString::kTrailing);
+
+    runs.ReplaceAll("\t", " ");
+    runs = runs.Strip(TString::kBoth);
 
     while (!runs.IsNull())
@@ -172 +174 @@
         if (num.IsNull())
         {
-            *fLog << warn << "WARNING - Run is NaN (not a number): " << runs << endl;
+            *fLog << warn << "WARNING - Run is NaN (not a number): '" << runs << "'" << endl;
             break;
         }