Changeset 7425 for trunk

Timestamp:

11/22/05 17:40:37 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mranforest/MHRanForestGini.cc (modified) (1 diff)
• mranforest/MRanForest.cc (modified) (2 diffs)
• mranforest/MRanForest.h (modified) (2 diffs)
• mranforest/MRanForestCalc.cc (modified) (1 diff)
• mranforest/MRanForestCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -65 +65 @@
      - updated output
      - made it work properly
+
+   * mjobs/MJCut.cc:
+     - added ClacDisp task to output
+
+   * mjobs/MJPedestal.cc:
+     - removed an obsolete include
 
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -650 +650 @@
     if (taskenv2.GetTask())
         cont.Add(taskenv2.GetTask());
+    if (taskenv3.GetTask())
+        cont.Add(taskenv3.GetTask());
 
     if (!WriteTasks(set.GetNumAnalysis(), cont))

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -62 +62 @@
 
 #include "MStatusDisplay.h"
-#include "MFEventSelector.h"
 
 // Other basic classes

trunk/MagicSoft/Mars/mranforest/MHRanForestGini.cc

@@ -134 +134 @@
     // --- Produce some text information ---
     fRules.AddText("");
-    fRules.AddText(Form("%d trees trained with %d events", fRanForest->GetNumTrees(),
+    fRules.AddText(Form("%s w/ %d trees of node size %d trained by %d events",
+                        fRanForest->IsClassify()?"Classification":"Regression",
+                        fRanForest->GetNumTrees(),
+                        fRanForest->GetNdSize(),
                         fRanForest->GetNumData()));
-    fRules.AddText("---");
+    fRules.AddText("---");//Form("---> %s", fRanForest->GetTargetRule().Data()));
+
     const MDataArray &arr = *fRanForest->GetRules();
+
     int i;
     for (i=0; i<arr.GetNumEntries(); i++)
-    {
-        TString s;
-        s += i+1;
-        s += ") ";
-        s += arr.GetRule(i);
-        fRules.AddText(s);
-    }
+        fRules.AddText(Form("%d) %s", i+1, arr.GetRule(i).Data()));
+
     for (; i<20; i++)
         fRules.AddText("");

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -201 +201 @@
 }
 
+MRanTree *MRanForest::GetTree(Int_t i) const
+{
+    return static_cast<MRanTree*>(fForest->UncheckedAt(i));
+}
+
 Int_t MRanForest::GetNumDim() const
 {
@@ -372 +377 @@
         return kFALSE;
     }
-    fRanTree->SetName(target_rule);
+    //fRanTree->SetName(target_rule); // Is not stored anyhow
 
     const Int_t tryest = TMath::Nint(TMath::Sqrt(dim));

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -97 +97 @@
     TObjArray  *GetForest() const      { return fForest; }
     MRanTree   *GetCurTree() const     { return fRanTree; }
-    MRanTree   *GetTree(Int_t i) const { return static_cast<MRanTree*>(fForest->UncheckedAt(i)); }
+    MRanTree   *GetTree(Int_t i) const;
     MDataArray *GetRules() const       { return fRules; }
 
@@ -104 +104 @@
     Int_t      GetNumData()  const;
     Int_t      GetNumDim()   const;
+    Int_t      GetNdSize() const { return fNdSize; }
     Int_t      GetNclass()   const;
     Double_t   GetTreeHad(Int_t i) const { return fTreeHad.At(i); }
     Double_t   GetUserVal() const { return fUserVal; }
- 
+    Bool_t     IsClassify() const { return fClassify; }
+
     // use forest to calculate hadronness of event
     Double_t CalcHadroness(const TVector &event);

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -311 +311 @@
     if (fEForests.GetEntriesFast()==1)
     {
-        MRanForest *rf = static_cast<MRanForest*>fEForests.UncheckedAt(0);
+        MRanForest *rf = static_cast<MRanForest*>(fEForests.UncheckedAt(0));
         fRFOut->SetVal(rf->CalcHadroness(event));
         fRFOut->SetReadyToSave();

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -71 +71 @@
 
     // TObject
-    void Print(Option_t *o="") const;
+    void Print(Option_t *o="") const; //*MENU*
 
     // Setter for estimation