Changeset 1472 for trunk/MagicSoft/Mars

Timestamp:

08/01/02 15:22:34 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MEvtLoop.h (modified) (2 diffs)
• mbase/MParList.h (modified) (2 diffs)
• mbase/MTaskList.h (modified) (2 diffs)
• mfileio/FileIOLinkDef.h (modified) (1 diff)
• mfileio/MChain.cc (added)
• mfileio/MChain.h (added)
• mfileio/MReadMarsFile.cc (modified) (1 diff)
• mfileio/MReadMarsFile.h (modified) (2 diffs)
• mfileio/MReadTree.cc (modified) (4 diffs)
• mfileio/MReadTree.h (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.h (modified) (6 diffs)
• mfileio/Makefile (modified) (1 diff)
• mhist/MFillH.cc (modified) (1 diff)
• mhist/MFillH.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
      mfileio/MWriteRootFile.[h,cc], mhist/MFillH.[h,cc]:
      - added SavePrimitive
+
+   * mbase/MEvtLoop.h, mbase/MParList.h, mbase/MTaskList.h,
+     mfileio/MReadMarsFile.h, mfileio/MReadTree.h, 
+     mfileio/MWriteRootFile.h, mhist/MFillH.h:
+     - changed from ClassVersion 0 to ClassVersion 1
+   
+   * mfileio/FileIOLinkDef.h:
+     - added MChain
+
+   * mfileio/MReadMarsFile.cc, mfileio/MReadTree.cc, 
+     mfileio/MWriteRootFile.cc, mhist/MFillH.cc:
+     - added default constructor
+
+   * mfileio/MReadTree.cc:
+     - moved MChain to its own file
+
+   * mfileio/MWriteRootFile.cc:
+     - added default constructor to MRootFileBranch
+     - changed Version number from 0 to 1
+
+   * mfileio/Makefile, mfileio/FileIOLinkDef.h:
+     - MChain added
+
+   * mfileio/MChain.[h,cc]:
+     - added (from MReadTree.cc)
 
    * manalysis/MHillas.[h,cc]:

trunk/MagicSoft/Mars/NEWS

@@ -64 +64 @@
    - added possibility to use interpolated pixel values for blind pixels
      instead of removing it completely from the analysis
+
+   - started a first implementation to be able to write the eventloop/
+     eventloop setup to a file (root-file, root-macro)
 
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -22 +22 @@
 private:
     MParList  *fParList;
-    MTaskList *fTaskList;
+    MTaskList *fTaskList;      //!
 
-    TGProgressBar *fProgress;
+    TGProgressBar *fProgress;  //!
 
     enum { kIsOwner = BIT(14) };
@@ -48 +48 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    ClassDef(MEvtLoop, 0) // Class to execute the tasks in a tasklist
+    ClassDef(MEvtLoop, 1) // Class to execute the tasks in a tasklist
 };
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -26 +26 @@
 private:
     TOrdCollection *fContainer;  // Collection of Parameter and Data Containers
-    TOrdCollection *fAutodelete; // All what this list contains is deleted in the destructor
+    TOrdCollection *fAutodelete; //! All what this list contains is deleted in the destructor
 
     static TString GetClassName(const char *classname);
@@ -80 +80 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    ClassDef(MParList, 0) // list of parameter containers (MParContainer)
+    ClassDef(MParList, 1) // list of parameter containers (MParContainer)
 };
 

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -21 +21 @@
 {
 private:
-    TList    *fTasks;   // Container for the ordered list of different tasks
+    TList    *fTasks;       // Container for the ordered list of different tasks
     TList    fTasksProcess; //!
-    MParList *fParList;
+    MParList *fParList;     //!
 
-    UInt_t *fCntContinue;
-    UInt_t *fCntTrue;
+    UInt_t *fCntContinue;   //!
+    UInt_t *fCntTrue;       //!
 
     enum { kIsOwner = BIT(14) };
@@ -60 +60 @@
     const TList *GetList() const { return fTasks; }
 
-    ClassDef(MTaskList, 0)      //collection of tasks to be performed in the eventloop
+    ClassDef(MTaskList, 1) //collection of tasks to be performed in the eventloop
 };
 

trunk/MagicSoft/Mars/mfileio/FileIOLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
+#pragma link C++ class MChain+;
 #pragma link C++ class MReadTree+;
 #pragma link C++ class MReadMarsFile+;

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -50 +50 @@
 // --------------------------------------------------------------------------
 //
+//  Default constructor. Don't use it.
+//
+MReadMarsFile::MReadMarsFile() : fRun(NULL)
+{
+    fName  = "MReadMarsFile";
+    fTitle = "Task to loop over all events in a tree of a Mars file.";
+}
+
+// --------------------------------------------------------------------------
+//
 //  Default constructor. It creates a MReadTree object to read the
 //  RunHeaders and disables Auto Scheme for this tree.

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.h

@@ -20 +20 @@
   
 public:
+    MReadMarsFile();
     MReadMarsFile(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
     ~MReadMarsFile();
@@ -25 +26 @@
     Int_t AddFile(const char *fname);
 
-    ClassDef(MReadMarsFile, 0)  // Reads a tree from file(s)
+    ClassDef(MReadMarsFile, 1)  // Reads a tree from file(s)
 };
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -54 +54 @@
 
 #include <TFile.h>           // TFile::GetName
-#include <TChain.h>
 #include <TSystem.h>         // gSystem->ExpandPath
 #include <TGProgressBar.h>
@@ -63 +62 @@
 #include "MLogManip.h"
 
-#include "MTime.h"
+#include "MChain.h"
 #include "MFilter.h"
 #include "MParList.h"
@@ -70 +69 @@
 ClassImp(MReadTree);
 
-class MChain : public TChain
-{
-private:
-    Bool_t fNotified;
-
-public:
-    MChain() : TChain(), fNotified(kFALSE) {}
-    MChain(const char *name, const char *title="") : TChain(name, title), fNotified(kFALSE) {}
-
-    void ResetTree() { fTree = 0; }
-
-    virtual Bool_t Notify() { fNotified = kTRUE; return kTRUE; }
-    virtual void   SetNotify(TObject *obj) { fNotify = obj; fNotified = kFALSE; }
-
-    Int_t LoadTree(Int_t entry)
-    {
-        //
-        // This is the code from TChain::LoadTree but skips the
-        // notification in LoadTree. If LoadTree raises the notification
-        // a flag is set and the notification is done by hand. This
-        // is done to be able to catch the return value from Notify. If
-        // it has not been successfull -15 is returned.
-        // This is to support return values from Notify()/Reinit()
-        //
-        TObject *notify = GetNotify();
-
-        SetNotify(this);
-
-        Int_t rc = TChain::LoadTree(entry);
-
-        if (rc >= 0 && fNotified && notify)
-            if (!notify->Notify())
-                rc = -15;
-
-        SetNotify(notify);
-
-        return rc;
-    }
-};
-
-// --------------------------------------------------------------------------
-//
-//  Default constructor. It creates an TChain instance which represents the
+// --------------------------------------------------------------------------
+//
+//  Default constructor. Don't use it.
+//
+MReadTree::MReadTree()
+    : fNumEntry(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE), fProgress(NULL)
+{
+    fName  = "MReadTree";
+    fTitle = "Task to loop over all events in one single tree";
+
+    fVetoList = NULL;
+    fNotify = NULL;
+
+    fChain = NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Constructor. It creates an TChain instance which represents the
 //  the Tree you want to read and adds the given file (if you gave one).
 //  More files can be added using MReadTree::AddFile.
@@ -806 +781 @@
     TString name = ToLower(fName);
 
-    out << "   " << ClassName() << " " << name << "(";
-    out << fChain->GetName() << ", \"" << fName << "\", \"" << fTitle << "\");" << endl;
+    out << "   " << ClassName() << " " << name << "(\"";
+    out << fChain->GetName() << "\", \"" << fName << "\", \"" << fTitle << "\");" << endl;
 
     TIter Next(fChain->GetListOfFiles());

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -40 +40 @@
 
 public:
+    MReadTree();
     MReadTree(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
     ~MReadTree();
@@ -73 +74 @@
     virtual void   SavePrimitive(ofstream &out, Option_t *o="");
 
-    ClassDef(MReadTree, 0)      // Reads a tree from file(s)
+    ClassDef(MReadTree, 1)      // Reads a tree from file(s)
 };
 

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -51 +51 @@
 // --------------------------------------------------------------------------
 //
+// Default constructor. It is there to support some root stuff.
+// Don't use it.
+//
+MWriteRootFile::MWriteRootFile() : fOut(NULL)
+{
+    fName  = "MWriteRootFile";
+    fTitle = "Task which writes a root-output file";
+
+    fBranches.SetOwner();
+}
+
+// --------------------------------------------------------------------------
+//
 // Specify the name of the root file. You can also give an option ("UPDATE"
 // and "RECREATE" would make sense only) as well as the file title and
@@ -391 +404 @@
     out << fOut->GetTitle() << "\", ";
     out << fOut->GetCompressionLevel() << ", \"";
-    out << fName << "\", " << fTitle << "\");" << endl;;
+    out << fName << "\", \"" << fTitle << "\");" << endl;;
 
     MRootFileBranch *entry;

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -16 +16 @@
 {
 private:
-    TTree         *fTree;
-    TBranch       *fBranch;
+    TTree         *fTree;       //!
+    TBranch       *fBranch;     //!
 
-    MParContainer *fContainer;
+    MParContainer *fContainer;  //!
     TString        fContName;
 
@@ -29 +29 @@
 
 public:
+    MRootFileBranch() : fTree(NULL), fBranch(NULL), fContainer(NULL)
+    {
+        Init(NULL, NULL);
+        fContName = "";
+    }
+
     MRootFileBranch(const char *cname, const char *tname=NULL, const char *ttitle=NULL)
         : fTree(NULL), fBranch(NULL), fContainer(NULL)
@@ -52 +58 @@
     void SetTree(TTree *tree)              { fTree = tree; }
 
-    ClassDef(MRootFileBranch, 0) // Storage container for MWriteRootFile to store TBranch informations
+    ClassDef(MRootFileBranch, 1) // Storage container for MWriteRootFile to store TBranch informations
 };
 
@@ -61 +67 @@
 
     TObjArray fBranches;
-    TObjArray fTrees;
+    TObjArray fTrees;     //!
 
     void        CheckAndWrite() const;
@@ -69 +75 @@
 
 public:
+    MWriteRootFile();
     MWriteRootFile(const char *fname,
                    const Option_t *opt="RECREATE",
@@ -87 +94 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    ClassDef(MWriteRootFile, 0) // Class to write one container to a root file
+    ClassDef(MWriteRootFile, 1) // Class to write one container to a root file
 };
 

trunk/MagicSoft/Mars/mfileio/Makefile

@@ -31 +31 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = MReadTree.cc \
+SRCFILES = MChain.cc \
+           MReadTree.cc \
            MReadMarsFile.cc \
            MWriteFile.cc \

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -89 +89 @@
     fTitle = title ? title : "Task to fill Mars histograms";
 
-    fH                = NULL;
-    fParContainer     = NULL;
+    fH            = NULL;
+    fParContainer = NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+// Default Constructor. This is to support some root-stuff.
+// Never try to use it yourself!
+//
+MFillH::MFillH()
+{
+    Init(NULL, NULL);
 }
 

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -12 +12 @@
 {
 private:
-    const MParContainer *fParContainer;
+    const MParContainer *fParContainer; //!
     TString fParContainerName;
 
-    MH* fH;
+    MH* fH;                             //!
     TString fHName;
 
@@ -24 +24 @@
 
 public:
+    MFillH();
     MFillH(const char *hist, const char *par=NULL,     const char *name=NULL, const char *title=NULL);
     MFillH(const char *hist, const MParContainer *par, const char *name=NULL, const char *title=NULL);
@@ -35 +36 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    ClassDef(MFillH, 0) // Task to fill a histogram with data from a parameter container
+    ClassDef(MFillH, 1) // Task to fill a histogram with data from a parameter container
 };