Changeset 2117 for trunk/MagicSoft/Mars/mdata

Timestamp:

05/16/03 13:11:23 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataChain.cc (modified) (6 diffs)
• MDataChain.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -82 +82 @@
 //   randl(x)  returns gRandom->Landau(0, x)
 //
+//
+// Constants are implemented in ParseDataMember, namely:
+//   kPi:      TMath::Pi()
+//   kRad2Deg: 180/kPi
+//   kDeg2Rad: kPi/180
+//
+// You can also defined constants which are defined in TMath by:
+//   kLn10      for   static Double_t TMath::Ln10();
+//   kLogE      for   static Double_t TMath::LogE();
+//   kRadToDeg  for   static Double_t TMath::RadToDeg();
+//   kDegToRad  for   static Double_t TMath::DegToRad();
+// Remark: In older root versions only Pi() and E() are implemented in
+//         TMath.
+//
+//
 // REMARK:
 //         - All the random functions are returning 0 if gRandom==0
@@ -100 +115 @@
 
 #include <TRandom.h>
+#include <TMethodCall.h>
 
 #include "MLog.h"
@@ -126 +142 @@
 // --------------------------------------------------------------------------
 //
-//  Default constructor
-//
-MDataChain::MDataChain()
-    : fMember(NULL), fOperatorType(kENoop)
-{
-}
-
-// --------------------------------------------------------------------------
-//
 // Constructor taking a rule as an argument. For more details see
 // class description
 //
 MDataChain::MDataChain(const char *rule, const char *name, const char *title)
-    : fOperatorType(kENoop)
+    : fMember(NULL), fOperatorType(kENoop)
 {
     fName  = name  ? name  : "MDataChain";
     fTitle = title ? title : rule;
+
+    if (TString(rule).IsNull())
+        return;
 
     *fLog << inf << "Trying to resolve rule... " << flush;
@@ -259 +269 @@
 // --------------------------------------------------------------------------
 //
+// Here the names of data members are interpreted. This can be used to
+// check for constants.
+//
+MData *MDataChain::ParseDataMember(TString txt)
+{
+    //txt.ToLower();
+
+    if (txt=="kRad2Deg") return new MDataValue(kRad2Deg);
+    if (txt=="kDeg2Rad") return new MDataValue(1./kRad2Deg);
+
+    if (!txt.BeginsWith("k"))
+        return new MDataMember(txt.Data());
+
+    const TString name = txt(1, txt.Length());
+    TMethodCall call(TMath::Class(), name, "");
+    switch (call.ReturnType())
+    {
+    case TMethodCall::kLong:
+        Long_t l;
+        call.Execute(l);
+        return new MDataValue(l);
+    case TMethodCall::kDouble:
+        Double_t d;
+        call.Execute(d);
+        return new MDataValue(d);
+    default:
+        break;
+    }
+
+    return new MDataMember(txt.Data());
+}
+
+// --------------------------------------------------------------------------
+//
 // Core of the data chain. Here the chain is constructed out of the rule.
 //
@@ -418 +462 @@
             if ((txt.IsNull() || txt[0]!='(') && text[0]!='-' && text[0]!='+')
             {
-                newmember = new MDataMember(text.Data());
+                newmember = ParseDataMember(text.Data());
                 break;
             }
@@ -469 +513 @@
     if (!fMember)
     {
-        *fLog << warn << "MDataChain not valid." << endl;
+        //*fLog << warn << "MDataChain not valid." << endl;
         return 0;
     }

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -59 +59 @@
 
     MData *ParseString(TString txt, Int_t level);
+    MData *ParseDataMember(TString txt);
 
     MDataChain(const char *rule, OperatorType_t op);
 
 public:
-    MDataChain();
-    MDataChain(const char *rule, const char *name=NULL, const char *title=NULL);
+    MDataChain(const char *rule=NULL, const char *name=NULL, const char *title=NULL);
     ~MDataChain();