Changeset 5692 for trunk/MagicSoft/Mars/mdata

Timestamp:

01/03/05 12:02:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataArray.cc (modified) (3 diffs)
• MDataArray.h (modified) (1 diff)
• MDataChain.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mdata/MDataArray.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  08/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -86 +86 @@
 // --------------------------------------------------------------------------
 //
+// Try to find a MData which has the same rule (GetRule()).
+// Be carefull: This may already fail if the rule is A*B and you are
+// searching for B*A - FIXME: A more intelligent comaparton (based on
+// IsEqual()) should be developed.
+//
+// Returns the index in the array, -1 if rule was not found.
+//
+Int_t MDataArray::FindRule(const char *rule) const
+{
+    const MDataChain data(rule);
+    if (!data.IsValid())
+        return -1;
+
+    const TString r(data.GetRule());
+
+    TIter Next(&fList);
+    const MData *d = NULL;
+    while ((d=(MData*)Next()))
+        if (d->GetRule()==r)
+            return fList.IndexOf(d);
+
+    return -1;
+}
+
+// --------------------------------------------------------------------------
+//
 // Return the i-th entry
 //
@@ -131 +157 @@
     Int_t n=0;
 
-    TIter Next(&fList);
-    MData *data = NULL;
-    while ((data=(MData*)Next()))
-    {
-        *fLog << all << " " << fName << "[" << setw(3) << n++ << "] = " << flush;
+    const Int_t w = 1+(Int_t)TMath::Log10(fList.GetEntries());
+
+    TIter Next(&fList);
+    MData *data = NULL;
+    while ((data=(MData*)Next()))
+    {
+        *fLog << all << " " << fName << "[" << setw(w) << n++ << "] = " << flush;
         data->Print();
         *fLog << endl;

trunk/MagicSoft/Mars/mdata/MDataArray.h

@@ -32 +32 @@
     void AddEntry(MData *data);
 
+    Int_t FindRule(const char *rule) const;
+
     MData &operator[](Int_t i) const;
     Double_t operator()(Int_t i) const;

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -211 +211 @@
         return;
 
-    *fLog << inf << "Trying to resolve rule... " << flush;
+    *fLog << inf << "Parsing rule... " << flush;
     if (!(fMember=ParseString(rule, 1)))
     {