Changeset 8643 for trunk/MagicSoft/Mars/mjoptim

Timestamp:

07/19/07 19:59:27 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjoptim

Files:

• MJOptimize.cc (modified) (6 diffs)
• MJOptimize.h (modified) (6 diffs)
• MJOptimizeBase.cc (added)
• MJOptimizeBase.h (added)
• Makefile (modified) (1 diff)
• OptimLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjoptim/MJOptimize.cc

@@ -111 +111 @@
 #include "MMatrixLoop.h"
 #include "MFillH.h"
+#include "MParameterCalc.h"
+#include "MContinue.h"
 
 // filters
@@ -225 +227 @@
 }
 
-MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(0), fNameMinimizationValue("MinimizationValue")
+MJOptimize::MJOptimize() : /*fDebug(-1),*/ fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(0), fNameMinimizationValue("MinimizationValue")
 {
     fRules.SetOwner();
@@ -287 +289 @@
 }
 
-//------------------------------------------------------------------------
-//
-// Add a parameter used in your filters (see AddFilter) The parameter
-// index is returned,
-//
-//   Int_t idx = AddParameter("log10(MHillas.fSize)");
-//
-// The indices area starting with 0 always.
-//
-Int_t MJOptimize::AddParameter(const char *rule)
-{
-    fRules.Add(new TNamed(rule, ""));
-    return fRules.GetSize()-1;
-}
 
 //------------------------------------------------------------------------
@@ -319 +307 @@
 {
     fFilter.Add(new MFDataPhrase(rule));
-}
-
-//------------------------------------------------------------------------
-//
-// 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
-// the events fullfilling the condition)
-//
-void MJOptimize::AddPreCut(const char *rule)
-{
-    MFilter *f = new MFDataPhrase(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);
 }
 
@@ -739 +704 @@
     m->Print("cols");
 
-    //MParList parlist;
-
     //    MGeomCamMagic cam;
     //    parlist.AddToList(&cam);
 
-    MTaskList tlist;
-    parlist.Replace(&tlist);
-
-    MFillH fillh(m);
-
-    tlist.AddToList(&read);
-
+    // Setup filter and apply filter to filling of matrix
     MFilterList list;
     if (!list.AddToList(fPreCuts))
@@ -757 +714 @@
         SetupFilters(list);
     list.SetName("PreCuts");  // reset Name      set by SetupFilters
-    list.SetInverted(kFALSE); // reset inversion set by SetupFilters
-    fillh.SetFilter(&list);
-    tlist.AddToList(&list);
-
-    tlist.AddToList(&fillh);
+    list.SetInverted(kTRUE);  // reset inversion set by SetupFilters
+
+    MContinue cont(&list);
+
+    // Setup filling of matrix
+    MFillH fillh(m);
+
+    // Setup tasklist
+    MTaskList tlist;
+    parlist.Replace(&tlist);
+
+    // Create task list
+    tlist.AddToList(&read);        // read data
+    tlist.AddToList(fPreTasks);    // execute pre-filter tasks
+    tlist.AddToList(&cont);        // execute filters
+    tlist.AddToList(fPostTasks);   // execute post-filter tasks
+    tlist.AddToList(&fillh);       // Fill matrix
 
     tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);

trunk/MagicSoft/Mars/mjoptim/MJOptimize.h

@@ -2 +2 @@
 #define MARS_MJOptimize
 
-#ifndef MARS_MJob
-#include "MJob.h"
+#ifndef MARS_MJOptimizeBase
+#include "MJOptimizeBase.h"
 #endif
 
@@ -14 +14 @@
 class MAlphaFitter;
 
+class MTask;
 class MEvtLoop;
 class MParList;
@@ -26 +27 @@
 class MReadTree;
 
-class MJOptimize : public MJob
+class MJOptimize : public MJOptimizeBase
 {
 public:
@@ -41 +42 @@
 
 private:
-    Int_t fDebug;     // -1 no output, 0 MJOptimize output, 1 PrintStatistics output
     Int_t fNumEvents;
 
-    TList fRules;
     TList fFilter;
 
@@ -78 +77 @@
 
 protected:
-    TList   fPreCuts;
-
     TList   fNamesOn;
     TList   fNamesOff;
@@ -100 +97 @@
 
     // Interface for filter cuts
-    Int_t AddParameter(const char *rule);
     void AddFilter(const char *rule);
-    void AddPreCut(const char *rule);
-    void AddPreCut(MFilter *f);
 
     // Steering of optimization

trunk/MagicSoft/Mars/mjoptim/Makefile

@@ -29 +29 @@
 # mgeom:     MGeomCam
 
-SRCFILES = MJOptimize.cc \
+SRCFILES = MJOptimizeBase.cc \
+           MJOptimize.cc \
            MJOptimizeCuts.cc \
            MJOptimizeDisp.cc \

trunk/MagicSoft/Mars/mjoptim/OptimLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MJOptimize+;
+#pragma link C++ class MJOptimizeBase+;
 #pragma link C++ class MJOptimizeCuts+;
 #pragma link C++ class MJOptimizeDisp+;