Changeset 8644 for trunk/MagicSoft/Mars/mjoptim

Timestamp:

07/24/07 14:36:39 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjoptim

Files:

• MJOptimize.cc (modified) (2 diffs)
• MJOptimizeCuts.cc (modified) (4 diffs)
• MJOptimizeDisp.cc (modified) (2 diffs)
• MJOptimizeEnergy.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjoptim/MJOptimize.cc

@@ -647 +647 @@
 
     // Setup eventloop
-    MEvtLoop evtloop;
+    MEvtLoop evtloop(fTitle);
     evtloop.SetParList(&parlist);
     evtloop.SetDisplay(fDisplay); // set display for evtloop and all childs
@@ -734 +734 @@
     tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);
 
-    MEvtLoop fillloop;
+    MEvtLoop fillloop(fTitle);
     fillloop.SetParList(&parlist);
     fillloop.SetDisplay(fDisplay);

trunk/MagicSoft/Mars/mjoptim/MJOptimizeCuts.cc

@@ -85 +85 @@
 #include "MLog.h"
 #include "MLogManip.h"
+#include "MStatusDisplay.h"
 
 // Eventloop
@@ -138 +139 @@
 Bool_t MJOptimizeCuts::RunOnOffCore(MHAlpha &histon, MHAlpha &histof, const char *fname, MFilter *filter, MAlphaFitter *fit, const char *tree)
 {
+    SetTitle(Form("OptimizeCuts: %s", fname));
+
+    if (fDisplay)
+        fDisplay->SetTitle(fTitle);
+
     fLog->Separator("Preparing On/Off-optimization");
 
@@ -162 +168 @@
     histof.InitMapping(&m, 1);
 
-    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
-        ((MFMagicCuts*)filter)->InitMapping(&m);
+    if (filter)
+    {
+        if (filter->InheritsFrom(MFMagicCuts::Class()))
+            ((MFMagicCuts*)filter)->InitMapping(&m);
+        else
+        {
+            *fLog << err << "ERROR - Currently only MFMagicCuts is supported." << endl;
+            return kFALSE;
+        }
+    }
 
     parlist.AddToList(&histon);
@@ -249 +263 @@
 Bool_t MJOptimizeCuts::RunOnCore(MHAlpha &hist, const char *fname, MFilter *filter, MAlphaFitter *fit)
 {
+    SetTitle(Form("OptimizeCuts: %s", fname));
+
+    if (fDisplay)
+        fDisplay->SetTitle(fTitle);
+
     fLog->Separator("Preparing On-only-optimization");
 

trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc

@@ -60 +60 @@
 #include "MLog.h"
 #include "MLogManip.h"
+#include "MStatusDisplay.h"
 
 // eventloop
@@ -97 +98 @@
 Bool_t MJOptimizeDisp::RunDisp(const char *fname, const char *rule, MTask *weights)
 {
+    SetTitle(Form("OptimizeDisp: %s", fname));
+
+    if (fDisplay)
+        fDisplay->SetTitle(fTitle);
+
     fLog->Separator("Preparing Disp optimization");
 

trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc

@@ -53 +53 @@
 #include "MLog.h"
 #include "MLogManip.h"
+#include "MStatusDisplay.h"
 
 // eventloop
@@ -86 +87 @@
 Bool_t MJOptimizeEnergy::RunEnergy(const char *fname, const char *rule, MTask *weights)
 {
+    SetTitle(Form("OptimizeEnergy: %s", fname));
+
+    if (fDisplay)
+        fDisplay->SetTitle(fTitle);
+
     fLog->Separator("Preparing Energy optimization");