Changeset 6831

Timestamp:

03/16/05 14:00:04 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mdata/MDataChain.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
      - removed obsolete flag for ModifiedExtractWin
 
+   * mdata/MDataChain.cc:
+     - fixe to allow sign after e (eg. 1e-3, 1e+5 instead of 1e3, 1e5)
 
    * mcalib/MCalibColorSet.cc, mcalib/MCalibrationChargeCalc.cc,

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -399 +399 @@
 void MDataChain::AddParenthesis(TString &test, const TString op) const
 {
+    // Signiture of an exponential number 1e12
+    static const TRegexp rexp("[.0123456789]e[+-][0123456789]");
+
     const TString low = op(1, op.Length());
     if (low.Length()==0)
@@ -425 +428 @@
             if (cnt>0 || low.First(check[i])<0)
                 continue;
+
+            // Check if operator belongs to an exponential number
+            const TString sub(check(i-2, 4));
+            if (!sub(rexp).IsNull())
+                continue;
             break;
         }
@@ -437 +445 @@
                 cnt--;
             if (cnt>0 || low.First(check[j])<0)
+                continue;
+
+            // Check if operator belongs to an exponential number
+            const TString sub(check(j-2, 4));
+            if (!sub(rexp).IsNull())
                 continue;
             break;