Changeset 2693 for trunk/MagicSoft/Mars/mfilter

Timestamp:

12/17/03 16:54:33 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFEventSelector2.cc (modified) (5 diffs)
• MFEventSelector2.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.cc

@@ -136 +136 @@
 //     would result in redistributing cos(Theta).
 //
-//  If 'fUseOrigDistribution' is set to kTRUE (by SetUseOrigDistribution())
+//  If the reference distribution doesn't contain entries (GetEntries()==0)
 //     the original distribution will be used as the nominal distribution;
 //     note that also in this case a dummy nominal distribution has to be
@@ -150 +150 @@
     fName  = name  ? (TString)name  : gsDefName;
     fTitle = title ? (TString)title : gsDefTitle;
- 
-    fUseOrigDistribution = kFALSE;
 }
 
@@ -162 +160 @@
     if (fHistRes)
         delete fHistRes;
-}
-
-// --------------------------------------------------------------------------
-//
-// 
-//
-void MFEventSelector2::SetUseOrigDistribution(Bool_t b)
-{
-    fUseOrigDistribution = b;
-
-    *fLog << inf;
-    *fLog << "MFEventSelector2 set ";
-    if (!b)
-        *fLog << "not ";
-    *fLog << "to use the distribution from the input file as target distribution." << endl;
 }
 
@@ -268 +251 @@
     // set the nominal distribution equal to the original distribution
 
-    TH1 *hnp = fUseOrigDistribution ? (TH1*)(fHistOrig->GetHist()).Clone() : &fHistNom->GetHist();
+    const Bool_t useorigdist = fHistNom->GetHist().GetEntries()==0;
+    TH1 *hnp =  useorigdist ? (TH1*)(fHistOrig->GetHist()).Clone() : &fHistNom->GetHist();
 
     TH1 &hn = *hnp;
@@ -336 +320 @@
     }
 
-    if (fUseOrigDistribution)
+    if (useorigdist)
       delete hnp;
 }

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.h

@@ -41 +41 @@
     TCanvas   *fCanvas;   //! canvas for online display
 
-    Bool_t fUseOrigDistribution;
-
     Bool_t fResult;
     Int_t  fCounter[2];
@@ -60 +58 @@
     ~MFEventSelector2();
 
-    void SetUseOrigDistribution(Bool_t b=kTRUE);
-    MH3 *GetHistOrig()                       { return fHistOrig; }
+    MH3 *GetHistOrig() { return fHistOrig; }
 
     void SetNumMax(Long_t max=-1) { fNumMax = max; }