Changeset 8091 for trunk/MagicSoft/Mars/manalysis

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MFiltercutsCalc.cc (modified) (6 diffs)
• MFiltercutsCalc.h (modified) (1 diff)

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);