Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 457) +++ trunk/MagicSoft/Mars/Changelog (revision 458) @@ -1,3 +1,13 @@ -*-*- END -*-*- + 2000/12/28: Thomas Bretz + + * merpp.cc, MArray.cc, MArray.h, MArrayB.cc, MArrayB.h, MArrayS.cc, + MArrayS.h, MEvtLoop.cc, MEvtLoop.h, MInputStreamID.cc, MInputStreamID.h, + MParContainer.cc, MParContainer.h, MParList.cc, MParList.h, MReadTree.cc, + MTask.cc, MTask.h, MTaskList.cc, MTaskList.h, MTime.cc, MTime.h: + - Added changes some comments. + + * MLoopEvt.cc, MLoopEvt.h: + - Removed 2000/12/22 - Thomas Bretz: Index: trunk/MagicSoft/Mars/mbase/MArray.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArray.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArray.cc (revision 458) @@ -1,2 +1,14 @@ +///////////////////////////////////////////////////////////////////////////// +// // +// MArray // +// // +// This is an abstract base class for TObject derived Arrays. In principal // +// it is almost the same than TArray. The difference is that this array // +// base classed is derived from TObject which makes storage of variable // +// sized arrays possible with splitlevel=1. // +// // +// This should not be needed anymore for root >3.00 // +// // +///////////////////////////////////////////////////////////////////////////// #include "MArray.h" Index: trunk/MagicSoft/Mars/mbase/MArray.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArray.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArray.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MARRAY_H #define MARRAY_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MArray // +// // +// Abstract array base class for TObject derived Arrays // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MAGIC_H Index: trunk/MagicSoft/Mars/mbase/MArrayB.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayB.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArrayB.cc (revision 458) @@ -1,2 +1,11 @@ +///////////////////////////////////////////////////////////////////////////// +// // +// MArrayB // +// // +// Array of Byte_t. It is almost the same than TArrayC, but it containes // +// Byte_t instead of Char_t and it can be stored with splitlevel=1 to a // +// a root-file because of it's derivement from MArray (TObject) // // +// // +///////////////////////////////////////////////////////////////////////////// #include "MArrayB.h" Index: trunk/MagicSoft/Mars/mbase/MArrayB.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayB.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArrayB.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MARRAYB_H #define MARRAYB_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MArrayB // +// // +// Array of Byte_t // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MARRAY_H Index: trunk/MagicSoft/Mars/mbase/MArrayS.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayS.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArrayS.cc (revision 458) @@ -1,2 +1,11 @@ +///////////////////////////////////////////////////////////////////////////// +// // +// MArrayS // +// // +// Array of UShort_t. It is almost the same than TArrayS, but it containes // +// UShort_t instead of Short_t and it can be stored with splitlevel=1 to a // +// a root-file because of it's derivement from MArray (TObject) // // +// // +///////////////////////////////////////////////////////////////////////////// #include "MArrayS.h" Index: trunk/MagicSoft/Mars/mbase/MArrayS.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayS.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MArrayS.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MARRAYS_H #define MARRAYS_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MArrayS // +// // +// Array of UShort_t // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MARRAY_H Index: trunk/MagicSoft/Mars/mbase/MEvtLoop.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 458) @@ -1,2 +1,25 @@ +///////////////////////////////////////////////////////////////////////////// +// // +// MEvtLoop // +// // +// This class is the core of each event processing. // +// First you must set the parameter list to use. The parameter list // +// must contain the task list (MTaskList) to use. The name of the task // +// list can be specified if you call Eventloop. The standard name is // +// "MTaskList". The name you specify must match the name of the MTaskList // +// object. // +// // +// If you call Eventloop first all PreProcess functions - with the // +// parameter list as an argument - of the tasks in the task list are // +// executed. If one of them returns kFALSE then the execution is stopped. // +// If the preprocessing was ok. The Process funtion of the tasks are // +// as long as one function returns kSTOP. Only the tasks which are marked // +// marked as "All" or with a string which matches the MInputStreamID of // +// MTaskList are executed. If one tasks returns kCONTINUE the pending // +// tasks in the list are skipped and the execution in continued with // +// the first one in the list. // +// Afterwards the PostProcess functions are executed. // +// // +///////////////////////////////////////////////////////////////////////////// #include "MEvtLoop.h" @@ -25,4 +48,6 @@ void MEvtLoop::Eventloop(Int_t maxcnt, const char *ftasks) { + // See class description above. + // // check if the needed parameter list is set. Index: trunk/MagicSoft/Mars/mbase/MEvtLoop.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MEvtLoop.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MEvtLoop.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MEVTLOOP_H #define MEVTLOOP_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MEvtLoop // +// // +// Class to execute the tasks in a tasklist // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MAGIC_H @@ -21,5 +29,5 @@ void Eventloop(Int_t maxcnt=-1, const char *tlist="MTaskList"); - ClassDef(MEvtLoop, 1) + ClassDef(MEvtLoop, 1) // Class to execute the tasks in a tasklist }; Index: trunk/MagicSoft/Mars/mbase/MInputStreamID.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MInputStreamID.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MInputStreamID.cc (revision 458) @@ -1,2 +1,12 @@ +/////////////////////////////////////////////////////////////////////// +// // +// MInpuStreamID // +// // +// This is a ID which is assigned to tasks and to a task list. // +// It depends on this ID whether a task is executed by the // +// MTaskList::Process member funtion or not. // +// // +/////////////////////////////////////////////////////////////////////// + #include "MInputStreamID.h" Index: trunk/MagicSoft/Mars/mbase/MInputStreamID.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MInputStreamID.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MInputStreamID.h (revision 458) @@ -1,10 +1,10 @@ #ifndef MINPUTSTREAMID_H #define MINPUTSTREAMID_H + /////////////////////////////////////////////////////////////////////// // // // MInpuStreamID // // // -// This is the storage container for general (CaOs, Raw, ...) Event // -// Info like the type of the 'actual' event // +// Assigns an ID to tasks or a task list // // // /////////////////////////////////////////////////////////////////////// @@ -35,5 +35,5 @@ } - ClassDef(MInputStreamID, 1) // Process control container for the task list + ClassDef(MInputStreamID, 1) //Assigns an ID to tasks or a task list }; Index: trunk/MagicSoft/Mars/mbase/MLoopEvt.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MLoopEvt.cc (revision 457) +++ (revision ) @@ -1,118 +1,0 @@ -#include "MLoopEvt.h" - -#include - -#include - -#include "MParList.h" -#include "MTaskList.h" - -ClassImp(MLoopEvt) - -MLoopEvt::MLoopEvt() : fTasks(NULL), fParlist(NULL) -{ -} - -MLoopEvt::~MLoopEvt() -{ -} - -void MLoopEvt::SetTaskList(MTaskList *t) -{ - fTasks = t; -} - -void MLoopEvt::SetParList(MParList *p) -{ - fParlist = p; - - // - // check if the task list is already known - // - if (fTasks) - { - cout << "MLoopEvt::SetParList - Warning: Task List already set, using this one" << endl; - return; - } - - // - // get the task list from the parameter list - // - fTasks = (MTaskList*)fParlist->FindObject("MTaskList"); - - if (!fTasks) - cout << "MLoopEvt::SetParList - Warning: MTaskList not found." << endl; -} - -void MLoopEvt::Eventloop(Int_t maxcnt) -{ - // - // check if the parameter list is known - // - if (!fParlist) - { - cout << "MLoopEvt::Eventloop - Error: ParList not set." << endl; - return; - } - - // - // check if the task list could be retrieved from the parameter list - // - if (!fTasks) - { - cout << "MLoopEvt::Eventloop - Error: TaskList not set." << endl; - return; - } - - // - // execute the preprocess of all tasks - // connect the different tasks with the right containers in - // the parameter list - - if (!fTasks->PreProcess(fParlist)) - { - cout << "Error detected while PreProcessing" << endl; - return; - } - - // - // loop over all events and process all tasks for - // each event - // - cout << endl << "Eventloop running ("; - - if (maxcnt<0) - cout << "all"; - else - cout << dec << maxcnt; - - cout << " events)..." << flush; - - Int_t dummy = maxcnt<0 ? 0 : maxcnt; - - TStopwatch clock; - clock.Start(); - - if (maxcnt<0) - while (fTasks->Process() && ++dummy); - else - while (fTasks->Process() && dummy--); - - clock.Stop(); - - cout << "Ready!" << endl << endl; - - clock.Print(); - - cout << dec << endl - << "Time: " << clock.CpuTime() << "s" - << " for " << (maxcnt<0?dummy:maxcnt) << " Events" - << " --> " << (maxcnt<0?dummy:maxcnt)/clock.CpuTime() << " Events/s" - << endl << endl; - - // - // execute the post process of all tasks - // - fTasks->PostProcess(); -} - Index: trunk/MagicSoft/Mars/mbase/MLoopEvt.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MLoopEvt.h (revision 457) +++ (revision ) @@ -1,29 +1,0 @@ -#ifndef MLOOP_H -#define MLOOP_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -class MTaskList; -class MParList; - -class MLoopEvt -{ -private: - MTaskList *fTasks; - MParList *fParlist; - -public: - MLoopEvt(); - ~MLoopEvt(); - - void SetTaskList(MTaskList *t); - void SetParList(MParList *p); - - void Eventloop(Int_t maxcnt=-1); - - ClassDef(MLoopEvt, 1) -}; - -#endif Index: trunk/MagicSoft/Mars/mbase/MParContainer.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MParContainer.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MParContainer.cc (revision 458) @@ -1,11 +1,12 @@ -////////////////////////////////////////////////////////////////////////// -// // -// TNamed // -// // -// The TNamed class is the base class for all named ROOT classes // -// A TNamed contains the essential elements (name, title) // -// to identify a derived object in containers, directories and files. // -// Most member functions defined in this base class are in general // -// overridden by the derived classes. // +/////////////////////////////////////////////////////////////////////////// +// // +// MParContainer // +// // +// The MParContainer class is the base class for all MARS parameter // +// containers. At the moment it is almost the same than ROOT's TNamed. // +// A TNamed contains the essential elements (name, title) // +// to identify a derived object in lists like our MParList or MTaskList. // +// The main difference is that the name and title isn't stored and read // +// to and from root files ("\\!") // // // ////////////////////////////////////////////////////////////////////////// @@ -14,7 +15,7 @@ #include // cout -#include "TClass.h" // IsA -#include "TROOT.h" // TROOT::Identlevel -#include "TVirtualPad.h" // gPad +#include // IsA +#include // TROOT::Identlevel +#include // gPad ClassImp(MParContainer) @@ -23,5 +24,5 @@ MParContainer::MParContainer(const MParContainer &named) { - // TNamed copy ctor. + // MParContainer copy ctor. *fName = *(named.fName); @@ -32,5 +33,5 @@ MParContainer& MParContainer::operator=(const MParContainer& rhs) { - // TNamed assignment operator. + // MParContainer assignment operator. if (this != &rhs) { @@ -45,5 +46,5 @@ Int_t MParContainer::Compare(TObject *obj) { - // Compare two TNamed objects. Returns 0 when equal, -1 when this is + // Compare two MParContainer objects. Returns 0 when equal, -1 when this is // smaller and +1 when bigger (like strcmp). @@ -65,5 +66,5 @@ void MParContainer::FillBuffer(char *&buffer) { - // Encode TNamed into output buffer. + // Encode MParContainer into output buffer. fName->FillBuffer(buffer); @@ -74,5 +75,5 @@ void MParContainer::ls(Option_t *) { - // List TNamed name and title. + // List MParContainer name and title. TROOT::IndentLevel(); @@ -84,5 +85,5 @@ void MParContainer::Print(Option_t *) { - // Print TNamed name and title. + // Print MParContainer name and title. cout <<"OBJ: " << IsA()->GetName() << "\t" << GetName() << "\t" << GetTitle() << endl; @@ -92,5 +93,5 @@ void MParContainer::SetName(const char *name) { - // Change (i.e. set) the name of the TNamed. + // Change (i.e. set) the name of the MParContainer. // WARNING !! // If the object is a member of a THashTable, THashList container @@ -105,5 +106,5 @@ void MParContainer::SetObject(const char *name, const char *title) { - // Change (i.e. set) all the TNamed parameters (name and title). + // Change (i.e. set) all the MParContainer parameters (name and title). // See also WARNING in SetName @@ -116,5 +117,5 @@ void MParContainer::SetTitle(const char *title) { - // Change (i.e. set) the title of the TNamed. + // Change (i.e. set) the title of the MParContainer. *fTitle = title; @@ -125,5 +126,5 @@ Int_t MParContainer::Sizeof() const { - // Return size of the TNamed part of the TObject. + // Return size of the MParContainer part of the TObject. Int_t nbytes = fName->Sizeof() + fTitle->Sizeof(); Index: trunk/MagicSoft/Mars/mbase/MParContainer.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MParContainer.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MParContainer.h (revision 458) @@ -4,7 +4,7 @@ ////////////////////////////////////////////////////////////////////////// // // -// TNamed // +// MParContainer // // // -// The basis for a named object (name, title). // +// The basis for all parameter containers // // // ////////////////////////////////////////////////////////////////////////// @@ -19,37 +19,38 @@ class MParContainer : public TObject { - private: +private: void Init(const char *name, const char *title) - { - fName = new TString; - (*fName) = name; - fTitle = new TString; - (*fTitle) = title; - } - protected: - TString *fName; //! object identifier - TString *fTitle; //! object title - - public: + { + fName = new TString; + (*fName) = name; + fTitle = new TString; + (*fTitle) = title; + } + +protected: + TString *fName; //! parameter container identifier (name) + TString *fTitle; //! parameter container title + +public: MParContainer(const char *name="", const char *title="") { Init(name, title); } - MParContainer(const TString &name, const TString &title) { Init(name, title); } - MParContainer(const MParContainer &named); - MParContainer& operator=(const MParContainer& rhs); - virtual ~MParContainer() { delete fName; delete fTitle; } - virtual Int_t Compare(TObject *obj); - virtual void Copy(TObject &named); - virtual void FillBuffer(char *&buffer); - virtual const char *GetName() const {return fName->Data();} - virtual const char *GetTitle() const {return fTitle->Data();} - virtual ULong_t Hash() { return fName->Hash(); } - virtual Bool_t IsSortable() const { return kTRUE; } - virtual void SetName(const char *name); // *MENU* - virtual void SetObject(const char *name, const char *title); - virtual void SetTitle(const char *title=""); // *MENU* - virtual void ls(Option_t *option=""); - virtual void Print(Option_t *option=""); - virtual Int_t Sizeof() const; - - ClassDef(MParContainer, 1) //The basis for Parameter Containers + MParContainer(const TString &name, const TString &title) { Init(name, title); } + MParContainer(const MParContainer &named); + MParContainer& operator=(const MParContainer& rhs); + virtual ~MParContainer() { delete fName; delete fTitle; } + virtual Int_t Compare(TObject *obj); + virtual void Copy(TObject &named); + virtual void FillBuffer(char *&buffer); + virtual const char *GetName() const {return fName->Data();} + virtual const char *GetTitle() const {return fTitle->Data();} + virtual ULong_t Hash() { return fName->Hash(); } + virtual Bool_t IsSortable() const { return kTRUE; } + virtual void SetName(const char *name); // *MENU* + virtual void SetObject(const char *name, const char *title); + virtual void SetTitle(const char *title=""); // *MENU* + virtual void ls(Option_t *option=""); + virtual void Print(Option_t *option=""); + virtual Int_t Sizeof() const; + + ClassDef(MParContainer, 1) //The basis for all parameter containers }; Index: trunk/MagicSoft/Mars/mbase/MParList.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MParList.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MParList.cc (revision 458) @@ -1,13 +1,18 @@ -/////////////////////////////////////////////////////////////////////// -// -// MParList -// -// This class contains a list of different Parameter and Data -// Containers. -// -// You can add every parameter Container (Named object) to the -// instance and access it from somewhere else via its Name. -// -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// // +// MParList // +// // +// This class contains a list of different parameter containers. // +// // +// A parameter container is an object which is derived from // +// MParContainer. // +// // +// Normally a parameter container is used for data exchange between two // +// tasks at runtime. // +// // +// You can add every parameter container (Named object) to the // +// instance and access it from somewhere else via its Name. // +// // +///////////////////////////////////////////////////////////////////////////// #include "MParList.h" Index: trunk/MagicSoft/Mars/mbase/MParList.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MParList.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MParList.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MPARLIST_H #define MPARLIST_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MParList // +// // +// List of parameter containers (MParContainer) // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MAGIC_H @@ -46,5 +54,5 @@ void Print(Option_t *t = NULL); - ClassDef(MParList, 1) // list of Parameter Containers + ClassDef(MParList, 1) //list of parameter containers (MParContainer) }; Index: trunk/MagicSoft/Mars/mbase/MReadTree.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MReadTree.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MReadTree.cc (revision 458) @@ -1,11 +1,15 @@ -//////////////////////////////////////////////////////////////////////// -// -// MRawFile -// -// This tasks reads the raw binary file like specified in the TDAS??? -// and writes the data in the corresponding containers which are -// either retrieved from the parameter list or created and added. -// -//////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// // +// MReadTree // +// // +// This tasks opens all branches in a specified tree and creates the // +// corresponding parameter containers if not already existing in the // +// parameter list. // +// // +// The Process function reads one events from the tree. To go through the // +// events of one tree make sure that the event number is increased from // +// outside. It makes also possible to go back by decreasing the number. // +// // +///////////////////////////////////////////////////////////////////////////// #include "MReadTree.h" Index: trunk/MagicSoft/Mars/mbase/MTask.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MTask.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTask.cc (revision 458) @@ -1,37 +1,37 @@ -/////////////////////////////////////////////////////////////////////// -// -// MTask -// -// Base class for all tasks which can perfomed in a tasklist -// For each event processed in the eventloop all the different -// tasks in the tasklist will be processed. -// -// So all tasks must inherit from this baseclass. -// -// The data member fEventType is used to indicate the type of events -// that are process by this task. There are the following different -// event types: -// -// This is the type of task for which this task should be processed -// taskType-bits: 7 6 5 4 3 2 1 0 -// 0 DATA_EVT -// 1 CALIBRATION_EVT -// ? etc. etc. -// -// Inside this abstract class, there are three fundamental function: -// -// - PreProcess() : executed before the eventloop starts. Here you -// can initiate different things, open files, etc. -// -// - Process() : executed for each event in the eventloop. Do in -// one task after the other (as the occur in the -// tasklist) the action of one task. -// -// - PostProcess(): executed after the eventloop. Here you can close -// output files, start display of the run parameter, -// etc. -// -// -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// // +// MTask // +// // +// Base class for all tasks which can perfomed in a tasklist // +// For each event processed in the eventloop all the different // +// tasks in the tasklist will be processed. // +// // +// So all tasks must inherit from this baseclass. // +// // +// The inheritance from MInputStreamID is used to indicate the // +// type of event that this task is for. If it is "All" it is executed // +// independantly of the actual ID of the task list. // +// // +// Inside this abstract class, there are three fundamental function: // +// // +// - PreProcess(): executed before the eventloop starts. Here you // +// can initiate different things, open files, etc. // +// As an argument this function gets a pointer to the // +// parameter list. You can stop the execution by // +// kFALSE instread of kTRUE. // +// // +// - Process(): executed for each event in the eventloop. Do in // +// one task after the other (as the occur in the // +// tasklist) the action of one task. Only the tasks // +// with a Stream ID which matches the actual ID of the // +// task list are executed. A task can return kFALSE // +// to stop the execuition of the pending taks in a // +// list or kCONTINUE to skip the pending tasks. // +// // +// - PostProcess(): executed after the eventloop. Here you can close // +// output files, start display of the run parameter, // +// etc. // +// // +///////////////////////////////////////////////////////////////////////////// #include "MTask.h" Index: trunk/MagicSoft/Mars/mbase/MTask.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MTask.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTask.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MTASK_H #define MTASK_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MTask // +// // +// Abstract base class for a task // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MINPUTSTREAMID_H @@ -20,5 +28,5 @@ virtual Bool_t PostProcess(); - ClassDef(MTask, 1) // Base (abstract) class for a task + ClassDef(MTask, 1) //Abstract base class for a task }; Index: trunk/MagicSoft/Mars/mbase/MTaskList.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MTaskList.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTaskList.cc (revision 458) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////// // // -// MTaskList // +// MTaskList // // // -// Collection of tasks which should be processed in the eventloop // +// Collection of tasks to be processed in the eventloop // // // /////////////////////////////////////////////////////////////////////// Index: trunk/MagicSoft/Mars/mbase/MTaskList.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MTaskList.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTaskList.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MTASKLIST_H #define MTASKLIST_H + +/////////////////////////////////////////////////////////////////////// +// // +// MTaskList // +// // +// Collection of tasks to be processed in the eventloop // +// // +/////////////////////////////////////////////////////////////////////// #ifndef ROOT_TOrdCollection @@ -31,5 +39,5 @@ void Print(Option_t *t = NULL); - ClassDef(MTaskList, 1) // Collection of tasks to be performed in the eventloop + ClassDef(MTaskList, 1) //collection of tasks to be performed in the eventloop }; Index: trunk/MagicSoft/Mars/mbase/MTime.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MTime.cc (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTime.cc (revision 458) @@ -1,7 +1,9 @@ -/////////////////////////////////////////////////////////////////////// -// -// MTime -// -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// // +// MTime // +// // +// A generalized MARS time stamp // +// // +///////////////////////////////////////////////////////////////////////////// #include "MTime.h" Index: trunk/MagicSoft/Mars/mbase/MTime.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MTime.h (revision 457) +++ trunk/MagicSoft/Mars/mbase/MTime.h (revision 458) @@ -1,4 +1,12 @@ #ifndef MTIME_H #define MTIME_H + +///////////////////////////////////////////////////////////////////////////// +// // +// MTime // +// // +// A generalized MARS time stamp // +// // +///////////////////////////////////////////////////////////////////////////// #ifndef MPARCONTAINER_H @@ -75,5 +83,5 @@ } - ClassDef(MTime, 1) // A general Mars time stamp + ClassDef(MTime, 1) //A generalized MARS time stamp }; Index: trunk/MagicSoft/Mars/merpp.cc =================================================================== --- trunk/MagicSoft/Mars/merpp.cc (revision 457) +++ trunk/MagicSoft/Mars/merpp.cc (revision 458) @@ -17,17 +17,18 @@ #include "MInputStreamID.h" -///////////////////////////////////////////////////////////////////////////// -// -// This is an easy implementation of the Merging process (as compilable prog) -// -// at the moment it reads a binary file ("rawtest.bin") which was written -// in the DAQ raw format. -// -// The data are stored in root container objects (classes derived from -// TObject like MRawRunHeader) -// -// This containers are written to a root file ("rawtest.root") -// -///////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// // +// This is an easy implementation of the Merging process // +// (as compilable prog) // +// // +// at the moment it reads a binary file ("rawtest.bin") which was written // +// in the DAQ raw format. // +// // +// The data are stored in root container objects (classes derived from // +// TObject like MRawRunHeader) // +// // +// This containers are written to a root file ("rawtest.root") // +// // +////////////////////////////////////////////////////////////////////////////// int main(const int argc, const char **argv)