Changeset 2357 for trunk/MagicSoft/Mars/mfilter

Timestamp:

09/24/03 13:29:00 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFEventSelector2.cc (modified) (8 diffs)
• MFEventSelector2.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.cc

@@ -188 +188 @@
     }
 
+    *fLog << "-------------------------" << endl;
+    *fLog << "MFEventSelector2::ReadDistribution; read input file to generate the original distribution" << endl;
+
     MEvtLoop run(GetName());
     MParList plist;
@@ -215 +218 @@
     }
 
+    tlist.PrintStatistics(0, kTRUE);
+
+    *fLog << "MFEventSelector2::ReadDistribution; Original distribution has " 
+          << fHistOrig->GetHist().GetEntries() << " entries" << endl;
+    *fLog << "-------------------------" << endl;
+
     return read.Rewind();
 }
@@ -259 +268 @@
     if (fNumMax>0)
     {
-        cout << "SCALE: " << fNumMax/hn.Integral() << endl;
-        cout << "SCALE: " << fNumMax << endl;
-        cout << "SCALE: " << hn.Integral() << endl;
+        *fLog << "MFEventSelector2::PrepareHistograms; SCALE : fNumMax = "
+              << fNumMax << ",  hn.Integral() = "      << hn.Integral()
+              << ",  fNumMax/hn.Integral() = " << fNumMax/hn.Integral() 
+              << endl;
+
         hn.Scale(fNumMax/hn.Integral());
     }
@@ -329 +340 @@
 Int_t MFEventSelector2::PreProcess(MParList *parlist)
 {
+    memset(fErrors, 0, sizeof(fErrors));
+
     MTaskList *tasklist = (MTaskList*)parlist->FindObject("MTaskList");
     if (!tasklist)
@@ -383 +396 @@
     const Double_t valz=fDataZ.GetValue();
 
+
     // get corresponding bin number
     const Int_t bin = fHistNom->FindFixBin(valx, valy, valz)-1;
@@ -389 +403 @@
     if (bin<0)
         return kTRUE;
+
 
     if (gRandom->Rndm()*fIs[bin]<=fNom[bin])
@@ -404 +419 @@
     fIs[bin]-=1;
 
+    //----------------------
+    Int_t rc;
+    if (fResult)
+    {
+        rc = 0;
+        fErrors[rc]++;
+        return kTRUE;
+    }
+    rc = 1;
+    fErrors[rc]++;
+    //----------------------
+
     return kTRUE;
 }
@@ -413 +440 @@
 Int_t MFEventSelector2::PostProcess()
 {
+    //---------------------------------
+    if (GetNumExecutions() != 0)
+    {
+      *fLog << inf << endl;
+      *fLog << GetDescriptor() << " execution statistics:" << endl;
+      *fLog << dec << setfill(' ');
+      *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) 
+            << (int)(fErrors[1]*100/GetNumExecutions()) 
+            << "%) Events not selected" << endl;
+
+      *fLog << " " << fErrors[0] << " (" 
+            << (int)(fErrors[0]*100/GetNumExecutions()) 
+            << "%) Events selected!" << endl;
+      *fLog << endl;
+    }
+    //---------------------------------
+
     if (!fCanvas || !fDisplay)
         return kTRUE;

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.h

@@ -42 +42 @@
 
     Bool_t fResult;
+    Int_t fErrors[2];
 
     TH1   &InitHistogram(MH3* &hist);