Changeset 7664 for trunk/MagicSoft

Timestamp:

04/30/06 14:15:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjtrain

Files:

• MJTrainSeparation.cc (modified) (8 diffs)
• MJTrainSeparation.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mjtrain/MJTrainSeparation.cc

@@ -86 +86 @@
     g.SetMarkerColor(kGreen);
 
+    TH2D res1(g);
+    TH2D res2(g);
+
+    res1.SetTitle("Significance Li/Ma");
+    res2.SetTitle("Significance Li/Ma * log_{10}(excess)");
+
     const Int_t nx = h.GetNbinsX();
     const Int_t ny = h.GetNbinsY();
@@ -106 +112 @@
             const Float_t s = gx->Integral(1, y+1);
             const Float_t b = hx->Integral(1, y+1);
-            const Float_t sig1 = MMath::SignificanceLiMa(s+b, b);
-            const Float_t sig2 = s<1 ? 0 : MMath::SignificanceLiMa(s+b, b)*TMath::Log10(s);
+            const Float_t sig1 = MMath::SignificanceLiMaSigned(s+b, b);
+            const Float_t sig2 = s<1 ? 0 : MMath::SignificanceLiMaSigned(s+b, b)*TMath::Log10(s);
             if (sig1>max1)
             {
@@ -118 +124 @@
                 max2 = sig2;
             }
+
+            res1.SetBinContent(x+1, y+1, sig1);
+            res2.SetBinContent(x+1, y+1, sig2);
         }
 
@@ -127 +136 @@
     }
 
-    fDisplay->AddTab("OptCut");
+    TCanvas &c = fDisplay->AddTab("OptCut");
+    c.Divide(2,2);
+
+    c.cd(1);
     gPad->SetLogx();
     h.DrawCopy();
@@ -136 +148 @@
     gr2.SetMarkerStyle(kFullDotMedium);
     gr2.DrawClone("LP")->SetBit(kCanDelete);
+
+    c.cd(2);
+    gPad->SetLogx();
+    MH::SetPalette("pretty");
+    res1.DrawCopy("colz");
+
+    c.cd(4);
+    gPad->SetLogx();
+    MH::SetPalette("pretty");
+    res2.DrawCopy("colz");
 }
 
@@ -457 +479 @@
         return kFALSE;
 
+    const Int_t numgammas = train.GetNumRows();
+
     // Set classifier for hadrons
     had.SetVal(1);
@@ -464 +488 @@
     if (!fill.Process(plistx))
         return kFALSE;
+
+    const Int_t numbackgrnd = train.GetNumRows()-numgammas;
 
     // ------------------------ Train RF --------------------------
@@ -478 +504 @@
     rf.SetNameOutput("MHadronness");
 
-    //MBinning b(2, -0.5, 1.5, "BinningHadronness", "lin");
+    if (fUseRegression)
+    {
+        if (!rf.TrainSingleRF(train))                  // regression
+            return kFALSE;
+    }
+    else
+    {
+        MBinning b(2, -0.5, 1.5, "BinningHadronness", "lin");
+        if (!rf.TrainSingleRF(train, b.GetEdgesD()))   // classification
+            return;
+    }
 
     //if (!rf.TrainMultiRF(train, b.GetEdgesD()))    // classification
     //    return;
 
-    //if (!rf.TrainSingleRF(train, b.GetEdgesD()))   // classification
-    //    return;
-
-    if (!rf.TrainSingleRF(train))                  // regression
-        return kFALSE;
-
     //fDisplay = rf.GetDisplay();
 
+
+    *fLog << all;
+    fLog->Separator();
+
+    *fLog << "Training method:" << endl;
+    *fLog << " * " << (fUseRegression?"regression":"classification") << endl;
+    *fLog << endl;
+    *fLog << "Events used for training:"   << endl;
+    *fLog << " * Gammas:     " << numgammas   << endl;
+    *fLog << " * Background: " << numbackgrnd << endl;
+
+    if (!fDataSetTest.IsValid())
+        return kTRUE;
+
     // --------------------- Display result ----------------------
-    gLog.Separator("Test");
+    fLog->Separator("Test");
 
     MParList  plist;

trunk/MagicSoft/Mars/mjtrain/MJTrainSeparation.h

@@ -25 +25 @@
 
     Bool_t fAutoTrain;
+    Bool_t fUseRegression;
 
     void DisplayResult(MH3 &h31, MH3 &h32);
@@ -36 +37 @@
         fNumTrainOn((UInt_t)-1), fNumTrainOff((UInt_t)-1),
         fNumTestOn((UInt_t)-1), fNumTestOff((UInt_t)-1),
-        fAutoTrain(kFALSE)
+        fAutoTrain(kFALSE), fUseRegression(kTRUE)
     { }
 
@@ -42 +43 @@
     {
         ds.Copy(fDataSetTrain);
+
+        fDataSet.SetNumAnalysis(1);
+
         fNumTrainOn = non;
         fNumTrainOff = noff;
@@ -48 +52 @@
     {
         ds.Copy(fDataSetTest);
+
+        fDataSet.SetNumAnalysis(1);
+
         fNumTestOn = non;
         fNumTestOff = noff;
     }
 
-    void EnableAutoTrain(Bool_t b=kTRUE) { fAutoTrain = b; }
+    void EnableAutoTrain(Bool_t b=kTRUE)      { fAutoTrain     =  b; }
+    void EnableRegression(Bool_t b=kTRUE)     { fUseRegression =  b; }
+    void EnableClassification(Bool_t b=kTRUE) { fUseRegression = !b; }
 
     Bool_t Train(const char *out);