Changeset 7554 for trunk/MagicSoft/Mars

Timestamp:

03/01/06 17:20:46 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTask.h (modified) (3 diffs)
• mbase/MTaskList.cc (modified) (2 diffs)
• mbase/MTaskList.h (modified) (1 diff)
• mimage/MImagePar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
      - added MHSrcPosCam
 
+   * mbase/MTask.[h,cc]:
+     - implemented a new data-meber fAccelerator which allows
+       to switch off counting and timing analysis which can be very
+       time-consuming in some circumstances
+
+   * mbase/MTaskList.[h,cc]:
+     - implemented the usabe of MTask::fAccelerator to switch off resetting
+       of all parameter containers which can be very time-consuming
+
+   * mimage/MImagePar.cc:
+     - updated how the units are printed in Print()
+
+
 
 

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -22 +22 @@
 class MTask : public MInputStreamID
 {
+public:
+    enum {
+        kAccStandard  = 0,
+        kAccDontCount = BIT(1),
+        kAccDontTime  = BIT(2),
+        kAccDontReset = BIT(3)
+    };
+
 private:
     TList *fListOfBranches; //! List of Branch names for auto enabeling scheme
@@ -32 +40 @@
     TStopwatch *fStopwatch; //! Count the execution time and number of executions
     UInt_t      fNumExec0;  //! Total number of executions at PreProcess
+    Byte_t      fAccelerator; //!
 
     virtual Int_t PreProcess(MParList *pList);
@@ -80 +89 @@
     void SetDisplay(MStatusDisplay *d);
 
+    // Acceleration Control
+    virtual void SetAccelerator(Byte_t acc=kAccStandard) { fAccelerator=acc; }
+    Byte_t GetAccelerator() const { return fAccelerator; }
+    Bool_t HasAccelerator(Byte_t acc) const { return fAccelerator&acc; }
+
     // Function for parallel executions
     static TString AddSerialNumber(const char *str, UInt_t num) { TString s(str); if (num==0) return s; s += ";"; s += num; return s; }

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -158 +158 @@
 }
 
+void MTaskList::SetAccelerator(Byte_t acc)
+{
+    fTasks->ForEach(MTask, SetAccelerator)(acc);
+    MTask::SetAccelerator(acc);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -553 +559 @@
     {
         fParList->SetBit(MParList::kIsProcessing);
-        fParList->Reset();
+        if (!HasAccelerator(kAccDontReset))
+            fParList->Reset();
     }
 

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -42 +42 @@
     void SetLogStream(MLog *log);
     void SetDisplay(MStatusDisplay *d);
+    void SetAccelerator(Byte_t acc=kAccStandard);
 
     Bool_t AddToListBefore(MTask *task, const MTask *where, const char *tType="All");

trunk/MagicSoft/Mars/mimage/MImagePar.cc

@@ -110 +110 @@
     *fLog << " - Sat.Pixels (HG)  [#] = " << fNumSatPixelsHG   << " Pixels" << endl;
     *fLog << " - Sat.Pixels (LG)  [#] = " << fNumSatPixelsLG   << " Pixels" << endl;
-    *fLog << " - Num rmvd CorePix [#] = " << fNumSinglePixels  << " Pixels" << endl;
-    *fLog << " - Sz  rmvd CorePix [#] = " << fSizeSinglePixels << " CerPhot" << endl;
-    *fLog << " - Size Sub Islands [#] = " << fSizeSubIslands   << " CerPhot" << endl;
-    *fLog << " - Size Main Island [#] = " << fSizeMainIsland   << " CerPhot" << endl;
+    *fLog << " - No rmvd CorePx   [#] = " << fNumSinglePixels  << " Pixels" << endl;
+    *fLog << " - Sz rmvd CorePx [phe] = " << fSizeSinglePixels << endl;
+    *fLog << " - Sz Sub Islands [phe] = " << fSizeSubIslands   << endl;
+    *fLog << " - Sz Main Island [phe] = " << fSizeMainIsland   << endl;
 }