Changeset 7601

Timestamp:

03/14/06 14:46:06 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MContinue.cc (modified) (1 diff)
• mbase/MTask.cc (modified) (6 diffs)
• mbase/MTask.h (modified) (1 diff)
• mbase/MTaskEnv.cc (modified) (1 diff)
• mfbase/MF.cc (modified) (1 diff)
• mfbase/MFilterList.cc (modified) (3 diffs)
• mfbase/MFilterList.h (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -160 +160 @@
     GetFilter()->SetDisplay(fDisplay);
     GetFilter()->SetLogStream(fLog);
+    GetFilter()->SetAccelerator(GetAccelerator());
 
     // Remeber that the filter is not already in tasklist

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -115 +115 @@
 MTask::MTask(const char *name, const char *title)
     : fFilter(NULL), fSerialNumber(0), fIsPreprocessed(kFALSE),
-    fStopwatch(0), fNumExec0(0), fAccelerator(0)
+    fStopwatch(0), fNumExecutions(0), fNumExec0(0), fAccelerator(0)
 {
     fName  = name  ? name  : "MTask";
@@ -216 +216 @@
     // This does not reset the counter!
     fStopwatch->Reset();
+    fNumExecutions = 0;
     fNumExec0 = GetNumExecutionsTotal();
 
@@ -247 +248 @@
 // return value.
 // If Process is executed, the execution counter is increased.
-// Count cpu consumtion time.
+// Count cpu consumption time.
 //
 Int_t MTask::CallProcess()
@@ -256 +257 @@
     // this task.
     //
-    const Bool_t exec = fFilter ? fFilter->IsConditionTrue() : kTRUE;
-    if (!exec)
+    if (fFilter && !fFilter->IsConditionTrue())
         return kTRUE;
 
-    if (!HasAccelerator(kAccDontCount|kAccDontTime))
+    if (!HasAccelerator(kAccDontTime))
         fStopwatch->Start(kFALSE);
+
+    fNumExecutions++;
+
     const Int_t rc = Process();
+
     if (!HasAccelerator(kAccDontTime))
         fStopwatch->Stop();
@@ -381 +385 @@
 UInt_t MTask::GetNumExecutionsTotal() const
 {
-    return (UInt_t)fStopwatch->Counter()-1;
+    return fNumExecutions-1;
 }
 
@@ -436 +440 @@
     if (HasStreamId())
         *fLog << GetStreamId() << ":";
-    *fLog << GetDescriptor() << "\t";
-
-    if (HasAccelerator(kAccDontCount))
-        *fLog << "-/-";
-    else
-        *fLog << dec << GetNumExecutions();
+    *fLog << GetDescriptor() << "\t" << dec << GetNumExecutions();
 
     if (fFilter)

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -25 +25 @@
     enum {
         kAccStandard  = 0,
-        kAccDontCount = BIT(1),
-        kAccDontTime  = BIT(2),
-        kAccDontReset = BIT(3)
+        kAccDontTime  = BIT(1),
+        kAccDontReset = BIT(2)
     };
 
 private:
-    TList *fListOfBranches; //! List of Branch names for auto enabeling scheme
+    TList *fListOfBranches;     //! List of Branch names for auto enabeling scheme
 
-    MFilter *fFilter;       // Filter for conditional task execution
-    Byte_t   fSerialNumber; // Serial number having more than one detector of the same type
+    MFilter *fFilter;           // Filter for conditional task execution
+    Byte_t   fSerialNumber;     // Serial number having more than one detector of the same type
 
-    Bool_t fIsPreprocessed; //! Indicates the success of the PreProcessing (set by MTaskList)
+    Bool_t fIsPreprocessed;     //! Indicates the success of the PreProcessing (set by MTaskList)
 
-    TStopwatch *fStopwatch; //! Count the execution time and number of executions
-    UInt_t      fNumExec0;  //! Total number of executions at PreProcess
-    Byte_t      fAccelerator; //!
+    TStopwatch *fStopwatch;     //! Count the execution time and number of executions
+    UInt_t      fNumExecutions; //! Number of executions (also counted by fStopwatch, but faster)
+    UInt_t      fNumExec0;      //! Total number of executions at PreProcess
+    Byte_t      fAccelerator;   //!
 
     virtual Int_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskEnv.cc

@@ -143 +143 @@
 
     *fLog << fTask->ClassName() << " <MTaskEnv>... " << flush;
+
+    fTask->SetAccelerator(GetAccelerator());
     return fTask->CallPreProcess(list);
 }

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -364 +364 @@
     }
 
+    fF->SetAccelerator(GetAccelerator());
+
     if (!fF->CallPreProcess(plist))
     {

trunk/MagicSoft/Mars/mfbase/MFilterList.cc

@@ -262 +262 @@
 }
 
+void MFilterList::SetAccelerator(Byte_t acc)
+{
+    fFilters.ForEach(MTask, SetAccelerator)(acc);
+    MFilter::SetAccelerator(acc);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -276 +282 @@
     //
     while ((filter=(MFilter*)Next()))
+    {
+        filter->SetAccelerator(GetAccelerator());
         if (!filter->CallPreProcess(pList))
         {
@@ -282 +290 @@
             return kFALSE;
         }
+    }
 
     return kTRUE;

trunk/MagicSoft/Mars/mfbase/MFilterList.h

@@ -59 +59 @@
     Int_t PostProcess();
 
+    void SetAccelerator(Byte_t acc=kAccStandard);
+
     void SetVariables(const TArrayD &arr);
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -487 +487 @@
     // by setting it here it is distributed to all consecutive tasks
     tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);
-    read.SetAccelerator();//MTask::kAccDontReset|MTask::kAccDontCount);
 
     // Create and setup the eventloop