Changeset 1568 for trunk/MagicSoft

Timestamp:

10/30/02 17:09:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCameraSmooth.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (10 diffs)
• mfileio/MReadTree.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/10/30: Thomas Bretz
+
+   * mhist/MHMatrix.cc:
+     - changed the return value for the kernel method from log to -log
+     - fixed a typo in an error message
+     - fixed a crash in case the matrix is singular
+
+   * mhist/MMultiDimDistCalc.cc:
+     - check whether calculation of the distance succeeded
+
+   * mfileio/MReadTree.[h,cc]:
+     - implementation which makes sure, that the number of events returned 
+       by GetEntries always is the correct value.
+     - mainly use GetEntries now instead of fNumEntries
+
+
+
  2002/10/29: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MCameraSmooth.cc

@@ -44 +44 @@
 #include "MCerPhotEvt.h"
 #include "MBlindPixels.h"
-
-#include "MMcRunHeader.hxx"
 
 ClassImp(MCameraSmooth);

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -98 +98 @@
 MReadTree::MReadTree(const char *tname, const char *fname,
                      const char *name, const char *title)
-    : fNumEntry(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE), fProgress(NULL)
+    : fNumEntry(0), fNumEntries(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE), fProgress(NULL)
 {
     fName  = name  ? name  : "MReadTree";
@@ -119 +119 @@
 
     if (fname)
-        fChain->Add(fname);
+        if (fChain->Add(fname)>0)
+            SetBit(kChainWasChanged);
 }
 
@@ -198 +199 @@
     // returns the number of file which were added
     //
-    return fChain->Add(fname);
+
+    const Int_t numfiles = fChain->Add(fname);
+
+    if (numfiles>0)
+        SetBit(kChainWasChanged);
+
+    return numfiles;
 }
 
@@ -215 +222 @@
     while ((obj=Next()))
         rc += AddFile(obj->GetTitle());
+
+    if (rc>0)
+        SetBit(kChainWasChanged);
 
     return rc;
@@ -391 +401 @@
     }
 */
+}
+
+// --------------------------------------------------------------------------
+//
+//  If the chain has been changed (by calling AddFile or using a file
+//  in the constructors argument) the number of entries is newly
+//  calculated from the files in the chain - this may take a while.
+//  The number of entries is returned.
+//
+UInt_t MReadTree::GetEntries()
+{
+    if (TestBit(kChainWasChanged))
+    {
+        fNumEntries = (UInt_t)fChain->GetEntries();
+        ResetBit(kChainWasChanged);
+    }
+    return fNumEntries;
 }
 
@@ -433 +460 @@
     // get number of events in this tree
     //
-    fNumEntries = (UInt_t)fChain->GetEntries();
-
-    if (!fNumEntries)
+    if (!GetEntries())
     {
         *fLog << warn << dbginf << "No entries found in file(s)" << endl;
@@ -616 +641 @@
     //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,01)
-    if (fNumEntry >= fNumEntries)
+    if (fNumEntry >= GetEntries())
         return kFALSE;
 #endif
@@ -666 +691 @@
 Bool_t MReadTree::DecEventNum(UInt_t dec)
 {
-    if (fNumEntry-dec >= fNumEntries)
+    if (fNumEntry-dec >= GetEntries())
     {
         *fLog << warn << GetDescriptor() << ": DecEventNum, WARNING - Event " << fNumEntry << "-";
@@ -684 +709 @@
 Bool_t MReadTree::IncEventNum(UInt_t inc)
 {
-    if (fNumEntry+inc >= fNumEntries)
+    if (fNumEntry+inc >= GetEntries())
     {
         *fLog << warn << GetDescriptor() << ": IncEventNum, WARNING - Event " << fNumEntry << "+";
@@ -704 +729 @@
 Bool_t MReadTree::SetEventNum(UInt_t nr)
 {
-    if (nr >= fNumEntries)
+    if (nr >= GetEntries())
     {
         *fLog << warn << GetDescriptor() << ": SetEventNum, WARNING - " << nr << " out of Range." << endl;

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -23 +23 @@
     TList  *fVetoList;         // List of Branches which are not allowed to get enabled
     TList  *fNotify;           // List of TObjects to notify when switching files
+
+    enum { kChainWasChanged = BIT(14) };
 
 private:
@@ -58 +60 @@
 
     UInt_t GetEventNum() const { return fNumEntry;   }
-    UInt_t GetEntries() const  { return fNumEntries; }
+    UInt_t GetEntries();
 
     TString    GetFileName() const;