Changeset 5690 for trunk/MagicSoft/Mars/mfbase

Timestamp:

12/27/04 13:13:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

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

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc

@@ -116 +116 @@
 #include "MH3.h"            // MH3
 #include "MRead.h"          // MRead
-//#include "MProgressBar.h"   // 
 #include "MEvtLoop.h"       // MEvtLoop
 #include "MTaskList.h"      // MTaskList
@@ -158 +157 @@
 //     events outside these ranges won't be accepted).
 //
+//  Set default name of filter to be applied when determining the original
+//  distribution for all data on the input file to "FilterSelector2"
+//
 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), fHistIsProbability(kFALSE),
-  fUseOrigDist(kTRUE)
+    : fHistOrig(NULL), fHistNom(&hist), fHistRes(NULL),
+    fDataX(hist.GetRule('x')), fDataY(hist.GetRule('y')),
+    fDataZ(hist.GetRule('z')), fNumMax(-1), fCanvas(0),
+    fFilterName("FilterSelector2"), fHistIsProbability(kFALSE),
+    fUseOrigDist(kTRUE)
 {
     fName  = name  ? (TString)name  : gsDefName;
     fTitle = title ? (TString)title : gsDefTitle;
-
-    // name of filter to be applied when determining the original distribution
-    // for all data on the input file
-    fFilterName = "FilterSelector2";
 }
 
@@ -216 +215 @@
     }
 
-    *fLog << inf << underline << endl;
-    *fLog << "MFEventSelector2::ReadDistribution:" << endl;
-    *fLog << "**********************" << endl;
-    *fLog << " - Start of eventloop to generate the original distribution..." 
-          << endl;
+    *fLog << inf;
+    fLog->Separator("MFEventSelector2::ReadDistribution");
+    *fLog << " - Start of eventloop to generate the original distribution..." << endl;
 
     if (filter != NULL)
-    {
-      *fLog << "                      filter used : " << filter->GetName()
-            << endl;
-    }
+        *fLog << " - filter used: " << filter->GetDescriptor() << endl;
 
 
     MEvtLoop run("ReadDistribution");
-    //MProgressBar bar;
-    //run.SetProgressBar(&bar);
 
     MParList plist;
@@ -264 +256 @@
     if (!run.Eventloop())
     {
-        *fLog << err << dbginf 
-              << "Evtloop in MFEventSelector2::ReadDistribution failed." 
-              << endl;
-        return kFALSE;
-    }
-
-    tlist.PrintStatistics(0, kTRUE);
+        *fLog << err << dbginf << "Evtloop failed... abort." << endl;
+        return kFALSE;
+    }
+
+    tlist.PrintStatistics();
 
     *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;
-    *fLog << "**********************" << endl;
+    *fLog << " - Original distribution has " << fHistOrig->GetHist().GetEntries() << " entries." << endl;
+    *fLog << " - End of eventloop to generate the original distribution." << endl;
+    fLog->Separator();
 
     return read.Rewind();
@@ -447 +435 @@
     if (!read)
     {
-        *fLog << err << "MRead not found... abort." << endl;
+        *fLog << err << "MRead not found in tasklist... abort." << endl;
         return kFALSE;
     }
 
     MFilter *filter = (MFilter*)tasklist->FindObject(fFilterName);
-    if (!filter)
-    {
-      *fLog << inf 
-            << "No filter will be used when making the original distribution"
-            << endl;
-      filter = NULL;
-    }
-
+    if (!filter || !filter->InheritsFrom(MFilter::Class()))
+    {
+        *fLog << inf << "No filter will be used when making the original distribution" << endl;
+        filter = NULL;
+    }
 
     if (!ReadDistribution(*read, filter))
         return kFALSE;
-
 
     // Prepare histograms and arrays for selection
     PrepareHistograms();
 
-    *fLog << "MFEventSelector2::PreProcess; call PreProcess() for read and filter object again"
-          << endl;
-    Int_t rcr = read->CallPreProcess(parlist);
-    Int_t rcf = filter->CallPreProcess(parlist);
-
-    *fLog << "rcr, rcf = " << rcr << ",  " << rcf << endl;
-
-    return rcf*rcr;
+    *fLog << all << "PreProcess..." << flush;
+    const Int_t rcf = filter->CallPreProcess(parlist);
+    if (rcf!=kTRUE)
+        return rcf;
+
+    const Int_t rcr = read->CallPreProcess(parlist);
+    return rcr;
 }
 

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.h

@@ -41 +41 @@
     TCanvas   *fCanvas;   //! canvas for online display
 
-    TString    fFilterName; // name of the MFilter object to be used
-                            // when determining the original distribution
+    TString    fFilterName; // name of the MFilter object to be used when determining the original distribution
 
     Bool_t fResult;
     Bool_t fHistIsProbability;
-    Bool_t fUseOrigDist;    // flag indicating that in the selection the
-                            // original distribution is not changed
+    Bool_t fUseOrigDist;    // flag indicating that in the selection the original distribution is not changed
 
     Int_t  fCounter[3];