Changeset 6924 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/11/05 16:15:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJOptimize.cc (modified) (4 diffs)
• MJOptimize.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -228 +228 @@
 }
 
-MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0)
+MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(kFALSE)
 {
     fRules.SetOwner();
@@ -642 +642 @@
     }
 
+    MMatrixLoop *loop = dynamic_cast<MMatrixLoop*>(parlist.FindTask("MRead"));
+
     TString txt("Starting ");
     switch (fType)
@@ -666 +668 @@
     *fLog << inf << "Number of Parameters: " << fParameters.GetSize() << endl;
 
+    // In case the reader is the matrix loop and testrain is enabled
+    // switch on even mode...
+    if (loop && fTestTrain)
+        loop->SetOperationMode(MMatrixLoop::kEven);
+
     if (!Optimize(evtloop))
         return kFALSE;
@@ -672 +679 @@
 
     fEvtLoop->SetDisplay(fDisplay);
-    return Fcn(fParameters);
+    if (!Fcn(fParameters))
+        return kFALSE;
+
+    // In case the reader is the matrix loop and testrain is enabled
+    // switch on odd mode...
+    if (!loop || !fTestTrain)
+        return kTRUE;
+
+    loop->SetOperationMode(MMatrixLoop::kOdd);
+
     // Done already in Fcn
     // list.SetVariables(fParameters);
+    return Fcn(fParameters);
 }
 

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -84 +84 @@
     UInt_t  fNumMaxCalls;
     Float_t fTolerance;
+    Bool_t  fTestTrain;
 
     Bool_t Optimize(MEvtLoop &evtloop);
@@ -108 +109 @@
     void SetNumMaxCalls(UInt_t num=0) { fNumMaxCalls=num; }
     void SetTolerance(Float_t tol=0)  { fTolerance=tol; }
+    void EnableTestTrain(Bool_t b=kTRUE) { fTestTrain=b; }
 
     // Parameter access