Changeset 2695 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/17/03 17:14:00 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1FindSupercuts.cc (modified) (8 diffs)
• MCT1FindSupercuts.h (modified) (1 diff)
• MFindSupercuts.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/manalysis/MCT1FindSupercuts.cc

@@ -247 +247 @@
     fTitle = title ? title : "Optimizer of the supercuts";
 
-    fUseOrigDistribution = kFALSE;
-
     //---------------------------
     // camera geometry is needed for conversion mm ==> degree
@@ -280 +278 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// 
-//
-void MCT1FindSupercuts::SetUseOrigDistribution(Bool_t b)
-{
-  fUseOrigDistribution = b;
-
-  *fLog << "MCT1FindSupercuts : when defining training and test matrices use the original distribution" 
-        << endl;
-}
-
 // --------------------------------------------------------------------------
 //
@@ -312 +297 @@
           << "',   select " << howmanytrain 
           << " events " << endl;
-    if (!fUseOrigDistribution)
+    if (!hreftrain.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -332 +317 @@
     seltrain.SetNumMax(howmanytrain);
     seltrain.SetName("selectTrain");
-    if (fUseOrigDistribution)
-      seltrain.SetUseOrigDistribution(kTRUE);
 
     MFillH filltrain(fMatrixTrain);
@@ -416 +399 @@
           << "',   select " << howmanytest 
           << " events " << endl;
-    if (!fUseOrigDistribution)
+    if (!hreftest.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -436 +419 @@
     seltest.SetNumMax(howmanytest);
     seltest.SetName("selectTest");
-    if (fUseOrigDistribution)
-      seltest.SetUseOrigDistribution(kTRUE);
  
     MFillH filltest(fMatrixTest);
@@ -514 +495 @@
           << "',   select "   << howmanytrain 
           << " training and " << howmanytest << " test events " << endl;
-    if (!fUseOrigDistribution)
+    if (!href.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -535 +516 @@
     selector.SetName("selectTrainTest");
     selector.SetInverted();
-    if (fUseOrigDistribution)
-      selector.SetUseOrigDistribution(kTRUE);
 
     MContinue cont(&selector);

trunk/MagicSoft/Mars/manalysis/MCT1FindSupercuts.h

@@ -37 +37 @@
   Int_t   fHowManyTrain;
   Int_t   fHowManyTest;
-
-  Bool_t  fUseOrigDistribution;
 
   TString  fFilenameParam;

trunk/MagicSoft/Mars/manalysis/MFindSupercuts.cc

@@ -247 +247 @@
     fTitle = title ? title : "Optimizer of the supercuts";
 
-    fUseOrigDistribution = kFALSE;
-
     //---------------------------
     // camera geometry is needed for conversion mm ==> degree
@@ -280 +278 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// 
-//
-void MFindSupercuts::SetUseOrigDistribution(Bool_t b)
-{
-  fUseOrigDistribution = b;
-
-  *fLog << "MFindSupercuts : when defining training and test matrices use the original distribution" 
-        << endl;
-}
-
 // --------------------------------------------------------------------------
 //
@@ -311 +296 @@
     *fLog << "fill training matrix from file '" << nametrain 
           << "',   select " << howmanytrain 
-          << " events " << endl;
-    if (!fUseOrigDistribution)
+        << " events " << endl;
+    if (!hreftrain.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -332 +317 @@
     seltrain.SetNumMax(howmanytrain);
     seltrain.SetName("selectTrain");
-    if (fUseOrigDistribution)
-      seltrain.SetUseOrigDistribution(kTRUE);
 
     MFillH filltrain(fMatrixTrain);
@@ -416 +399 @@
           << "',   select " << howmanytest 
           << " events " << endl;
-    if (!fUseOrigDistribution)
+    if (!hreftest.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -436 +419 @@
     seltest.SetNumMax(howmanytest);
     seltest.SetName("selectTest");
-    if (fUseOrigDistribution)
-      seltest.SetUseOrigDistribution(kTRUE);
  
     MFillH filltest(fMatrixTest);
@@ -514 +495 @@
           << "',   select "   << howmanytrain 
           << " training and " << howmanytest << " test events " << endl;
-    if (!fUseOrigDistribution)
+    if (!href.GetHist().GetEntries()==0)
     {
       *fLog << "     according to a distribution given by the MH3 object '"
@@ -535 +516 @@
     selector.SetName("selectTrainTest");
     selector.SetInverted();
-    if (fUseOrigDistribution)
-      selector.SetUseOrigDistribution(kTRUE);
 
     MContinue cont(&selector);