Changeset 2574 for trunk/MagicSoft

Timestamp:

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

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MCT1FindSupercuts.cc (modified) (12 diffs)
• manalysis/MCT1FindSupercuts.h (modified) (2 diffs)
• mfilter/FilterLinkDef.h (modified) (1 diff)
• mfilter/MFAntiFilter.cc (added)
• mfilter/MFAntiFilter.h (added)
• mfilter/MFEventSelector2.cc (modified) (13 diffs)
• mfilter/MFEventSelector2.h (modified) (3 diffs)
• mfilter/MFRandomSplit.cc (added)
• mfilter/MFRandomSplit.h (added)
• mfilter/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+
+  2003/11/27: Wolfgang Wittek
+
+  * mfilter/MFEventSelector2.cc
+    - if number of requested events is too high 
+      reduce it to the maximum number possible
+    - introduce the flag 'fUseOrigDistribution';
+      if it is set to kTRUE (by SetOrigDistribution()) the original
+      distribution will be used as the nominal distribution
+    - add the member functions SetUseOrigDistribution()
+                               GetHistOrig()
+
+  * mfilter/MFRandomSplit.[h,cc]
+    - a filter which gives fResult = kTRUE with a certain probability
+
+  * mfilter/MFAntiFilter.[h,cc]
+    - a filter which checks the result of a given filter and returns 
+      the opposite result;
+      Thomas : could you please add a code which puts the filter whose 
+               result is checked into the task list ?
+
+  * mfilter/Makefile
+            FilterLinkDef.h
+    - add MFRandomSplit and MFAntiFilter
+
+  * manalysis/MCT1FindSupercuts.[h,cc]
+    - in 'DefineTrainMatrix', 'DefineTestMatrix', and 
+      'DefineTrainTestMatrix()' :
+      replace call to 'MFEventSelector' by call to 'MFEventSelector2'
+    - add member function SetUseOrigDistribution(Bool_t b);
+      if b = kTRUE the events for the training and test samples are
+      selected randomnly from the input file
+
+
+
  2003/11/27: Abelardo Moralejo
 
@@ -11 +48 @@
        where the parameter containers for each telescope are tagged 
        with a ';' followed by the telescope number. 
+
 
  2003/11/26: Thomas Bretz

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

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -24 +24 @@
 
 #pragma link C++ class MFEnergySlope+;
+#pragma link C++ class MFRandomSplit+;
+#pragma link C++ class MFAntiFilter+;
 
 #endif

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 01/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz,   01/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
+!              Wolfgang Wittek 11/2003 <mailto:wittek@mppmu.mpg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2003
@@ -135 +136 @@
 //     would result in redistributing cos(Theta).
 //
+//  If 'fUseOrigDistribution' is set to kTRUE (by SetUseOrigDistribution())
+//     the original distribution will be used as the nominal distribution;
+//     note that also in this case a dummy nominal distribution has to be
+//     provided in the first argument (the dummy distribution defines the
+//     variable(s) of interest and the binnings)
+//
+
 MFEventSelector2::MFEventSelector2(MH3 &hist, const char *name, const char *title)
 : fHistOrig(NULL), fHistNom(&hist), fHistRes(NULL),
@@ -142 +150 @@
     fName  = name  ? (TString)name  : gsDefName;
     fTitle = title ? (TString)title : gsDefTitle;
-}
-
-// --------------------------------------------------------------------------
-//
-// Destructor. Deletes fHistRes if allocated.
+ 
+    fUseOrigDistribution = kFALSE;
+}
+
+// --------------------------------------------------------------------------
+//
+// 
 //
 MFEventSelector2::~MFEventSelector2()
 {
-    if (fHistRes)
-        delete fHistRes;
-}
-
-// --------------------------------------------------------------------------
+  if (fHistRes)
+    delete fHistRes;
+}
+
+// --------------------------------------------------------------------------
+//
+// 
+//
+void MFEventSelector2::SetUseOrigDistribution(Bool_t b)
+{
+  fUseOrigDistribution = b;
+ 
+  *fLog << "MFEventSelector2 : use the distribution from the input file as the target distribution"
+        << endl;
+}
+
+//---------------------------------------------------------------------------
 //
 // Recreate a MH3 from fHistNom used as a template. Copy the Binning
@@ -189 +211 @@
 
     *fLog << "-------------------------" << endl;
-    *fLog << "MFEventSelector2::ReadDistribution; read input file to generate the original distribution" << endl;
+    *fLog << "MFEventSelector2 : Start of eventloop to generate the original distribution" 
+          << endl;
 
     MEvtLoop run(GetName());
@@ -214 +237 @@
     if (!run.Eventloop())
     {
-        *fLog << err << dbginf << "Evtloop failed." << endl;
+        *fLog << err << dbginf << "Evtloop in MFEventSelector2::ReadDistribution failed." << endl;
         return kFALSE;
     }
@@ -222 +245 @@
     *fLog << "MFEventSelector2::ReadDistribution; Original distribution has " 
           << fHistOrig->GetHist().GetEntries() << " entries" << endl;
+    *fLog << "MFEventSelector2 : End of eventloop to generate the original distribution" 
+          << endl;
     *fLog << "-------------------------" << endl;
 
@@ -229 +254 @@
 // --------------------------------------------------------------------------
 //
-// After reading the histograms and arrays used for the random event
+// After reading the histograms the arrays used for the random event
 // selction are created. If a MStatusDisplay is set the histograms are
 // displayed there.
@@ -236 +261 @@
 {
     TH1 &ho = fHistOrig->GetHist();
-    TH1 &hn = fHistNom->GetHist();
-
-    fHistNom->SetTitle("Users Nominal Distribution");
-    fHistRes->SetTitle("Resulting Distribution");
+
+    //-------------------
+    // if requested
+    // set the nominal distribution equal to the original distribution
+
+    TH1 *hnp;
+    if (fUseOrigDistribution)
+      hnp = (TH1*)(fHistOrig->GetHist()).Clone();
+    else
+      hnp = &fHistNom->GetHist();
+
+    TH1 &hn = *hnp;
+    //--------------------
 
     // normalize to number of counts in primary distribution
@@ -268 +302 @@
     if (fNumMax>0)
     {
-        *fLog << "MFEventSelector2::PrepareHistograms; SCALE : fNumMax = "
-              << fNumMax << ",  hn.Integral() = "      << hn.Integral()
-              << ",  fNumMax/hn.Integral() = " << fNumMax/hn.Integral() 
-              << endl;
-
-        hn.Scale(fNumMax/hn.Integral());
+        *fLog << "MFEventSelector2::PrepareHistograms; requested no.of events = "
+              << fNumMax << ",  maximum no.of events possible = "      
+              << hn.Integral() << endl;
+
+        if (fNumMax > hn.Integral())
+        {
+          *fLog << "MFEventSelector2::PrepareHistograms; requested no.of events ("
+                << fNumMax << ") is too high" << endl;
+          *fLog << "                                     reduce it to "
+                << hn.Integral() << endl;
+        }
+
+        else 
+          hn.Scale(fNumMax/hn.Integral());
     }
 
@@ -297 +339 @@
         fNom[i] = (Long_t)(hn.GetBinContent(i+1)+0.5);
     }
+
+    if (fUseOrigDistribution)
+      delete hnp;
 }
 
@@ -362 +407 @@
     InitHistogram(fHistRes);
 
+    fHistNom->SetTitle("Users Nominal Distribution");
     fHistOrig->SetTitle("Primary Distribution");
+    fHistRes->SetTitle("Resulting Distribution");
 
     // Initialize online display if requested
@@ -369 +416 @@
         fHistOrig->Draw();
 
-    // Read primary distribution
+    // Generate primary distribution
     if (!ReadDistribution(*read))
         return kFALSE;
@@ -467 +514 @@
     return kTRUE;
 }
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.h

@@ -41 +41 @@
     TCanvas   *fCanvas;   //! canvas for online display
 
+    Bool_t fUseOrigDistribution;
+
     Bool_t fResult;
     Int_t fErrors[2];
@@ -57 +59 @@
     ~MFEventSelector2();
 
+    void SetUseOrigDistribution(Bool_t b=kTRUE);
+    MH3 *GetHistOrig()                       { return fHistOrig; }
+
     void SetNumMax(Long_t max=-1) { fNumMax = max; }
     Bool_t IsExpressionTrue() const { return fResult; }
@@ -64 +69 @@
 
 #endif
+
+
+

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -48 +48 @@
            MFCT1SelStandard.cc \
            MFCT1SelFinal.cc \
-           MFEnergySlope.cc
+           MFEnergySlope.cc \
+           MFRandomSplit.cc \
+           MFAntiFilter.cc
 
 SRCS    = $(SRCFILES)