Changeset 8704 for trunk/MagicSoft/Mars/mdata

Timestamp:

08/24/07 09:37:31 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataMember.cc (modified) (2 diffs)
• MDataPhrase.cc (modified) (2 diffs)
• MDataPhrase.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -97 +97 @@
 Double_t MDataMember::GetValue() const
 {
+    if (!fObject)
+    {
+        *fLog << err << "ERROR - MDataMember::GetValue: fObject not initialized ";
+        *fLog << "(not PreProcessed)... returning 0." << endl;
+        return 0;
+    }
+
     if (!fCall)
     {
@@ -138 +145 @@
     // the original statement "if (fCall)" is replaced by the statement
     if (fCall && !fObject)
-            return kTRUE;
+        return kTRUE;
 
     TString cname(fDataMember);

trunk/MagicSoft/Mars/mdata/MDataPhrase.cc

@@ -469 +469 @@
 //  Evaluates and returns the result of the member list.
 //
-Double_t MDataPhrase::GetValue() const
+Double_t MDataPhrase::Eval(const Double_t *x) const
 {
     const Int_t n = fMembers.GetEntriesFast();
@@ -490 +490 @@
 
     // Evaluate function
-    return fFormula->EvalPar(0, arr);
+    return fFormula->EvalPar(x, arr);
 }
 

trunk/MagicSoft/Mars/mdata/MDataPhrase.h

@@ -46 +46 @@
     Bool_t   IsValid() const;
     Bool_t   HasValidRule() const { return fFormula ? kTRUE : kFALSE; }
-    Double_t GetValue() const;
+    Double_t GetValue() const { return Eval((Double_t*)NULL); }
+    Double_t Eval(const Double_t *x) const;
+    Double_t Eval(Double_t x, Double_t y=0, Double_t z=0, Double_t t=0) const
+    {
+        const Double_t xx[4] = { x, y, z, t };
+        return Eval(xx);
+    }
     TString  GetRule() const;
     TString  GetRuleRaw() const;