Changeset 8091 for trunk

Timestamp:

10/17/06 14:39:40 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• manalysis/MFiltercutsCalc.cc (modified) (6 diffs)
• manalysis/MFiltercutsCalc.h (modified) (1 diff)
• mdata/MDataPhrase.cc (modified) (1 diff)
• mfbase/FBaseLinkDef.h (modified) (1 diff)
• mfbase/MF.cc (modified) (8 diffs)
• mfbase/MF.h (modified) (2 diffs)
• mfbase/MFDataPhrase.cc (added)
• mfbase/MFDataPhrase.h (added)
• mfbase/Makefile (modified) (1 diff)
• mjoptim/MJOptimize.cc (modified) (3 diffs)
• mjtrain/MJTrainRanForest.cc (modified) (2 diffs)
• mtools/MTFillMatrix.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -44 +44 @@
    * mdata/MDataPhrase.cc:
      - improved output in case of failure
+
+   * manalysis/MFiltercutsCalc.[h,cc], mbase/MContinue.cc,
+     mjoptim/MJOptimize.cc, mjtrain/MJTrainRanForest.cc,
+     mtools/MTFillMatrix.cc:
+     - replaced MFDataChain by MFDataPhrase
+
+   * mfbase/FBaseLinkDef.h, mfbase/Makefile:
+     - added new class MFDataPhrase
+
+   * mfbase/MF.[h,cc]:
+     - replaced all the parsing stuff by the usage of MFDataPhrase
+
+   * mfbase/MFDataPhrase.[h,cc]:
+     - added
 
 

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
  *** <cvs>
 
-   - mtools: MRolke.[cc,h]: Modification of TRolke from root_v5.12.00b.
+   - general: MRolke.[cc,h]: Modification of TRolke from root_v5.12.00b.
      Class for calculation of confidence intervals (upper limits). 
      Use model 3 or 4 for upper limit calculation for MAGIC observations.
      Please read the class instruction of TRolke for more information.
 
-
-
- *** <cvs>
-
    - general: The programs now return 0xfe if the requested resource file
      doesn't exist.
@@ -17 +13 @@
    - general: Errors comming from root itself are now not output to
      stderr anymore but to our default (colored) log-stream.
+
+   - general: Changed the interface to TFormula such that now everything
+     is parsed by TFormula, which should allow to use phrases even
+     without paranthesis correctly parsed.
 
 

trunk/MagicSoft/Mars/manalysis/MFiltercutsCalc.cc

@@ -40 +40 @@
 #include "MLogManip.h"
 
-#include "MF.h"
-#include "MFDataChain.h"
+#include "MFDataPhrase.h"
 #include "MParList.h"
 #include "MFilterList.h"
@@ -98 +97 @@
 }
 
+/*
 // --------------------------------------------------------------------------
 //
 // There is MUCH space for speed improvement!
-// Add MF(lo<name && name<up) to the filter list (&&),
-// for more details see MF::MF(), too.
+// Add MFDataPhrase(lo<name && name<up) to the filter list (&&),
+// for more details see MFDataPhrase::MFDataPhrase(), too.
 //
 void MFiltercutsCalc::AddCut(const char *name, Double_t lo, Double_t up)
 {
-    AddToList(new MFDataChain(name, '>', lo));
-    AddToList(new MFDataChain(name, '<', up));
+    AddToList(new MFDataPhrase(Form("%s>%.15f", name, lo));
+    AddToList(new MFDataPhrase(name, '<', up));
 }
 
@@ -113 +113 @@
 //
 // There is MUCH space for speed improvement!
-// Add MF(fabs(name)<val) to the filter list (&&),
-// for more details see MF::MF(), too.
+// Add MFDataPhrase(fabs(name)<val) to the filter list (&&),
+// for more details see MFDataPhrase::MFDataPhrase(), too.
 //
 void MFiltercutsCalc::AddCut(const char *name, Double_t val)
@@ -120 +120 @@
     AddToList(new MFDataChain(Form("fabs(%s)", name), '<', val));
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -125 +126 @@
 // There is MUCH space for speed improvement!
 // Add 'cut' as MF(cut) to the filter list (&&),
-// for more details see MF::MF(), too.
+// for more details see MFDataPhrase::MFDataPhrase(), too.
 //
 void MFiltercutsCalc::AddCut(const char *cut)
 {
-    AddToList(new MF(cut));
+    AddToList(new MFDataPhrase(cut));
 }
 
@@ -135 +136 @@
 //
 // There is MUCH space for speed improvement!
-// Add cut to filter list (&&), for more details see MF::MF(), too.
+// Add cut to filter list (&&), for more details see MFDataPhrase::MFDataPhrase(), too.
 //
 void MFiltercutsCalc::AddCut(MFilter *f)

trunk/MagicSoft/Mars/manalysis/MFiltercutsCalc.h

@@ -36 +36 @@
     TString GetHadronnessName() const { return fHadronnessName; }
 
-    void AddCut(const char *name, Double_t lo, Double_t up);
-    void AddCut(const char *name, Double_t val);
+    //void AddCut(const char *name, Double_t lo, Double_t up);
+    //void AddCut(const char *name, Double_t val);
     void AddCut(const char *cut);
     void AddCut(MFilter *f);

trunk/MagicSoft/Mars/mdata/MDataPhrase.cc

@@ -352 +352 @@
     {
         *fLog << err << dbginf << "Syntax Error: TFormula::Compile failed..."<< endl;
-        *fLog << " > " << rule << endl;
-        *fLog << " > " << txt << endl;
+        *fLog << " Full Rule:   " << rule << endl;
+        *fLog << " Parsed Rule: " << txt << endl;
         Clear();
         return kFALSE;

trunk/MagicSoft/Mars/mfbase/FBaseLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MFDataChain+;
 #pragma link C++ class MFDataMember+;
+#pragma link C++ class MFDataPhrase+;
 #pragma link C++ class MFRealTimePeriod+;
 

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -88 +88 @@
 #include "MParList.h"
 
-#include "MFilterList.h"
-#include "MFDataChain.h"
-#include "MFDataMember.h"
+//#include "MFilterList.h"
+#include "MFDataPhrase.h"
+//#include "MFDataMember.h"
 
 #include "MLog.h"
@@ -123 +123 @@
 
     *fLog << inf << "Parsing filter rule... " << flush;
+    fF = new MFDataPhrase(text);
+    /*
     if (!(fF=ParseString(text, 1)))
     {
@@ -128 +130 @@
         return;
     }
-
+    */
     *fLog << inf << "found: ";
     fF->Print();
@@ -143 +145 @@
         delete fF;
 }
-
+/*
 // --------------------------------------------------------------------------
 //
@@ -348 +350 @@
     return filter0;
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -481 +484 @@
 
     /*
+     // It is assumed that each filter itself calls MFilter::ReadEnv
+     // to process the Inverted directive
      Bool_t rc = MFilter::ReadEnv(env, prefix, print);
      if (rc==kERROR)
-     return kERROR;
-    */
+        return kERROR;
+        */
     if (IsEnvDefined(env, prefix, "Condition", print))
     {
@@ -523 +528 @@
         SetAllowEmpty(kFALSE);
 
+        const Int_t fg = rule.First('>');
+        const Int_t fl = rule.First('<');
+
+        if (fg<0 && fl<0)
+        {
+            MFilter *f = (MFilter*)GetNewObject(rule, MFilter::Class());
+            if (!f)
+            {
+                *fLog << err << dbginf << "Syntax Error: '" << rule << "' is neither a MFilter nor conditional sign found." << endl;
+                return kERROR;
+            }
+            fF = f;
+        }
+        else
+            fF = new MFDataPhrase(rule);
+        /*
         if (!(fF=ParseString(rule, 1)))
         {
@@ -528 +549 @@
             return kERROR;
         }
-
+        */
         if (print)
         {

trunk/MagicSoft/Mars/mfbase/MF.h

@@ -23 +23 @@
     MFilter *fF;                     // Filter
     Bool_t fAllowEmpty;              // Not a Bit to be stored
-
+/*
     Int_t IsRule(TString &txt, TString &rule) const;
     Int_t IsVal(const TString &txt) const;
@@ -30 +30 @@
     MFilter *ParseRule(TString &txt, MFilter *filter0, Int_t level) const;
     MFilter *ParseString(TString txt, Int_t level);
-
+  */
     void StreamPrimitive(ostream &out) const;
 

trunk/MagicSoft/Mars/mfbase/Makefile

@@ -16 +16 @@
 
 SRCFILES = MF.cc \
+           MFDataPhrase.cc \
            MFilterList.cc \
            MFEventSelector.cc \

trunk/MagicSoft/Mars/mjoptim/MJOptimize.cc

@@ -113 +113 @@
 
 // filters
-#include "MF.h"
+#include "MFDataPhrase.h"
 #include "MFilterList.h"
 
@@ -319 +319 @@
 void MJOptimize::AddFilter(const char *rule)
 {
-    fFilter.Add(new MF(rule));
+    fFilter.Add(new MFDataPhrase(rule));
 }
 
@@ -330 +330 @@
 void MJOptimize::AddPreCut(const char *rule)
 {
-    MFilter *f = new MF(rule);
+    MFilter *f = new MFDataPhrase(rule);
     f->SetBit(kCanDelete);
     AddPreCut(f);

trunk/MagicSoft/Mars/mjtrain/MJTrainRanForest.cc

@@ -37 +37 @@
 #include "MLogManip.h"
 
-#include "MF.h"
+#include "MFDataPhrase.h"
 #include "MParameterCalc.h"
 
@@ -54 +54 @@
 void MJTrainRanForest::AddCut(TList &l, const char *rule)
 {
-    MFilter *f = new MF(rule);
+    MFilter *f = new MFDataPhrase(rule);
     f->SetBit(kCanDelete); //FIXME!!!! Why does not any other list delete it???
     Add(l, f);

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -98 +98 @@
 
 // filters
-#include "MF.h"
+#include "MFDataPhrase.h"
 #include "MFilterList.h"
 #include "MFEventSelector.h"
@@ -202 +202 @@
 void MTFillMatrix::AddPreCut(const char *rule)
 {
-    MFilter *f = new MF(rule);
+    MFilter *f = new MFDataPhrase(rule);
     f->SetBit(kCanDelete);
     AddPreCut(f);
@@ -369 +369 @@
     // entries in MTaskList
     tlist.AddToList(fReader);        // Read events
-    tlist.AddToList(fPreTasks);      // PreTasks
+    tlist.AddToList(fPreTasks, 0);   // PreTasks
     if (fPreCuts.GetEntries()>0)
         tlist.AddToList(&cont0);     // PreCuts
@@ -375 +375 @@
         tlist.AddToList(&cont);      // select a sample of events
     tlist.AddToList(&invsplit);      // process invsplit (which implicitly processes split)
-    tlist.AddToList(fPostTasks);     // PostTasks
+    tlist.AddToList(fPostTasks, 0);  // PostTasks
     if (fDestMatrix1)
         tlist.AddToList(&fill1);     // fill matrix 1