Changeset 7151 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/13/05 10:20:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• JobsLinkDef.h (modified) (1 diff)
• MJOptimize.cc (modified) (4 diffs)
• MJOptimize.h (modified) (2 diffs)
• MJOptimizeEnergy.cc (modified) (5 diffs)
• MJOptimizeEnergy.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MJSpectrum+;
 
-#pragma link C++ class MJOptimize+;
-#pragma link C++ class MJOptimizeCuts+;
-#pragma link C++ class MJOptimizeEnergy+;
-
 #endif

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -158 +158 @@
     MParList *plist = fEvtLoop->GetParList();
 
-    MParameterD   *eval = (MParameterD*)plist->FindObject("MinimizationValue", "MParameterD");
+    MParameterD   *eval = (MParameterD*)plist->FindObject(fNameMinimizationValue, "MParameterD");
     MParContainer *pars = (MParContainer*)plist->FindObject("MParameters", "MParContainer");
 
@@ -172 +172 @@
         *fLog << endl;
     }
- 
+
     pars->SetVariables(par);
     eval->SetVal(0);
@@ -225 +225 @@
 }
 
-MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(0)
+MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(0), fNameMinimizationValue("MinimizationValue")
 {
     fRules.SetOwner();
@@ -648 +648 @@
 {
     // Checks to make sure, that fcn doesn't crash
-    if (!parlist.FindCreateObj("MParameterD", "MinimizationValue"))
+    if (!parlist.FindCreateObj("MParameterD", fNameMinimizationValue))
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -73 +73 @@
     Float_t fTolerance;
     Int_t   fTestTrain;
+    TString fNameMinimizationValue;
 
     Bool_t Optimize(MEvtLoop &evtloop);
@@ -112 +113 @@
     void SetTolerance(Float_t tol=0)  { fTolerance=tol; }
     void EnableTestTrain(Int_t b=1)   { fTestTrain=b; } // Use 1 and -1
+    void SetNameMinimizationValue(const char *name="MinimizationValue") { fNameMinimizationValue = name; }
 
     // Parameter access

trunk/MagicSoft/Mars/mjobs/MJOptimizeEnergy.cc

@@ -27 +27 @@
 // MJOptimize
 //
-// Class for otimizing the parameters of the supercuts
+// Class for otimizing a rule to estimate the energy. For more details see
+// MJOptimize.
 //
-// Minimization Control
-// ====================
+// Example:
+// --------
 //
-//   To choose the minimization algorithm use:
-//         void SetOptimizer(Optimizer_t o);
-//
-//   Allowed options are:
-//        enum Optimizer_t
-//        {
-//            kMigrad,      // Minimize by the method of Migrad
-//            kSimplex,     // Minimize by the method of Simplex
-//            kMinimize,    // Migrad + Simplex (if Migrad fails)
-//            kMinos,       // Minos error determination
-//            kImprove,     // Local minimum search
-//            kSeek,        // Minimize by the method of Monte Carlo
-//            kNone         // Skip optimization
-//        };
-//
-//   For more details on the methods see TMinuit.
-//
-//
-//   You can change the behaviour of the minimization using
-//
-//        void SetNumMaxCalls(UInt_t num=0);
-//        void SetTolerance(Float_t tol=0);
-//
-//   While NumMaxCalls is the first, Tolerance the second arguement.
-//   For more details start root and type
-//
-//        gMinuit->mnhelp("command")
-//
-//   while command can be
-//        * MIGRAD
-//        * SIMPLEX
-//        * MINIMIZE
-//        * MINOS
-//        * IMPROVE
-//        * SEEK
-//
-//   The default (num==0 and tol==0) should always give you the
-//   corresponding defaults used in Minuit.
-//
-//
-// FIXME: Implement changing cut in hadronness...
-// FIXME: Show MHSignificance on MStatusDisplay during filling...
-// FIXME: Choose step-size percentage as static data membewr
-// FIXME: Choose minimization method
+//    MJOptimizeEnergy opt;
+//    opt.SetDebug(2);
+//    opt.SetOptimizer(MJOptimize::kMigrad);
+//    opt.SetNumEvents(20000);
+//    opt.EnableTestTrain();
+//    opt.AddParameter("MHillas.fSize");
+//    opt.SetParameter(0, 1, 0, 2);
+//    char *r = "[0]*M[0]"; //Rule to calculate estimated energy
+//    MStatusDisplay *d = new MStatusDisplay;
+//    opt.SetDisplay(d);
+//    opt.RunDisp("ganymed-summary.root", r);
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -116 +84 @@
 // energy estimator.
 //
-Bool_t MJOptimizeEnergy::RunEnergy(const char *fname, const char *rule)
+Bool_t MJOptimizeEnergy::RunEnergy(const char *fname, const char *rule, MTask *weights)
 {
     fLog->Separator("Preparing Energy optimization");
@@ -139 +107 @@
     hist.InitMapping(&m); 
 
-    MEnergyEstimate est("MParameters");
-    est.SetRule(rule);
+    MParameterCalc est(rule, "MParameters");
+    est.SetNameParameter("MEnergyEst");
     parlist.AddToList(&est);
 
@@ -159 +127 @@
 
     MFillH fill(&hist);
+    if (weights)
+        fill.SetWeight();
 
     MMatrixLoop loop(&m);
@@ -164 +134 @@
     tasklist.AddToList(&loop);
     tasklist.AddToList(&est);
+    if (weights)
+        tasklist.AddToList(weights);
     tasklist.AddToList(&fill);
 

trunk/MagicSoft/Mars/mjobs/MJOptimizeEnergy.h

@@ -6 +6 @@
 #endif
 
+class MTask;
+
 class MJOptimizeEnergy : public MJOptimize
 {
 public:
+    MJOptimizeEnergy() : MJOptimize() { }
+
     // Special optimizing routines
-    Bool_t RunEnergy(const char *fname, const char *rule);
-    Bool_t RunEnergy(const char *rule)
+    Bool_t RunEnergy(const char *fname, const char *rule, MTask *weights=0);
+    Bool_t RunEnergy(const char *rule, MTask *weights=0)
     {
-        return RunEnergy(0, rule);
+        return RunEnergy(0, rule, weights);
     }