Changeset 705 for trunk/MagicSoft/Mars/mbase

Timestamp:

03/27/01 15:52:41 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MLogManip.h (modified) (2 diffs)
• MParList.cc (modified) (6 diffs)
• MReadTree.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -4 +4 @@
 #pragma link off all classes;
 #pragma link off all functions;
+
+#pragma link C++ global kCONTINUE;
+#pragma link C++ global kGAMMA;
+#pragma link C++ global kPROTON;
+#pragma link C++ global kHELIUM;
+#pragma link C++ global kOXIGEN;
+#pragma link C++ global kIRON;
+#pragma link C++ global kPI;
+#pragma link C++ global kRad2Deg;
 
 #pragma link C++ global gLog;

trunk/MagicSoft/Mars/mbase/MLogManip.h

@@ -53 +53 @@
 //
 #ifndef __CINT__
-#define dbginf        __FILE__ << " l." << __LINE__ << ": "
+#define dbginf      __FILE__ << " l." << __LINE__ << ": "
 #endif
 //
@@ -63 +63 @@
 //
 #ifndef __CINT__
-#define DEBUG(lvl)    flush << debug(lvl) << dbginf
+#define DEBUG(lvl)  flush << debug(lvl) << dbginf
 #endif
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -21 +21 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(MParList)
@@ -91 +92 @@
   if (fContainer.FindObject(obj))
   {
-      *fLog << "WARNING: MParList::add: Container already added" << endl;
+      *fLog << dbginf << "Container already added" << endl;
       return kTRUE;
   }
@@ -103 +104 @@
       if (!fContainer.FindObject(where))
       {
-          *fLog << "ERROR: MParList::add: Cannot find parameter container after which the new one should be added!" << endl;
+          *fLog << dbginf << "Cannot find parameter container after which the new one should be added!" << endl;
           return kFALSE;
       }
@@ -139 +140 @@
     // if object is not existing in the list try to create one
     //
-    *fLog << "MParList::CreateObject - Warning: '" << name << "' not found... creating." << endl;
+    *fLog << dbginf << "'" << name << "' not found... creating." << endl;
 
     //
@@ -151 +152 @@
         // if class is not existing in the root environment
         //
-        *fLog << "MParList::CreateObject - Warning: Class '" << name << "' not existing in dictionary." << endl;
+        *fLog << dbginf << "Class '" << name << "' not existing in dictionary." << endl;
         return NULL;
     }
@@ -175 +176 @@
   //   print some information about the current status of MParList
   //
-  *fLog << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
+  *fLog << dbginf << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
   *fLog << endl;
   

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -7 +7 @@
 
 class TFile;
-class TTree;
+class TChain;
 
 class MReadTree : public MTask
@@ -13 +13 @@
 private:
     TFile  *fFile;       // Pointer to file
-    TTree  *fTree;       // Pointer to tree
+    TChain *fChain;      // Pointer to tree
 
     UInt_t  fNumEntry;   // Number of actual entry
     UInt_t  fNumEntries; // Number of Events in Tree
 
-    TString fFileName;   // Name of File
-    TString fTreeName;   // Name of Tree
-
 public:
-    MReadTree(const char *filename, const char *treename, const char *name=NULL, const char *title=NULL);
+    MReadTree(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
+    ~MReadTree();
 
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
     Bool_t PostProcess();
+
+    void AddFile(const char *fname);
 
     Bool_t GetEvent() ; 
@@ -33 +33 @@
     Bool_t IncEventNum(UInt_t inc=1); // increase number of event (position in tree)
     Bool_t SetEventNum(UInt_t nr);    // set number of event (position in tree)
-    UInt_t GetEventNum() {return fNumEntry;}
-    UInt_t GetEntries() {return fNumEntries;}
+
+    UInt_t GetEventNum() const { return fNumEntry;   }
+    UInt_t GetEntries() const  { return fNumEntries; }
 
     ClassDef(MReadTree, 0)      // Reads one tree