Changeset 18043 for trunk/Mars/mjoptim

Timestamp:

12/20/14 15:38:14 (10 years ago)

Author:

tbretz

Message:

Only write the events from the test sample.

File:

• trunk/Mars/mjoptim/MJOptimizeDisp.cc (modified) (3 diffs)

trunk/Mars/mjoptim/MJOptimizeDisp.cc

@@ -235 +235 @@
 
     MFilterList flist;
+    fPreCuts.Add(&filter);
     flist.AddToList(fPreCuts);
     flist.SetName("PreCuts");
@@ -241 +242 @@
     MContinue cont(&flist);
     tlist.AddToList(&cont);
+
+    MParameterCalc calcx("0", "CountEvents");
+    tlist.AddToList(&calcx);
+
+    // FIXME: Handle fTestTrain<0
+    MContinue contt("TMath::Odd(CountEvents.fNumExecutions)>0.5", "ContTrain");
+    plist.AddToList(&calcx);
+    tlist.AddToList(&contt);
 
     TString r(rule);
@@ -287 +296 @@
     loop2.SetDisplay(fDisplay);
     loop2.SetParList(&plist);
-    if (!oop2.Eventloop())
-        return;
+    if (!loop2.Eventloop())
+        return kFALSE;
 
     // Store result if requested