Changeset 1668 for trunk/MagicSoft/Mars/mfilter

Timestamp:

11/25/02 09:12:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MF.cc (modified) (4 diffs)
• MFDataChain.cc (modified) (1 diff)
• MFEventSelector.cc (modified) (1 diff)
• MFEventSelector.h (modified) (2 diffs)
• MFilterList.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -244 +244 @@
     if (isrule)
     {
+        Int_t lvl = gLog.GetDebugLevel();
+        gLog.SetDebugLevel(1);
         newfilter = new MFDataChain(text.Data(), c, num);
         newfilter->SetName(Form("Chain%02d%c%f", level, c, num));
+        gLog.SetDebugLevel(lvl);
     }
     else
@@ -407 +410 @@
     }
 
-    if (!fFilter->PreProcess(plist))
+    if (!fFilter->CallPreProcess(plist))
     {
         *fLog << err << dbginf << "PreProcessing filters in ";
@@ -423 +426 @@
 Bool_t MF::Process()
 {
-    return fFilter->Process();
+    return fFilter->CallProcess();
 }
 
@@ -432 +435 @@
 Bool_t MF::PostProcess()
 {
-    return fFilter->PostProcess();
+    return fFilter->CallPostProcess();
 }
 

trunk/MagicSoft/Mars/mfilter/MFDataChain.cc

@@ -58 +58 @@
 //
 MFDataChain::MFDataChain(const char *member, const char type, const Double_t val,
-                           const char *name, const char *title)
+                         const char *name, const char *title)
     : fData(member), fValue(val)
 {

trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc

@@ -147 +147 @@
 Bool_t MFEventSelector::Process()
 {
-    Float_t evt = gRandom->Uniform();
+    const Float_t evt = gRandom->Uniform();
 
     if (fNumSelectEvts>0)

trunk/MagicSoft/Mars/mfilter/MFEventSelector.h

@@ -27 +27 @@
     void StreamPrimitive(ofstream &out) const;
 
+    Bool_t PreProcess(MParList *pList);
+    Bool_t Process();
+    Bool_t PostProcess();
+
     enum { kNumTotalFromFile = BIT(14) };
     /*
@@ -47 +51 @@
      */
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     ClassDef(MFEventSelector, 0) // A Filter to select events from files
 };

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -188 +188 @@
     //
     while ((filter=(MFilter*)Next()))
-        if (!filter->PreProcess(pList))
+        if (!filter->CallPreProcess(pList))
         {
             *fLog << err << "Error - Preprocessing Filter ";
@@ -212 +212 @@
     //
     while ((filter=(MFilter*)Next()))
-        if (!filter->Process())
+        if (!filter->CallProcess())
             return kFALSE;
 
@@ -232 +232 @@
     //
     while ((filter=(MFilter*)Next()))
-        if (!filter->PostProcess())
+        if (!filter->CallPostProcess())
             return kFALSE;