Changeset 2695 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/CT1Analysis.C (modified) (3 diffs)
• manalysis/MCT1FindSupercuts.cc (modified) (8 diffs)
• manalysis/MCT1FindSupercuts.h (modified) (1 diff)
• manalysis/MFindSupercuts.cc (modified) (8 diffs)
• mtools/MTFillMatrix.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - removed fUseOrigDistrib accoring to href.GetEntries()==0 used in
        MFEventSelector2 and MFillMatrix
+
+   * macros/CT1Analysis.C:
+     - tried to make fUseOrigDistrib-stuff working again
 
 

trunk/MagicSoft/Mars/macros/CT1Analysis.C

@@ -1119 +1119 @@
     gref.SetName(mgname);
     MH::SetBinning(&gref.GetHist(), &bing);
-    for (Int_t i=1; i<=gref.GetNbins(); i++)
-      gref.GetHist().SetBinContent(i, 1.0);
+    //for (Int_t i=1; i<=gref.GetNbins(); i++)
+    //  gref.GetHist().SetBinContent(i, 1.0);
 
     MFEventSelector2 selectorg(gref);
@@ -1126 +1126 @@
     selectorg.SetName("selectGammasTrainTest");
     selectorg.SetInverted();
-    selectorg.SetUseOrigDistribution(kTRUE);
+    //selectorg.SetUseOrigDistribution(kTRUE);
 
     MContinue contg(&selectorg);
@@ -1874 +1874 @@
     findsuper.SetFilenameParam(parSCfile);
     findsuper.SetHadronnessName("HadSC");
-    findsuper.SetUseOrigDistribution(kTRUE);
+    //findsuper.SetUseOrigDistribution(kTRUE);
 
     //--------------------------

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);

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -146 +146 @@
 // at MFEventSelector2 which is used to select the events.
 //
+// FIXME: Make a copy of ref.
+//
 MTFillMatrix::MTFillMatrix(const MH3 &ref)
 : fReference(ref), fReader(0), fDestMatrix1(0),
@@ -166 +168 @@
         return kFALSE;
     }
-
-    const Bool_t useorigdistrib = fReference.GetHist().GetEntries()==0;
 
     *fLog << inf;
@@ -174 +174 @@
     *fLog << "Fill " << fDestMatrix2->GetDescriptor() << " with " << fNumDestEvents2 << endl;
         *fLog << "Distribution choosen ";
-    if (!useorigdistrib)
+    if (fReference.GetHist().GetEntries()>0)
         *fLog << "from " << fReference.GetDescriptor();
     else
@@ -193 +193 @@
     selector.SetNumMax(fNumDestEvents1+fNumDestEvents2);
     selector.SetInverted();
-    if (useorigdistrib)
-        selector.SetUseOrigDistribution(kTRUE);
 
     //