Changeset 1270

Timestamp:

04/05/02 14:17:06 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTaskList.cc (modified) (4 diffs)
• mgui/MGeomPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
    * mbase/MEvtLoop.h:
      - added GetTaskList
+
+   * mbase/MTaskList.[h,cc]:
+     - introduced fTasksProcess which contains only the tasks
+       which overloads the process function so that processing
+       tasks doesn't waste time if a tasks doesn't have the process
+       function
 
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -57 +57 @@
 #include "MTaskList.h"
 
+#include <TClass.h>
 #include <TOrdCollection.h>
 
@@ -266 +267 @@
     fParList = pList;
 
+    fTasksProcess.Delete();
+
     //
     //  create the Iterator over the tasklist
@@ -279 +282 @@
     {
         *fLog << all << task->GetName() << "... " << flush;
+
+        TClass *cls=NULL;
+        TIter NextBase(task->IsA()->GetListOfBases());
+        while ((cls=(TClass*)NextBase()))
+        {
+            if (cls->GetName()=="MTask")
+                break;
+
+            if (!cls->GetMethodAny("Process"))
+                continue;
+
+            fTasksProcess.Add(task);
+            break;
+        }
 
         switch (task->CallPreProcess(fParList))
@@ -322 +339 @@
     //  create the Iterator for the TaskList
     //
-    TIter Next(fTasks);
+    TIter Next(&fTasksProcess);
     MTask *task=NULL;
 

trunk/MagicSoft/Mars/mgui/MGeomPix.h

@@ -9 +9 @@
 { 
 private:
-    Float_t fX;  // [mm] the x coordinate
-    Float_t fY;  // [mm] the y coordinate
-    Float_t fR;  // [mm] the r coordinate
+    Float_t fX;  // [mm] the x coordinate of the center
+    Float_t fY;  // [mm] the y coordinate of the center
+    Float_t fR;  // [mm] the r coordinate of the pixel (dist between two parallel sides)
 
     Byte_t  fNumNeighbors; // number of valid neighbors
@@ -35 +35 @@
     Float_t GetR() const  { return fR; }
 
-    Float_t GetA() const  { return fR*fR*3; } // FIXME: Algorithm! A hexagonal shape is assumed!
+    Float_t GetA() const;
 
     Byte_t  GetNumNeighbors() const { return fNumNeighbors; }