Changeset 1035 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/06/01 13:44:26 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MReadMarsFile.cc (added)
• MReadMarsFile.h (added)
• MReadTree.cc (modified) (4 diffs)
• MReadTree.h (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -35 +35 @@
 
 #pragma link C++ class MReadTree+;
+#pragma link C++ class MReadMarsFile+;
 
 #pragma link C++ class MRootFileBranch+;

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -54 +54 @@
 #include <fstream.h>
 
+#include <TFile.h>           // TFile::GetName
 #include <TChain.h>
 #include <TGProgressBar.h>
@@ -86 +87 @@
     fVetoList->SetOwner();
 
+    fNotify = new TOrdCollection;
+
     //
     // open the input stream
     //
     fChain = new TChain(tname);
+    fChain->SetNotify(this);
 
     if (fname)
@@ -115 +119 @@
     //
     delete fChain;
+    delete fNotify;
     delete fVetoList;
+}
+
+void MReadTree::SetOwner(Bool_t flag)
+{
+    flag ? fNotify->SetBit(kIsOwner) : fNotify->ResetBit(kIsOwner);
+}
+
+Bool_t MReadTree::Notify()
+{
+    fNotify->ForEach(TObject, Notify)();
+    return kTRUE;
 }
 
@@ -464 +480 @@
     fVetoList->Add(branch);
 }
+
+const char *MReadTree::GetFileName() const
+{
+    return fChain->GetFile()->GetName();
+}
+
+void MReadTree::AddNotify(TObject *obj)
+{
+    fNotify->Add(obj);
+}

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -22 +22 @@
 
     TOrdCollection *fVetoList; // List of Branches which are not allowed to get enabled
+    TOrdCollection *fNotify;   // List of TObjects to notify when switching files
 
     TGProgressBar  *fProgress; // Possible display of status
@@ -32 +33 @@
     void EnableBranchChoosing();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-  
+    enum { kIsOwner = BIT(14) };
+
 public:
     MReadTree(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
     ~MReadTree();
 
-    Int_t  AddFile(const char *fname);
     void   DisableAutoScheme() { fAutoEnable = kFALSE; }
     void   EnableBranch(const char *name);
@@ -55 +54 @@
     UInt_t GetEntries() const  { return fNumEntries; }
 
+    const char *GetFileName() const;
+
+    virtual void   AddNotify(TObject *obj);
+    virtual void   SetOwner(Bool_t flag=kTRUE);
+
+    virtual Int_t  AddFile(const char *fname);
+
+    virtual Bool_t PreProcess(MParList *pList);
+    virtual Bool_t Process();
+
+    virtual Bool_t Notify();
+
     ClassDef(MReadTree, 0)      // Reads a tree from file(s)
 };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -40 +40 @@
            MEvtLoop.cc \
            MReadTree.cc \
+           MReadMarsFile.cc \
            MWriteFile.cc \
            MWriteAsciiFile.cc \