Changeset 2574 for trunk/MagicSoft/Mars/manalysis

Timestamp:

11/28/03 08:08:53 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1FindSupercuts.cc (modified) (12 diffs)
• MCT1FindSupercuts.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCT1FindSupercuts.cc

@@ -58 +58 @@
 #include "MFillH.h"
 //#include "MGeomCamCT1Daniel.h"
+#include "MFRandomSplit.h"
 #include "MGeomCamCT1.h"
 #include "MH3.h"
@@ -246 +247 @@
     fTitle = title ? title : "Optimizer of the supercuts";
 
+    fUseOrigDistribution = kFALSE;
+
     //---------------------------
     // camera geometry is needed for conversion mm ==> degree
@@ -277 +280 @@
 }
 
+
+// --------------------------------------------------------------------------
+//
+// 
+//
+void MCT1FindSupercuts::SetUseOrigDistribution(Bool_t b)
+{
+  fUseOrigDistribution = b;
+
+  *fLog << "MCT1FindSupercuts : when defining training and test matrices use the original distribution" 
+        << endl;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -285 +301 @@
 //
 //
-Bool_t MCT1FindSupercuts::DefineTrainMatrix(const TString &nametrain,
-                          const Int_t howmanytrain, MH3 &hreftrain,
-                          const TString &filetrain)
+Bool_t MCT1FindSupercuts::DefineTrainMatrix(
+                          const TString &nametrain, MH3 &hreftrain,
+                          const Int_t howmanytrain, const TString &filetrain)
 {
     if (nametrain.IsNull() || howmanytrain <= 0)
@@ -295 +311 @@
     *fLog << "fill training matrix from file '" << nametrain 
           << "',   select " << howmanytrain 
-          << " events according to a distribution given by the MH3 object '"
-          << hreftrain.GetName() << "'" << endl;
+          << " events " << endl;
+    if (!fUseOrigDistribution)
+    {
+      *fLog << "     according to a distribution given by the MH3 object '"
+            << hreftrain.GetName() << "'" << endl;
+    }
+    else
+    {
+      *fLog << "     randomly" << endl;
+    }
 
 
@@ -305 +329 @@
     read.DisableAutoScheme();
 
-    //MFEventSelector2 seltrain(hreftrain);
-    //seltrain.SetNumMax(howmanytrain);
-    MFEventSelector seltrain;
-    seltrain.SetNumSelectEvts(howmanytrain);
+    MFEventSelector2 seltrain(hreftrain);
+    seltrain.SetNumMax(howmanytrain);
+    seltrain.SetName("selectTrain");
+    if (fUseOrigDistribution)
+      seltrain.SetUseOrigDistribution(kTRUE);
 
     MFillH filltrain(fMatrixTrain);
     filltrain.SetFilter(&seltrain);
+    filltrain.SetName("fillMatrixTrain");
 
     //******************************
@@ -379 +405 @@
 //
 //
-Bool_t MCT1FindSupercuts::DefineTestMatrix(const TString &nametest,
-                          const Int_t howmanytest, MH3 &hreftest,
-                          const TString &filetest)
+Bool_t MCT1FindSupercuts::DefineTestMatrix(
+                          const TString &nametest, MH3 &hreftest,
+                          const Int_t howmanytest, const TString &filetest)
 {
     if (nametest.IsNull() || howmanytest<=0)
@@ -389 +415 @@
     *fLog << "fill test matrix from file '" << nametest 
           << "',   select " << howmanytest 
-          << " events according to a distribution given by the MH3 object '"
-          << hreftest.GetName() << "'" << endl;
+          << " events " << endl;
+    if (!fUseOrigDistribution)
+    {
+      *fLog << "     according to a distribution given by the MH3 object '"
+            << hreftest.GetName() << "'" << endl;
+    }
+    else
+    {
+      *fLog << "     randomly" << endl;
+    }
 
 
@@ -399 +433 @@
     read.DisableAutoScheme();
 
-    //MFEventSelector2 seltest(hreftest);
-    //seltest.SetNumMax(howmanytest);
-    MFEventSelector seltest;
-    seltest.SetNumSelectEvts(howmanytest);
-
+    MFEventSelector2 seltest(hreftest);
+    seltest.SetNumMax(howmanytest);
+    seltest.SetName("selectTest");
+    if (fUseOrigDistribution)
+      seltest.SetUseOrigDistribution(kTRUE);
+ 
     MFillH filltest(fMatrixTest);
     filltest.SetFilter(&seltest);
@@ -471 +506 @@
 //
 Bool_t MCT1FindSupercuts::DefineTrainTestMatrix(
-                          const TString &name,
-                          const Int_t howmanytrain, MH3 &hreftrain,
-                          const Int_t howmanytest,  MH3 &hreftest,
+                          const TString &name, MH3 &href,
+                          const Int_t howmanytrain, const Int_t howmanytest,
                           const TString &filetrain, const TString &filetest)
 {
     *fLog << "=============================================" << endl;
-    *fLog << "fill training matrix from file '" << name 
-          << "',   select " << howmanytrain 
-          << " events for the training according to a distribution given by the MH3 object '"
-          << hreftrain.GetName() << "'" << endl;
-
-    *fLog << "fill test matrix from the same file '" << name 
-          << "',   select " << howmanytest 
-          << " events for the training according to a distribution given by the MH3 object '"
-          << hreftest.GetName() << "'" << endl;
+    *fLog << "fill training and test matrix from file '" << name 
+          << "',   select "   << howmanytrain 
+          << " training and " << howmanytest << " test events " << endl;
+    if (!fUseOrigDistribution)
+    {
+      *fLog << "     according to a distribution given by the MH3 object '"
+            << href.GetName() << "'" << endl;
+    }
+    else
+    {
+      *fLog << "     randomly" << endl;
+    }
 
 
@@ -494 +531 @@
     read.DisableAutoScheme();
 
-    //MFEventSelector2 seltrain(hreftrain);
-    //seltrain.SetNumMax(howmanytrain);
-    MFEventSelector seltrain;
-    seltrain.SetName("SelTrain");
-    seltrain.SetNumSelectEvts(howmanytrain);
+    MFEventSelector2 selector(href);
+    selector.SetNumMax(howmanytrain+howmanytest);
+    selector.SetName("selectTrainTest");
+    selector.SetInverted();
+    if (fUseOrigDistribution)
+      selector.SetUseOrigDistribution(kTRUE);
+
+    MContinue cont(&selector);
+    cont.SetName("ContTrainTest");
+
+    Double_t prob =  ( (Double_t) howmanytrain )
+                   / ( (Double_t)(howmanytrain+howmanytest) );
+    MFRandomSplit split(prob);
 
     MFillH filltrain(fMatrixTrain);
+    filltrain.SetFilter(&split);
     filltrain.SetName("fillMatrixTrain");
-    filltrain.SetFilter(&seltrain);
+
 
     // consider this event as candidate for a test event 
     // only if event was not accepted as a training event
-    MContinue cont(&seltrain);
-
-    const Float_t fcorr = (Float_t)read.GetEntries() / (read.GetEntries()-howmanytrain);
-
-    *fLog << "entries, howmanytrain, fcorr = " << read.GetEntries()
-          << ",  " << howmanytrain << ",  " << fcorr << endl;
-
-    //MFEventSelector2 seltest(hreftest);
-    //seltrain.SetNumMax(howmanytest*fcorr);
-    MFEventSelector seltest;
-    seltest.SetName("SelTest");
-    seltest.SetNumSelectEvts((Int_t)(fcorr*howmanytest));
+
+    MContinue conttrain(&split);
+    conttrain.SetName("ContTrain");
 
     MFillH filltest(fMatrixTest);
     filltest.SetName("fillMatrixTest");
-    filltest.SetFilter(&seltest);
+
 
     //******************************
@@ -535 +572 @@
 
     tlist.AddToList(&read);
-    tlist.AddToList(&seltrain);
+    tlist.AddToList(&cont);
+
+    tlist.AddToList(&split);
     tlist.AddToList(&filltrain);
-
-    tlist.AddToList(&cont);
-
-    tlist.AddToList(&seltest);
+    tlist.AddToList(&conttrain);
+
     tlist.AddToList(&filltest);
 

trunk/MagicSoft/Mars/manalysis/MCT1FindSupercuts.h

@@ -37 +37 @@
   Int_t   fHowManyTrain;
   Int_t   fHowManyTest;
+
+  Bool_t  fUseOrigDistribution;
 
   TString  fFilenameParam;
@@ -88 +90 @@
   void SetMatrixFilter(MFilter *filter)          {fMatrixFilter = filter;}
 
-  Bool_t DefineTrainMatrix(const TString &name, const Int_t howmany,
-                           MH3 &href, const TString &filetrain); 
+  Bool_t DefineTrainMatrix(const TString &name, MH3 &href,
+                           const Int_t howmany, const TString &filetrain); 
 
-  Bool_t DefineTestMatrix(const TString &name, const Int_t howmany,
-                          MH3 &href,  const TString &filetest);
+  Bool_t DefineTestMatrix(const TString &name, MH3 &href,
+                          const Int_t howmany, const TString &filetest);
 
-  Bool_t DefineTrainTestMatrix(const TString &name, 
-                         const Int_t howmanytrain, MH3 &hreftrain,
-                         const Int_t howmanytest,  MH3 &hreftest,
+  Bool_t DefineTrainTestMatrix(const TString &name, MH3 &href,
+                         const Int_t howmanytrain, const Int_t howmanytest, 
                          const TString &filetrain, const TString &filetest);
+
+  void SetUseOrigDistribution(Bool_t b);
 
   MHMatrix *GetMatrixTrain() { return fMatrixTrain; }