Changeset 6932 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/12/05 17:05:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJOptimize.cc (modified) (5 diffs)
• MJOptimize.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -109 +109 @@
 #include "MFilterList.h"
 #include "../mfilter/MFMagicCuts.h"
+#include "../mfilter/MFMagicCuts2.h"
 #include "MContinue.h"
 #include "MGeomCamMagic.h"
@@ -333 +334 @@
 void MJOptimize::AddPreCut(const char *rule)
 {
-    fPreCuts.Add(new MF(rule));
+    MFilter *f = new MF(rule);
+    f->SetBit(kCanDelete);
+    AddPreCut(f);
+}
+
+//------------------------------------------------------------------------
+//
+// Add a cut which is used to fill the matrix. If kCanDelete is set
+// MJOptimize takes the ownership.
+//
+void MJOptimize::AddPreCut(MFilter *f)
+{
+    fPreCuts.Add(f);
 }
 
@@ -823 +836 @@
     if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
         ((MFMagicCuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts2::Class()))
+        ((MFMagicCuts2*)filter)->InitMapping(&m);
 
     MReadTree read("Events");
@@ -898 +913 @@
     if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
         ((MFMagicCuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts2::Class()))
+        ((MFMagicCuts2*)filter)->InitMapping(&m);
 
     parlist.AddToList(&histon);
@@ -1025 +1042 @@
         return kFALSE;
 
+    hist.Print();
+
     TObjArray cont;
     cont.Add(&est);

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -101 +101 @@
     void AddFilter(const char *rule);
     void AddPreCut(const char *rule);
+    void AddPreCut(MFilter *f);
 
     // Steering of optimization