Changeset 3666 for trunk/MagicSoft/Mars/mdata

Timestamp:

04/06/04 13:41:56 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• DataLinkDef.h (modified) (1 diff)
• MDataChain.cc (modified) (9 diffs)
• MDataChain.h (modified) (1 diff)
• MDataFormula.cc (added)
• MDataFormula.h (added)
• MDataList.cc (modified) (6 diffs)
• MDataList.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/DataLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MDataMember+;
 #pragma link C++ class MDataChain+;
+#pragma link C++ class MDataFormula+;
 
 #endif

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -25 +25 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-//   MDataChain
+// MDataChain
+// ==========
 //
 // With this chain you can concatenate simple mathematical operations on
 // members of mars containers.
+//
+//
+// Rules
+// -----
 //
 // In the constructor you can give rule, like
@@ -36 +41 @@
 // in the containers. The result will be fDist divided by fLength.
 //
+// In case you want to access a data-member which is a data member object
+// you can acces it with (Remark: it must derive from MParContainer):
+//   "MCameraLV.fPowerSupplyA.fVoltagePos5V"
+//
 // You can also use brackets:
 //   "HillasDource.fDist / (MHillas.fLength + MHillas.fWidth)"
 //
-// The allowed operations are: +, -, *, /, %
+//
+// Operators
+// ---------
+//
+// The allowed operations are: +, -, *, /, %, ^
 //
 // While a%b returns the floating point reminder of a/b.
+// While a^b returns a to the power of b
 //
 // Warning: There is no priority rule build in. So better use brackets
@@ -98 +112 @@
 // inf is the symbol for an infinite number.
 //
+//
+// Constants
+// ---------
+//
 // Constants are implemented in ParseDataMember, namely:
-//   kPi:      TMath::Pi()
-//   kRad2Deg: 180/kPi
-//   kDeg2Rad: kPi/180
+//   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.
-//
+//   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.
+//
+//
+// Variable Parameters
+// ------------------------
 // If you want to use variables, eg for fits you can use [0], [1], ...
 // These values are initialized with 0 and set by calling
 // SetVariables().
 //
+//
+// Multi-argument functions
+// ------------------------
+// You can use multi-argument functions, too. The access is implemented
+// via TFormula, which slows down thing a lot. If you can avoid usage
+// of such expression you accelerate the access a lot. Example:
+//   "TMath::Hypot(MHillas.fMeanX, MHillas.MeanY)"
+//   "pow(MHillas.fMeanX*MHillas.MeanY, -1.2)"
+// It should be possible to use all functions which are accessible
+// via the root-dictionary.
+//
+//
 // REMARK:
-//         - All the random functions are returning 0 if gRandom==0
-//         - You may get better results if you are using a TRandom3
-//
-// FIXME: The possibility to use other objects inheriting from MData
-//        is missing.
-//        Maybe we can use gInterpreter->Calc("") for this.
-//        gROOT->ProcessLineFast("line");
+//  - All the random functions are returning 0 if gRandom==0
+//  - You may get better results if you are using a TRandom3
+//
+// To Do:
+//  - The possibility to use other objects inheriting from MData
+//    is missing.
+//  - By automatic pre-adding brackets to the rule it would be possible
+//    to implement priorities for operators.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -141 +177 @@
 #include "MDataValue.h"
 #include "MDataMember.h"
+#include "MDataFormula.h"
 #include "MDataElement.h"
 
@@ -222 +259 @@
     for (int i=0; i<l; i++)
     {
-        if (!isalnum(txt[i]) && txt[i]!='.' && txt[i]!=';' && 
+        if (!isalnum(txt[i]) && txt[i]!='.' && txt[i]!=':' && txt[i]!=';' &&
             /*txt[i]!='['&&txt[i]!=']'&&*/
             ((txt[i]!='-' && txt[i]!='+') || i!=0))
@@ -394 +431 @@
         case '/':
         case '%':
+        case '^':
             if (member0)
             {
@@ -507 +545 @@
 
             OperatorType_t op = ParseOperator(text);
+
+            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);
+
             if (op==kENoop)
             {
+                newmember = new MDataFormula(Form("%s(%s)", (const char*)text, (const char*)sub));
+                if (newmember->IsValid())
+                    break;
+
                 *fLog << err << dbginf << "Syntax Error: Operator '" << text << "' unknown." << endl;
                 if (member0)
@@ -514 +561 @@
                 return NULL;
             }
-
-            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);
@@ -604 +647 @@
     return 0;
 }
-
-    /*
-void MDataChain::Print(Option_t *opt) const
-{
-    *fLog << GetRule() << flush;
-    Bool_t bracket = fOperatorType!=kENoop && !fMember->InheritsFrom(MDataList::Class());
-
-    switch (fOperatorType)
-    {
-    case kEAbs:      *fLog << "abs"   << flush; break;
-    case kELog:      *fLog << "log"   << flush; break;
-    case kELog10:    *fLog << "log10" << flush; break;
-    case kESin:      *fLog << "sin"   << flush; break;
-    case kECos:      *fLog << "cos"   << flush; break;
-    case kETan:      *fLog << "tan"   << flush; break;
-    case kESinH:     *fLog << "sinh"  << flush; break;
-    case kECosH:     *fLog << "cosh"  << flush; break;
-    case kETanH:     *fLog << "tanh"  << flush; break;
-    case kEASin:     *fLog << "asin"  << flush; break;
-    case kEACos:     *fLog << "acos"  << flush; break;
-    case kEATan:     *fLog << "atan"  << flush; break;
-    case kESqrt:     *fLog << "sqrt"  << flush; break;
-    case kEExp:      *fLog << "exp"   << flush; break;
-    case kEPow10:    *fLog << "pow10" << flush; break;
-    case kESgn:      *fLog << "sgn"   << flush; break;
-    case kENegative: *fLog << "-" << flush; break;
-    case kEPositive: *fLog << "+" << flush; break;
-    case kENoop:
-        break;
-    }
-
-    if (bracket)
-        *fLog << "(" << flush;
-
-    fMember->Print();
-
-    if (bracket)
-        *fLog << ")" << flush;
-        }
-        */
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -17 +17 @@
 {
 private:
-    MData *fMember; // Filter
+    MData    *fMember; // Filter
 
     // PLEASE, always add new enums to the end of the enumeration,

trunk/MagicSoft/Mars/mdata/MDataList.cc

@@ -79 +79 @@
         fSign = kEModul;
         return;
+    case '^':
+        fSign = kEPow;
+        return;
     default:
         fSign = kENone;
@@ -142 +145 @@
         while ((member=(MData*)Next()))
         {
-            Double_t d = member->GetValue();
+            const Double_t d = member->GetValue();
             if (d==0)
             {
-                *fLog << warn << "Warning: Division by zero (" << member->GetName() << ")" << endl;
+                *fLog << warn << "Warning: Division by zero: " << member->GetRule() << endl;
                 return 0;
             }
@@ -155 +158 @@
         while ((member=(MData*)Next()))
         {
-            Double_t d = member->GetValue();
+            const Double_t d = member->GetValue();
             if (d==0)
             {
-                *fLog << warn << "Warning: Modulo division by zero (" << member->GetName() << ")" << endl;
+                *fLog << warn << "Warning: Modulo division by zero: " << member->GetRule() << endl;
                 return 0;
             }
@@ -164 +167 @@
         }
         break;
+    case kEPow:
+        while ((member=(MData*)Next()))
+            val = pow(val, member->GetValue());
+        break;
     }
     return val;
@@ -185 +192 @@
 }
 
+Bool_t MDataList::IsValid() const
+{
+    TIter Next(&fMembers);
+
+    MData *data = NULL;
+    while ((data=(MData*)Next()))
+        if (!data->IsValid())
+            return kFALSE;
+
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
 // If you want to add a new member to the list call this function with the
-// pointer to the member to be added. 
+// pointer to the member to be added.
 //
 Bool_t MDataList::AddToList(MData *member)
@@ -335 +354 @@
             str += "%";
             break;
+
+        case kEPow:
+            str += "^";
+            break;
         }
 

trunk/MagicSoft/Mars/mdata/MDataList.h

@@ -23 +23 @@
     TOrdCollection fMembers;    // Container for the filters
 
-    typedef enum { kENone, kEPlus, kEMinus, kEMult, kEDiv, kEModul } SignType_t;
+    typedef enum { kENone, kEPlus, kEMinus, kEMult, kEDiv, kEModul, kEPow } SignType_t;
     SignType_t fSign;
 
@@ -41 +41 @@
     void SetOwner(Bool_t enable=kTRUE) { enable ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
-    Bool_t IsValid() const { return fMembers.GetSize() ? kTRUE : kFALSE; }
+    Bool_t IsValid() const;// { return fMembers.GetSize() ? kTRUE : kFALSE; }
     Bool_t IsReadyToSave() const;
 

trunk/MagicSoft/Mars/mdata/Makefile

@@ -37 +37 @@
            MDataValue.cc \
            MDataList.cc \
-           MDataChain.cc
+           MDataChain.cc \
+           MDataFormula.cc
 
 SRCS    = $(SRCFILES)