Changeset 1524 for trunk/MagicSoft/Mars/mdata

Timestamp:

09/16/02 10:10:17 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• DataLinkDef.h (modified) (1 diff)
• MDataChain.cc (modified) (7 diffs)
• MDataChain.h (modified) (1 diff)
• MDataElement.cc (added)
• MDataElement.h (added)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mdata/DataLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MData+;
 #pragma link C++ class MDataArray+;
+#pragma link C++ class MDataElement+;
 #pragma link C++ class MDataList+;
 #pragma link C++ class MDataValue+;

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -91 +91 @@
 #include "MDataValue.h"
 #include "MDataMember.h"
-#
+#include "MDataElement.h"
+
 ClassImp(MDataChain);
 
@@ -164 +165 @@
     for (int i=0; i<l; i++)
     {
-        if (!isalnum(txt[i]) && txt[i]!='.' &&
+        if (!isalnum(txt[i]) && txt[i]!='.' && /*txt[i]!='['&&txt[i]!=']'&&*/
             ((txt[i]!='-' && txt[i]!='+') || i!=0))
             return i;
@@ -172 +173 @@
 }
 
-Int_t MDataChain::GetBracket(TString txt)
+Int_t MDataChain::GetBracket(TString txt, char open, char close)
 {
     Int_t first=1;
     for (int cnt=0; first<txt.Length(); first++)
     {
-        if (txt[first]=='(')
+        if (txt[first]==open)
             cnt++;
-        if (txt[first]==')')
+        if (txt[first]==close)
             cnt--;
         if (cnt==-1)
@@ -197 +198 @@
 
     if (txt=="abs")   return kEAbs;
+    if (txt=="fabs")  return kEAbs;
     if (txt=="log")   return kELog;
     if (txt=="log10") return kELog10;
@@ -238 +240 @@
                 // Search for the corresponding bracket
                 //
-                Int_t first=GetBracket(txt);
+                Int_t first=GetBracket(txt, '(', ')');
 
                 if (first==txt.Length())
@@ -364 +366 @@
             txt = txt.Strip(TString::kBoth);
 
+            if (!txt.IsNull() && txt[0]=='[')
+            {
+                Int_t first = GetBracket(txt, '[', ']');
+                TString op  = txt(1, first-1);
+                txt.Remove(0, first+1);
+
+                newmember = new MDataElement(text, atoi(op));
+                break;
+            }
             if ((txt.IsNull() || txt[0]!='(') && text[0]!='-' && text[0]!='+')
             {
@@ -379 +390 @@
             }
 
-            Int_t first = GetBracket(txt);
+            Int_t first = GetBracket(txt, '(', ')');
             TString sub = op==kENegative || op==kEPositive ? text.Remove(0,1) + txt : txt(1, first-1);
             txt.Remove(0, first+1);
 
             newmember = new MDataChain(sub, op);
-
             if (!newmember->IsValid())
             {

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -46 +46 @@
 
     Int_t IsAlNum(TString txt);
-    Int_t GetBracket(TString txt);
+    Int_t GetBracket(TString txt, char open, char close);
 
     MData *ParseString(TString txt, Int_t level);

trunk/MagicSoft/Mars/mdata/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I../mbase
+INCLUDES = -I. -I../mbase -I../mhist
 
 # @code 
@@ -33 +33 @@
 SRCFILES = MData.cc \
            MDataArray.cc \
+           MDataElement.cc \
            MDataMember.cc \
            MDataValue.cc \