Changeset 2587 for trunk/MagicSoft/Mars

Timestamp:

12/02/03 14:33:36 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFEventSelector2.cc (modified) (14 diffs)
• mfilter/MFEventSelector2.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/12/02: Thomas Bretz
+ 
+   * mfilter/MFEventSelector2.[h,cc]:
+     - fixed and reorganized screen output
+     - added some small comments to the code
+     - moved some code from Process() to the new private function Select
+     - fixed uncounted events (underflow bins were not counted)
+     - renamed nonsens fErrors to fCounter
+     - fixed usage of fDisplay
+
+
 
  2003/12/01: Markus Gaug

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz,   01/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Wolfgang Wittek 11/2003 <mailto:wittek@mppmu.mpg.de>
+!   Author(s): Wolfgang Wittek 11/2003 <mailto:wittek@mppmu.mpg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2003
@@ -156 +156 @@
 // --------------------------------------------------------------------------
 //
-// 
+// Delete fHistRes if instatiated
 //
 MFEventSelector2::~MFEventSelector2()
 {
-  if (fHistRes)
-    delete fHistRes;
+    if (fHistRes)
+        delete fHistRes;
 }
 
@@ -170 +170 @@
 void MFEventSelector2::SetUseOrigDistribution(Bool_t b)
 {
-  fUseOrigDistribution = b;
- 
-  *fLog << "MFEventSelector2 : use the distribution from the input file as the target distribution"
-        << endl;
+    fUseOrigDistribution = b;
+
+    *fLog << inf;
+    *fLog << "MFEventSelector2 set ";
+    if (!b)
+        *fLog << "not ";
+    *fLog << "to use the distribution from the input file as target distribution." << endl;
 }
 
@@ -210 +213 @@
     }
 
-    *fLog << "-------------------------" << endl;
-    *fLog << "MFEventSelector2 : Start of eventloop to generate the original distribution" 
-          << endl;
+    *fLog << inf << underline << endl;
+    *fLog << "MFEventSelector2::ReadDistribution:" << endl;
+    *fLog << " - Start of eventloop to generate the original distribution..." << endl;
 
     MEvtLoop run(GetName());
@@ -243 +246 @@
     tlist.PrintStatistics(0, kTRUE);
 
-    *fLog << "MFEventSelector2::ReadDistribution; Original distribution has " 
-          << fHistOrig->GetHist().GetEntries() << " entries" << endl;
-    *fLog << "MFEventSelector2 : End of eventloop to generate the original distribution" 
-          << endl;
-    *fLog << "-------------------------" << endl;
+    *fLog << inf;
+    *fLog << "MFEventSelector2::ReadDistribution:" << endl;
+    *fLog << " - Original distribution has " << fHistOrig->GetHist().GetEntries() << " entries." << endl;
+    *fLog << " - End of eventloop to generate the original distribution." << endl;
 
     return read.Rewind();
@@ -266 +268 @@
     // set the nominal distribution equal to the original distribution
 
-    TH1 *hnp;
-    if (fUseOrigDistribution)
-      hnp = (TH1*)(fHistOrig->GetHist()).Clone();
-    else
-      hnp = &fHistNom->GetHist();
+    TH1 *hnp = fUseOrigDistribution ? (TH1*)(fHistOrig->GetHist()).Clone() : &fHistNom->GetHist();
 
     TH1 &hn = *hnp;
@@ -302 +300 @@
     if (fNumMax>0)
     {
-        *fLog << "MFEventSelector2::PrepareHistograms; requested no.of events = "
-              << fNumMax << ",  maximum no.of events possible = "      
-              << hn.Integral() << endl;
+        *fLog << inf;
+        *fLog << "MFEventSelector2::PrepareHistograms:" << endl;
+        *fLog << " - requested number of events = " << fNumMax << endl;
+        *fLog << " - maximum number 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;
+            *fLog << warn << "WARNING - Requested no.of events (" << fNumMax;
+            *fLog << ") is too high... reduced to " << hn.Integral() << endl;
         }
-
-        else 
-          hn.Scale(fNumMax/hn.Integral());
+        else
+            hn.Scale(fNumMax/hn.Integral());
     }
 
@@ -358 +354 @@
             return kFALSE;
         }
+        // FALLTHROUGH!
     case 2:
         if (!fDataY.PreProcess(parlist))
@@ -364 +361 @@
             return kFALSE;
         }
+        // FALLTHROUGH!
     case 1:
         if (!fDataX.PreProcess(parlist))
@@ -385 +383 @@
 Int_t MFEventSelector2::PreProcess(MParList *parlist)
 {
-    memset(fErrors, 0, sizeof(fErrors));
+    memset(fCounter, 0, sizeof(fCounter));
 
     MTaskList *tasklist = (MTaskList*)parlist->FindObject("MTaskList");
@@ -424 +422 @@
 
     return read->CallPreProcess(parlist);
+}
+
+// --------------------------------------------------------------------------
+//
+// Part of Process(). Select() at the end checks whether a selection should
+// be done or not. Under-/Overflowbins are rejected.
+//
+Bool_t MFEventSelector2::Select(Int_t bin)
+{
+    // under- and overflow bins are not counted
+    if (bin<0)
+        return kFALSE;
+
+    Bool_t rc = kFALSE;
+
+    if (gRandom->Rndm()*fIs[bin]<=fNom[bin])
+    {
+        // how many events do we still want to read in this bin
+        fNom[bin] -= 1;
+        rc = kTRUE;
+
+        // fill bin (same as Fill(valx, valy, valz))
+        TH1 &h = fHistRes->GetHist();
+        h.AddBinContent(bin+1);
+        h.SetEntries(h.GetEntries()+1);
+    }
+
+    // how many events are still pending to be read
+    fIs[bin] -= 1;
+
+    return rc;
 }
 
@@ -436 +465 @@
 Int_t MFEventSelector2::Process()
 {
-    fResult = kFALSE;
-
     // get x,y and z (0 if fData not valid)
     const Double_t valx=fDataX.GetValue();
@@ -443 +470 @@
     const Double_t valz=fDataZ.GetValue();
 
-
-    // get corresponding bin number
-    const Int_t bin = fHistNom->FindFixBin(valx, valy, valz)-1;
-
-    // under- and overflow bins are not counted
-    if (bin<0)
-        return kTRUE;
-
-
-    if (gRandom->Rndm()*fIs[bin]<=fNom[bin])
-    {
-        // how many events do we still want to read in this bin
-        fNom[bin]-=1;
-        fResult = kTRUE;
-
-        // fill bin (same as Fill(valx, valy, valz))
-        TH1 &h = fHistRes->GetHist();
-        h.AddBinContent(bin+1);
-        h.SetEntries(h.GetEntries()+1);
-    }
-    // how many events are still pending to be read
-    fIs[bin]-=1;
-
-    //----------------------
-    Int_t rc;
-    if (fResult)
-    {
-        rc = 0;
-        fErrors[rc]++;
-        return kTRUE;
-    }
-    rc = 1;
-    fErrors[rc]++;
-    //----------------------
+    // Get corresponding bin number and check
+    // whether a selection should be made
+    fResult = Select(fHistNom->FindFixBin(valx, valy, valz)-1);
+
+    fCounter[fResult ? 1 : 0]++;
 
     return kTRUE;
@@ -488 +486 @@
 {
     //---------------------------------
-    if (GetNumExecutions() != 0)
+
+    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()) 
+      *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3)
+            << (int)(fCounter[0]*100/GetNumExecutions())
             << "%) Events not selected" << endl;
 
-      *fLog << " " << fErrors[0] << " (" 
-            << (int)(fErrors[0]*100/GetNumExecutions()) 
-            << "%) Events selected!" << endl;
+      *fLog << " " << fCounter[0] << " ("
+            << (int)(fCounter[1]*100/GetNumExecutions())
+            << "%) Events selected" << endl;
       *fLog << endl;
     }
+
     //---------------------------------
 
-    if (!fCanvas || !fDisplay)
-        return kTRUE;
-
-    fCanvas->cd(4);
-    fHistRes->DrawClone("nonew");
-    fCanvas->Modified();
-    fCanvas->Update();
+    if (fDisplay && fDisplay->HasCanvas(fCanvas))
+    {
+        fCanvas->cd(4);
+        fHistRes->DrawClone("nonew");
+        fCanvas->Modified();
+        fCanvas->Update();
+    }
 
     return kTRUE;
 }
-
-
-
-
-
-
-
-
-

trunk/MagicSoft/Mars/mfilter/MFEventSelector2.h

@@ -44 +44 @@
 
     Bool_t fResult;
-    Int_t fErrors[2];
+    Int_t  fCounter[2];
 
     TH1   &InitHistogram(MH3* &hist);
@@ -50 +50 @@
     void   PrepareHistograms();
     Bool_t PreProcessData(MParList *parlist);
+    Bool_t Select(Int_t bin);
 
     Int_t PreProcess(MParList *parlist);