Index: trunk/MagicSoft/Mars/mreport/MReportCamera.h =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportCamera.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportCamera.h (revision 2592) @@ -44,5 +44,5 @@ Bool_t InterpreteBody(TString &str); - ClassDef(MReportCamera, 1) // Base class for control reports + ClassDef(MReportCamera, 1) // Class for CAMERA-REPORT information }; Index: trunk/MagicSoft/Mars/mreport/MReportDAQ.h =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportDAQ.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportDAQ.h (revision 2592) @@ -14,5 +14,5 @@ Bool_t InterpreteBody(TString &str); - ClassDef(MReportDAQ, 1) // Base class for control reports + ClassDef(MReportDAQ, 1) // Class for DAQ-REPORT information }; Index: trunk/MagicSoft/Mars/mreport/MReportDrive.cc =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportDrive.cc (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportDrive.cc (revision 2592) @@ -26,4 +26,10 @@ // // MReportDrive +// +// This is the class interpreting and storing the DRIVE-REPORT information. +// +// This is NOT the place to get the pointing position from. The class +// definition might change. But it is the place to calculate the +// correct pointing position from. // ////////////////////////////////////////////////////////////////////////////// Index: trunk/MagicSoft/Mars/mreport/MReportDrive.h =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportDrive.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportDrive.h (revision 2592) @@ -44,5 +44,5 @@ Double_t GetAbsError() const; - ClassDef(MReportDrive, 1) // Base class for control reports + ClassDef(MReportDrive, 1) // Class for DRIVE-REPORT information }; Index: trunk/MagicSoft/Mars/mreport/MReportFileRead.cc =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportFileRead.cc (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportFileRead.cc (revision 2592) @@ -25,5 +25,15 @@ ////////////////////////////////////////////////////////////////////////////// // -// MReportFileRead // +// MReportFileRead +// +// Task to read the central control report file. For more information see +// the base class of all reports MReport. +// +// To add a report which should be read use AddToList. +// +// eg. AddToList("Drive") will assume the existance of a class called +// MReportDrive. It will create such an object automatically. It will +// send all lines starting with 'MReportDrive::fIndetifier-REPORT' +// to this class. // ////////////////////////////////////////////////////////////////////////////// @@ -123,5 +133,6 @@ // -------------------------------------------------------------------------- // -// Default constructor. It tries to open the given file. +// Default constructor. It tries to open the given file and creates a +// THashTable which allows faster access to the MReport* objects. // MReportFileRead::MReportFileRead(const char *fname, const char *name, const char *title) @@ -138,5 +149,5 @@ // -------------------------------------------------------------------------- // -// Destructor. Delete input stream. +// Destructor. Delete input stream and hash table. // MReportFileRead::~MReportFileRead() @@ -161,4 +172,9 @@ } +// -------------------------------------------------------------------------- +// +// Add a new MReport* to the list (eg 'Drive' will add MReportDrive) +// For convinience the object is created as a MReportHelp object. +// Bool_t MReportFileRead::AddToList(const char *name) const { @@ -182,4 +198,11 @@ } +// -------------------------------------------------------------------------- +// +// Check whether the file header corresponds to a central control file +// header and check for the existance of a correct version number. +// The version number may later be used to be able to read different +// file versions +// Bool_t MReportFileRead::CheckFileHeader() const { @@ -219,17 +242,6 @@ // -------------------------------------------------------------------------- // -// The PreProcess of this task checks for the following containers in the -// list: -// MRawRunHeader if not found it is created -// MRawEvtHeader if not found it is created -// MRawEvtData if not found it is created -// MRawCrateArray if not found it is created -// MRawEvtTime if not found it is created (MTime) -// -// If all containers are found or created the run header is read from the -// binary file and printed. If the Magic-Number (file identification) -// doesn't match we stop the eventloop. -// -// Now the EvtHeader and EvtData containers are initialized. +// Call SetupReading for all MReportHelp objects scheduled. +// Try to open the file and check the file header. // Int_t MReportFileRead::PreProcess(MParList *pList) @@ -264,9 +276,7 @@ // -------------------------------------------------------------------------- // -// The Process reads one event from the binary file: -// - The event header is read -// - the run header is read -// - all crate information is read -// - the raw data information of one event is read +// Read the file line by line as long as a matching MReport* class is found. +// In this case call its interpreter (Interprete()) and remove the identifier +// first (XYZ-REPORT) // Int_t MReportFileRead::Process() @@ -304,7 +314,5 @@ // -------------------------------------------------------------------------- // -// Close the file. Check whether the number of read events differs from -// the number the file should containe (MRawRunHeader). Prints a warning -// if it doesn't match. +// Close the file and print some execution statistics // Int_t MReportFileRead::PostProcess() Index: trunk/MagicSoft/Mars/mreport/MReportFileRead.h =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportFileRead.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportFileRead.h (revision 2592) @@ -42,5 +42,5 @@ Bool_t AddToList(const char *name) const; - ClassDef(MReportFileRead, 0) // Task to read the raw data binary file + ClassDef(MReportFileRead, 0)// Task to read the central control report file }; Index: trunk/MagicSoft/Mars/mreport/MReportTrigger.cc =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportTrigger.cc (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportTrigger.cc (revision 2592) @@ -27,4 +27,6 @@ // MReportTrigger // +// This is the class interpreting and storing the TRIGGER-REPORT information. +// ////////////////////////////////////////////////////////////////////////////// #include "MReportTrigger.h" @@ -36,5 +38,5 @@ using namespace std; -MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT"), fPrescalerRates(19)//, fRates(11) +MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT"), fPrescalerRates(19) { fName = "MReportTrigger"; Index: trunk/MagicSoft/Mars/mreport/MReportTrigger.h =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportTrigger.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/MReportTrigger.h (revision 2592) @@ -24,5 +24,5 @@ Bool_t InterpreteBody(TString &str); - ClassDef(MReportTrigger, 1) // Base class for control reports + ClassDef(MReportTrigger, 1) // Class for TRIGGER-REPORT information }; Index: trunk/MagicSoft/Mars/mreport/Makefile =================================================================== --- trunk/MagicSoft/Mars/mreport/Makefile (revision 2591) +++ trunk/MagicSoft/Mars/mreport/Makefile (revision 2592) @@ -33,4 +33,5 @@ MReportCamera.cc \ MReportTrigger.cc \ + MReportCurrents.cc \ MReportFileRead.cc Index: trunk/MagicSoft/Mars/mreport/ReportLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mreport/ReportLinkDef.h (revision 2591) +++ trunk/MagicSoft/Mars/mreport/ReportLinkDef.h (revision 2592) @@ -11,4 +11,5 @@ #pragma link C++ class MReportCamera+; #pragma link C++ class MReportTrigger+; +#pragma link C++ class MReportCurrents+; #pragma link C++ class MReportFileRead+;