Changeset 7697 for trunk/MagicSoft/Mars/mjtrain/MJTrainRanForest.cc

Timestamp:

05/05/06 10:53:03 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjtrain/MJTrainRanForest.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjtrain/MJTrainRanForest.cc

@@ -35 +35 @@
 #include "MLogManip.h"
 
+#include "MF.h"
+#include "MParameterCalc.h"
+
 #include "MStatusDisplay.h"
-
-#include "MF.h"
 
 ClassImp(MJTrainRanForest);
@@ -45 +46 @@
 //------------------------------------------------------------------------
 //
-// Add a cut which is used to fill the matrix, eg "MMcEvt.fOartId<1.5"
-// (The rule is applied, nit inverted: The matrix is filled with
+// Add a cut which is used to fill the matrix, eg "MMcEvt.fPartId<1.5"
+// (The rule is applied, not inverted: The matrix is filled with
 // the events fullfilling the condition)
 //
@@ -52 +53 @@
 {
     MFilter *f = new MF(rule);
-    f->SetBit(kCanDelete);
-    AddCut(l, f);
+    f->SetBit(kCanDelete); //FIXME!!!! Why does not any other list delete it???
+    Add(l, f);
 }
 
 //------------------------------------------------------------------------
 //
-// Add a cut which is used to fill the matrix. If kCanDelete is set
+// Add an additional parameter (MParameterCalc), eg "0.5", "MWeight"
+// The default container name is "MWeight"
+//
+void MJTrainRanForest::AddPar(TList &l, const char *rule, const char *pname)
+{
+    TString tname(pname);
+    tname += "Calc";
+
+    MParameterCalc *par = new MParameterCalc(rule, tname);
+    par->SetNameParameter(pname);
+//    par->SetBit(kCanDelete);  //FIXME!!!! MTaskList is deleting it
+    Add(l, par);
+}
+
+//------------------------------------------------------------------------
+//
+// Add a task/cut which is used to fill the matrix. If kCanDelete is set
 // MJOptimize takes the ownership.
 //
-void MJTrainRanForest::AddCut(TList &l, MFilter *f)
+void MJTrainRanForest::Add(TList &l, MTask *f)
 {
     l.Add(f);