Changeset 1936 for trunk

Timestamp:

04/10/03 10:43:24 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MFilter.cc (modified) (1 diff)
• mbase/MFilter.h (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• merpp.cc (modified) (1 diff)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)
• mfilter/MF.cc (modified) (1 diff)
• mfilter/MFilterList.cc (modified) (2 diffs)
• mhist/MHHadronness.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
    * mbase/MTaskList.[h,cc]:
      - added RemoveFromList-function
+
+   * merpp.cc:
+     - fixed typo
+     
+   * mbase/MFilter.[h,cc]:
+     - removed unnecessary base functions for Pre//PostProcess
+   
+   * mbase/MTask.cc, mfileio/MCT1ReadPreProc.cc, mfileio/MReadTree.cc,
+     mfilter/MF.cc, mfilter/MFilterList.cc
+     - implemented IsConditionalTrue to support inverted filters
+
+   * mhist/MHHadronness.cc:
+     - removed unnecessary check
 
 

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -72 +72 @@
 ClassImp(MFilter);
 
-MFilter::MFilter(const char *name, const char *title)
+MFilter::MFilter(const char *name, const char *title) : fInverted(kFALSE)
 {
     fName  = name  ? name  : "MFilter";
     fTitle = title ? title : "Base Class for a filter";
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::PreProcess(MParList *pList)
-{
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::Process()
-{
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::PostProcess()
-{
-    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mbase/MFilter.h

@@ -11 +11 @@
 {
 private:
-    virtual Bool_t PreProcess(MParList *pList);
-    virtual Bool_t Process();
-    virtual Bool_t PostProcess();
+    Bool_t fInverted;
+
+    virtual Bool_t IsExpressionTrue() const = 0;
 
 public:
     MFilter(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t IsExpressionTrue() const = 0;
     virtual TString GetRule() const;
+
+    Bool_t IsConditionTrue() const { return fInverted ? !IsExpressionTrue() : IsExpressionTrue(); }
+
+    void SetInverted(Bool_t i) { fInverted=i; }
+    Bool_t IsInverted() const  { return fInverted; }
 
     ClassDef(MFilter, 0)                // Abstract base class for the filters

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -198 +198 @@
     // this task.
     //
-    const Bool_t exec = fFilter ? fFilter->IsExpressionTrue() : kTRUE;
+    const Bool_t exec = fFilter ? fFilter->IsConditionTrue() : kTRUE;
 
     if (!exec)

trunk/MagicSoft/Mars/merpp.cc

@@ -131 +131 @@
 
     //
-    // create the looping object and thell it about the parameters to use
+    // create the looping object and tell it about the parameters to use
     // and the tasks to execute
     //

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -1068 +1068 @@
         // Skip Event
         //
-        if (!GetSelector()->IsExpressionTrue())
+        if (!GetSelector()->IsConditionTrue())
         {
             fIn->seekg(sizeof(struct eventrecord), ios::cur);

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -732 +732 @@
         // Skip Event
         //
-        if (!GetSelector()->IsExpressionTrue())
+        if (!GetSelector()->IsConditionTrue())
         {
             fNumEntry++;

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -449 +449 @@
 Bool_t MF::IsExpressionTrue() const
 {
-    return fF->IsExpressionTrue();
+    return fF->IsConditionTrue();
 }
 

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -105 +105 @@
         return kTRUE;
 
-    Bool_t rc = filter->IsExpressionTrue();
+    Bool_t rc = filter->IsConditionTrue();
 
     //
@@ -114 +114 @@
     case kEAnd:
         while ((filter=(MFilter*)Next()))
-            rc &= filter->IsExpressionTrue();
+            rc &= filter->IsConditionTrue();
         break;
 
     case kEOr:
         while ((filter=(MFilter*)Next()))
-            rc |= filter->IsExpressionTrue();
+            rc |= filter->IsConditionTrue();
         break;
 
     case kEXor:
         while ((filter=(MFilter*)Next()))
-            rc ^= filter->IsExpressionTrue();
+            rc ^= filter->IsConditionTrue();
         break;
 
     case kELAnd:
         while ((filter=(MFilter*)Next()))
-            rc = (rc && filter->IsExpressionTrue());
+            rc = (rc && filter->IsConditionTrue());
         break;
 
     case kELOr:
         while ((filter=(MFilter*)Next()))
-            rc = (rc || filter->IsExpressionTrue());
+            rc = (rc || filter->IsConditionTrue());
         break;
     }

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -270 +270 @@
     for (Int_t i=1; i<=n; i++)
     {
-        const Stat_t ip = sump!=0 ? fPhness->Integral(1, i) : 0;
-        const Stat_t ig = sumg!=0 ? fGhness->Integral(1, i) : 0;
+        const Stat_t ip = fPhness->Integral(1, i);
+        const Stat_t ig = fGhness->Integral(1, i);
 
         fIntPhness->SetBinContent(i, ip);