Changeset 5429 for trunk/MagicSoft/Mars/mfbase

Timestamp:

11/18/04 15:35:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

• MFEventSelector2.cc (modified) (6 diffs)
• MFEventSelector2.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc

@@ -150 +150 @@
 //     variable(s) of interest and the binnings)
 //
-
 MFEventSelector2::MFEventSelector2(MH3 &hist, const char *name, const char *title)
 : fHistOrig(NULL), fHistNom(&hist), fHistRes(NULL),
   fDataX(hist.GetRule('x')), fDataY(hist.GetRule('y')),
-  fDataZ(hist.GetRule('z')), fNumMax(-1)
+  fDataZ(hist.GetRule('z')), fNumMax(-1), fHistIsProbability(kFALSE)
 {
     fName  = name  ? (TString)name  : gsDefName;
@@ -384 +383 @@
     }
 
-    MRead *read = (MRead*)tasklist->FindObject("MRead");
-    if (!read)
-    {
-        *fLog << err << "MRead not found... abort." << endl;
-        return kFALSE;
-    }
-
     if (!PreProcessData(parlist))
         return kFALSE;
+
+    fHistNom->SetTitle(fHistIsProbability ? "ProbabilityDistribution" : "Users Nominal Distribution");
+
+    if (fHistIsProbability)
+        return kTRUE;
 
     InitHistogram(fHistOrig);
     InitHistogram(fHistRes);
 
-    fHistNom->SetTitle("Users Nominal Distribution");
     fHistOrig->SetTitle("Primary Distribution");
     fHistRes->SetTitle("Resulting Distribution");
@@ -407 +403 @@
 
     // Generate primary distribution
+    MRead *read = (MRead*)tasklist->FindObject("MRead");
+    if (!read)
+    {
+        *fLog << err << "MRead not found... abort." << endl;
+        return kFALSE;
+    }
+
     if (!ReadDistribution(*read))
         return kFALSE;
@@ -445 +448 @@
 
     return rc;
+}
+
+Bool_t MFEventSelector2::SelectProb(Int_t ibin) const
+{
+    //
+    // If value is outside histogram range, accept event
+    //
+    return ibin<0 ? kTRUE : fHistNom->GetHist().GetBinContent(ibin) > gRandom->Uniform();
 }
 
@@ -462 +473 @@
     const Double_t valz=fDataZ.GetValue();
 
+    const Int_t ibin = fHistNom->FindFixBin(valx, valy, valz)-1;
+
     // Get corresponding bin number and check
     // whether a selection should be made
-    fResult = Select(fHistNom->FindFixBin(valx, valy, valz)-1);
+    fResult = fHistIsProbability ? Select(ibin) : SelectProb(ibin);
 
     fCounter[fResult ? 1 : 0]++;
@@ -481 +494 @@
     if (GetNumExecutions()>0)
     {
-      *fLog << inf << endl;
-      *fLog << GetDescriptor() << " execution statistics:" << endl;
-      *fLog << dec << setfill(' ');
-      *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3)
-            << (int)(fCounter[0]*100/GetNumExecutions())
-            << "%) Events not selected" << endl;
-
-      *fLog << " " << fCounter[0] << " ("
-            << (int)(fCounter[1]*100/GetNumExecutions())
-            << "%) Events selected" << endl;
-      *fLog << endl;
+        *fLog << inf << endl;
+        *fLog << GetDescriptor() << " execution statistics:" << endl;
+        *fLog << dec << setfill(' ');
+        *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3)
+              << (int)(fCounter[0]*100/GetNumExecutions())
+              << "%) Events not selected" << endl;
+
+        *fLog << " " << fCounter[0] << " ("
+              << (int)(fCounter[1]*100/GetNumExecutions())
+              << "%) Events selected" << endl;
+        *fLog << endl;
     }
 

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.h

@@ -42 +42 @@
 
     Bool_t fResult;
+    Bool_t fHistIsProbability;
     Int_t  fCounter[2];
 
@@ -49 +50 @@
     Bool_t PreProcessData(MParList *parlist);
     Bool_t Select(Int_t bin);
+    Bool_t SelectProb(Int_t bin) const;
 
     Int_t PreProcess(MParList *parlist);
@@ -61 +63 @@
 
     void SetNumMax(Long_t max=-1) { fNumMax = max; }
+    void SetHistIsProbability(Bool_t b=kTRUE) { fHistIsProbability=b; }
     Bool_t IsExpressionTrue() const { return fResult; }