Changeset 1572

Timestamp:

10/31/02 14:30:11 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• manalysis/MBlindPixelCalc.h (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (4 diffs)
• mfileio/MReadTree.h (modified) (1 diff)
• mhist/MBinning.h (modified) (1 diff)
• mhist/MH.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/10/31: Thomas Bretz
+
+   * mfileio/MReadTree.cc:
+     - enhanced the validity of the fNuMEntries workaround from
+       3.02.06 to 3.07.01
+
+   * manalysis/MBlindPixelCalc.h, mhist/MBinning.h:
+     - added an explicit cast to get rid of a compiler warning on Alpha
+
+   * mhist/MH.cc:
+     - removed an unused variable to get rid of a compiler warning on Alpha
+
+
+
  2002/10/30: Thomas Bretz
 
@@ -13 +27 @@
      - implementation which makes sure, that the number of events returned 
        by GetEntries always is the correct value.
+     - removed const from the GetEntries definition
      - mainly use GetEntries now instead of fNumEntries
 
@@ -944 +959 @@
  2002/07/16: Thomas Bretz
 
+   * macros/plot.C, macros/plot2.C, macros/star.C, macros/comprob.C:
+     - updated the comments in the macros
+     
    * mgui/MHexagon.cc:
      - added a sanity check in DistanceToPrimitive

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.h

@@ -51 +51 @@
 
     void SetPixels(Int_t num, Short_t *ids);
-    void SetPixels(const TArrayS pix) { SetPixels(pix.GetSize(), pix.GetArray()); }
+    void SetPixels(const TArrayS pix) { SetPixels((Int_t)pix.GetSize(), (Short_t*)pix.GetArray()); }
     virtual Bool_t ReInit(MParList *pList);
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -59 +59 @@
 #include <TOrdCollection.h>
 
-#include "MLog.h"
-#include "MLogManip.h"
-
 #include "MChain.h"
 #include "MFilter.h"
@@ -67 +64 @@
 #include "MTaskList.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+
 ClassImp(MReadTree);
 
@@ -74 +75 @@
 //
 MReadTree::MReadTree()
-    : fNumEntry(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE), fProgress(NULL)
+    : fNumEntry(0), fNumEntries(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE), fProgress(NULL)
 {
     fName  = "MReadTree";
@@ -534 +535 @@
 
         //
-        // Check whether a Pointer to a pointer already exists, if
-        // we created one already delete it.
+        // Check whether a Pointer to a pointer already exists.
+        // If we created one already, delete it.
         //
         TChainElement *element = (TChainElement*)fChain->GetStatus()->FindObject(bname);

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -59 +59 @@
     Bool_t SetEventNum(UInt_t nr);    // set number of event (position in tree)
 
-    UInt_t GetEventNum() const { return fNumEntry;   }
+    UInt_t GetEventNum() const { return fNumEntry; }
     UInt_t GetEntries();
 

trunk/MagicSoft/Mars/mhist/MBinning.h

@@ -47 +47 @@
     Int_t GetNumBins() const { return fEdges.GetSize()-1; }
 
-    Double_t *GetEdges() const { return fEdges.GetArray(); }
+    Double_t *GetEdges() const { return (Double_t*)fEdges.GetArray(); }
 
     Bool_t IsLinear() const { return fType==kIsLinear; }

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -468 +468 @@
         umax = 0;
 
-    Int_t n=0;
     Double_t binlow  =0;
     Double_t binhigh =0;
     Double_t binwidth=0;
-    TGaxis::Optimize(umin, umax, nbins, binlow, binhigh, n, binwidth, "");
+    //TGaxis::Optimize(umin, umax, nbins, binlow, binhigh, n, binwidth, "");
 
     if (binwidth <= 0 || binwidth > 1.e+39)