Changeset 2574 for trunk/MagicSoft/Mars/mfilter

Timestamp:

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

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• FilterLinkDef.h (modified) (1 diff)
• MFAntiFilter.cc (added)
• MFAntiFilter.h (added)
• MFEventSelector2.cc (modified) (13 diffs)
• MFEventSelector2.h (modified) (3 diffs)
• MFRandomSplit.cc (added)
• MFRandomSplit.h (added)
• Makefile (modified) (1 diff)

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)