Changeset 1528

Timestamp:

09/17/02 11:50:21 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHillas.cc (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• mbase/MParList.cc (modified) (1 diff)
• mbase/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/09/16: Thomas Bretz
+
+   * manalysis/MCerPhotPix.cc:
+     - shortened output
+
+   * mbase/MEvtLoop.cc:
+     - added a better progressbar support, if MReadTree or MReadMarsFile
+       exists in the Tasklist 
+
+   * mbase/MTaskList.cc:
+     - fixed a bug which caused MParList::Reset not to be called anymore
+       as soon as kCONTINUE was called once.
+
+   * mfileio/MReadTree.[h,cc]:
+     - added AddFiles member function
+
+   * mmain/MProgressBar.[h,cc]:
+     - added as a simple Progress meter for eventloops
+
+   * mmain/Makefile, mmain/MainLinkDef.h:
+     - added MProgressBar
+
+   * manalysis/MHillas.cc:
+     - removed warning in case of no photons. problems with Thomas' files.
+
+   * mbase/Makefile:
+     - added mfileio
+
 
  2002/09/16: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -261 +261 @@
         const Float_t nphot = pix.GetNumPhotons();
 
-        if (nphot==0)
-            *fLog << warn << GetDescriptor() << ": Pixel #" << pix.GetPixId() << " has no photons." << endl;
+        //if (nphot==0)
+        //    *fLog << warn << GetDescriptor() << ": Pixel #" << pix.GetPixId() << " has no photons." << endl;
 
         fSize  += nphot;                             // [counter]

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -84 +84 @@
 #include "MParList.h"
 #include "MTaskList.h"
+#ifdef __MARS__
+#include "MReadTree.h"       // for setting progress bar
+#endif
 
 ClassImp(MEvtLoop);
@@ -190 +193 @@
     *fLog << " events)..." << flush;
 
-    if (fProgress && maxcnt>0)
-        fProgress->SetRange(0, maxcnt);
+    if (fProgress)
+    {
+        if (maxcnt>0)
+            fProgress->SetRange(0, maxcnt);
+#ifdef __MARS__
+        else
+        {
+            MReadTree *read = (MReadTree*)fTaskList->FindObject("MReadTree");
+            if (!read)
+                read = (MReadTree*)fTaskList->FindObject("MReadMarsFile");
+            if (read)
+                fProgress->SetRange(0, read->GetEntries());
+        }
+#endif
+    }
 
     Int_t dummy = maxcnt<0 ? 0 : maxcnt;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -530 +530 @@
 {
     fContainer->ForEach(MParContainer, Reset)();
- }
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc
+INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio
 
 # @code