Changeset 1661 for trunk/MagicSoft

Timestamp:

11/21/02 15:04:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mbase/MTask.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (4 diffs)
• mbase/MTaskList.h (modified) (2 diffs)
• mdata/MDataChain.cc (modified) (4 diffs)
• mdata/MDataChain.h (modified) (1 diff)
• mfilter/FilterLinkDef.h (modified) (1 diff)
• mfilter/MF.cc (modified) (7 diffs)
• mfilter/MF.h (modified) (1 diff)
• mfilter/MFDataChain.cc (added)
• mfilter/MFDataChain.h (added)
• mfilter/MFDataMember.cc (modified) (1 diff)
• mfilter/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 @@
-                                                                  -*-*- END -*-*-
+                       #                                           -*-*- END -*-*-
  2002/11/21: Thomas Bretz
 
@@ -5 +5 @@
      - introduced kERROR to stop an eventloop with an error
 
+   * mbase/MTask.h:
+     - made SetFilter virtual
+
+   * mbase/MTaskList.[h,cc]:
+     - added new member function AddToListBefore/After
+     - split the code of the AddToList function into CheckAddToList
+
    * manalysis/MMultiDimDistCalc.cc:
      - introduced usage of kERROR in case the matrix is not posdef.
@@ -10 +17 @@
    * macros/collarea.C:
      - some simplifications
+
+   * mdata/MDataChain.[h,cc]:
+     - added 'sqr'
+
+   * mfilter/MF.[h,cc]:
+     - added support for MFDataChain
+
+   * mfilter/MFDataChain.[h,cc]:
+     - added
+
+   * mfilter/Makefile, mfilter/FilterLinkDef.h:
+     - added MFDataChain
 
 

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -65 +65 @@
     virtual ~MTask();
 
-    void SetFilter(MFilter *filter) { fFilter=filter; }
+    virtual void SetFilter(MFilter *filter) { fFilter=filter; }
     const MFilter *GetFilter() const      { return fFilter; }
+    MFilter *GetFilter()  { return fFilter; } // for MContinue only
     virtual void PrintStatistics(const Int_t lvl=0, Bool_t title=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -135 +135 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// schedule task for execution, whether as first task, or after
-// 'where'. 'tType' is the event type which should be processed
-//
-Bool_t MTaskList::AddToList(MTask *task, const char *type, MTask *where)
-{
-    // FIXME: We agreed to put the task into list in an ordered way.
-
+Bool_t MTaskList::CheckAddToList(MTask *task, const char *type, const MTask *where) const
+{
     //
     // Sanity check
@@ -182 +174 @@
     }
 
-    if (where)
-    {
-        if (!fTasks->FindObject(where))
-        {
-            *fLog << err << dbginf << "Error: Cannot find task after which the new task should be scheduled!" << endl;
-            return kFALSE;
-        }
-    }
-
-    *fLog << inf << "Adding " << name << " to " << GetName() << " for " << type << "... " << flush;
-
+    if (!where)
+        return kTRUE;
+
+    if (fTasks->FindObject(where))
+        return kTRUE;
+
+    *fLog << err << dbginf << "Error: Cannot find task after which the new task should be scheduled!" << endl;
+    return kFALSE;
+}
+
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, before 'where'.
+// 'type' is the event type which should be processed
+//
+Bool_t MTaskList::AddToListBefore(MTask *task, const MTask *where, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+    if (!CheckAddToList(task, type, where))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
+    task->SetStreamId(type);
+    fTasks->AddBefore((TObject*)where, task);
+    *fLog << "Done." << endl;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, after 'where'.
+// 'type' is the event type which should be processed
+//
+Bool_t MTaskList::AddToListAfter(MTask *task, const MTask *where, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+
+    if (!CheckAddToList(task, type, where))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
+    task->SetStreamId(type);
+    fTasks->AddAfter((TObject*)where, task);
+    *fLog << "Done." << endl;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, 'type' is the event type which should
+// be processed
+//
+Bool_t MTaskList::AddToList(MTask *task, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+
+    if (!CheckAddToList(task, type))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
     task->SetStreamId(type);
     fTasks->Add(task);
-
     *fLog << "Done." << endl;
 
@@ -325 +368 @@
         *fLog << all << task->GetName() << "... " << flush;
 
-        if (CheckClassForProcess(task->IsA()))
-            fTasksProcess.Add(task);
-
         //
         // PreProcess the task and check for it's return value.
@@ -350 +390 @@
 
     *fLog << all << endl;
+
+    Next.Reset();
+
+    //
+    // loop over all tasks for preproccesing
+    //
+    while ((task=(MTask*)Next()))
+        if (CheckClassForProcess(task->IsA()))
+            fTasksProcess.Add(task);
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -35 +35 @@
     void StreamPrimitive(ofstream &out) const;
 
+    Bool_t CheckAddToList(MTask *task, const char *tType, const MTask *where=NULL) const;
+
 public:
     MTaskList(const char *name=NULL, const char *title=NULL);
@@ -43 +45 @@
     void SetLogStream(MLog *log);
 
-    Bool_t AddToList(MTask *task, const char *tType="All", MTask *where = NULL);
+    Bool_t AddToListBefore(MTask *task, const MTask *where, const char *tType="All");
+    Bool_t AddToListAfter(MTask *task, const MTask *where, const char *tType="All");
+    Bool_t AddToList(MTask *task, const char *tType="All");
 
     TObject *FindObject(const char *name) const;

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -69 +69 @@
 //   atan(x)   arc tangent (inverse tangent) of x
 //   sqrt(x)   square root of x
+//   sqr(x)    square of x
 //   abs(x)    absolute value of x, |x|
 //   floor(x)  round down to the nearest integer (floor(9.9)=9)
@@ -225 +226 @@
     if (txt=="atan")  return kEATan;
     if (txt=="sqrt")  return kESqrt;
+    if (txt=="sqr")   return kESqr;
     if (txt=="exp")   return kEExp;
     if (txt=="pow10") return kEPow10;
@@ -468 +470 @@
     case kEATan:     return atan(val);
     case kESqrt:     return sqrt(val);
+    case kESqr:      return val*val;
     case kEExp:      return exp(val);
     case kEPow10:    return pow(10, val);
@@ -551 +554 @@
     case kEATan:     str += "atan" ; break;
     case kESqrt:     str += "sqrt" ; break;
+    case kESqr:      str += "sqr"  ; break;
     case kEExp:      str += "exp"  ; break;
     case kEPow10:    str += "pow10"; break;

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -34 +34 @@
         kEATan,
         kESqrt,
+        kESqr,
         kEPow10,
         kEExp,

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MFTriggerLvl1+;
 #pragma link C++ class MFParticleId+;
+#pragma link C++ class MFDataChain+;
 #pragma link C++ class MFDataMember+;
 

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -44 +44 @@
 //   "MHillas.fSize>200 || (MHillas.fWidth<0.5 && MHillas.fLength<0.6)"
 //
+// If you want to use mathematic expressions (as defined in MDataChain)
+// you must encapsulate it in {}-Brackets, eg:
+//   "{log10(MHillas.fSize)}>3"
+//
 // The allowed logigal conditionals are:
 //   &&: logical and
@@ -53 +57 @@
 // are allowed.
 //
+//
 // Warning: There is no priority rule build in. So better use brackets
 //   to get correct results. The rule is parsed/evaluated from the left
@@ -80 +85 @@
 
 #include "MFilterList.h"
+#include "MFDataChain.h"
 #include "MFDataMember.h"
 
@@ -139 +145 @@
 // in the given string
 //
-Int_t MF::IsAlNum(TString txt)
+Int_t MF::IsAlNum(TString txt) const
 {
     int l = txt.Length();
@@ -149 +155 @@
 }
 
+MFilter *MF::ParseRule(TString &txt, MFilter *filter0) const
+{
+    TString text;
+
+    Bool_t isrule = kFALSE;
+
+    if (txt[0]=='{')
+    {
+        //
+        // Search for the corresponding bracket
+        //
+        Int_t first=1;
+        for (int cnt=0; first<txt.Length(); first++)
+        {
+            if (txt[first]=='{')
+                cnt++;
+            if (txt[first]=='}')
+                cnt--;
+
+            if (cnt==-1)
+                break;
+        }
+
+        if (first==txt.Length())
+        {
+            *fLog << err << dbginf << "Syntax Error: '}' missing." << endl;
+            return NULL;
+        }
+
+        //
+        // Make a copy of the 'interieur' and delete the substringä
+        // including the brackets
+        //
+        TString sub = txt(1, first-1);
+        txt.Remove(0, first+1);
+
+        text=sub;
+        isrule = kTRUE;
+    }
+    else
+    {
+        int i = IsAlNum(txt);
+
+        if (i==0)
+        {
+            *fLog << err << dbginf << "Syntax Error: Name of data member missing in '" << txt << "'" << endl;
+            return NULL;
+        }
+
+        text = txt(0, i);
+
+        txt.Remove(0, i);
+    }
+
+    txt = txt.Strip(TString::kBoth);
+
+    if (txt.IsNull())
+    {
+        *fLog << err << dbginf << "Syntax Error: No conditional in '" << text << "'" << endl;
+        return NULL;
+    }
+
+    char c;
+    switch (txt[0])
+    {
+    case '>':
+    case '<':
+        c = txt[0];
+        txt.Remove(0, 1);
+        break;
+
+    default:
+        *fLog << err << dbginf << "Syntax Error: Conditional '" << txt[0] << "' unknown." << endl;
+        return NULL;
+    }
+
+    char *end;
+    Double_t num = strtod(txt.Data(), &end);
+    if (!end || txt.Data()==end)
+    {
+        *fLog << err << dbginf << "Error trying to convert '" << txt << "' to value." << endl;
+        return NULL;
+    }
+
+    txt.Remove(0, end-txt.Data());
+
+    MFilter *newfilter;
+    if (isrule)
+        newfilter = new MFDataChain(text.Data(), c, num);
+    else
+        newfilter = new MFDataMember(text.Data(), c, num);
+
+    newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+
+    return newfilter;
+}
 // --------------------------------------------------------------------------
 //
@@ -222 +324 @@
             return NULL;
 
+
         case '&':
         case '|':
@@ -264 +367 @@
 
         default:
-            int i = IsAlNum(txt);
-
-            if (i==0)
+            newfilter = ParseRule(txt, filter0);
+            if (!newfilter)
             {
-                *fLog << err << dbginf << "Syntax Error: Name of data member missing in '" << txt << "'" << endl;
                 if (filter0)
                     delete filter0;
                 return NULL;
             }
-
-            TString text = txt(0, i);
-
-            txt.Remove(0, i);
-            txt = txt.Strip(TString::kBoth);
-
-            if (txt.IsNull())
-            {
-                *fLog << err << dbginf << "Syntax Error: No conditional in '" << text << "'" << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            char c;
-            switch (txt[0])
-            {
-            case '>':
-            case '<':
-                c = txt[0];
-                txt.Remove(0, 1);
-                break;
-
-            default:
-                *fLog << err << dbginf << "Syntax Error: Conditional '" << txt[0] << "' unknown." << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            char *end;
-            Double_t num = strtod(txt.Data(), &end);
-            if (!end || txt.Data()==end)
-            {
-                *fLog << err << dbginf << "Error trying to convert '" << txt << "' to value." << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            txt.Remove(0, end-txt.Data());
-
-            newfilter = new MFDataMember(text.Data(), c, num);
-            newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
         }
 

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -23 +23 @@
     MFilter *fFilter; // Filter
 
-    Int_t IsAlNum(TString txt);
+    Int_t IsAlNum(TString txt) const;
 
+    MFilter *ParseRule(TString &txt, MFilter *filter0) const;
     MFilter *ParseString(TString txt, Int_t level);
 

trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@astro.uni-wueruburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -35 +35 @@
            MFilterList.cc \
            MFEventSelector.cc \
+           MFDataChain.cc \
            MFDataMember.cc \
            MFParticleId.cc \