Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.cc =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtData.cc (revision 760) +++ trunk/MagicSoft/Mars/mraw/MRawEvtData.cc (revision 761) @@ -65,4 +65,8 @@ ClassImp(MRawEvtData) +// -------------------------------------------------------------------------- +// +// Default constructor. It initializes all arrays with zero size. +// MRawEvtData::MRawEvtData(const char *name, const char *title) { @@ -73,4 +77,8 @@ } +// -------------------------------------------------------------------------- +// +// Destructor. Deletes all the arrays. +// MRawEvtData::~MRawEvtData() { @@ -78,10 +86,10 @@ } +// -------------------------------------------------------------------------- +// +// reset all arrays +// void MRawEvtData::Clear(Option_t *) { - // - // reset all arrays - // - /* FIXME: @@ -95,4 +103,8 @@ } +// -------------------------------------------------------------------------- +// +// return the number of hi gain samples per pixel +// Byte_t MRawEvtData::GetNumHiGainSamples() const { @@ -100,4 +112,8 @@ } +// -------------------------------------------------------------------------- +// +// return the number of lo gain samples per pixel +// Byte_t MRawEvtData::GetNumLoGainSamples() const { @@ -105,4 +121,8 @@ } +// -------------------------------------------------------------------------- +// +// return the number of stored pixel +// UShort_t MRawEvtData::GetNumPixels() const { @@ -111,4 +131,11 @@ +// -------------------------------------------------------------------------- +// +// Print out the onformation to *fLog. +// Options: +// "hex" Prints the time slices hexadecimal (default) +// "dec" Prints the time slices decimal +// void MRawEvtData::Print(Option_t *opt) { @@ -171,4 +198,13 @@ } +// -------------------------------------------------------------------------- +// +// Draw a pixel. A Histogram or Graph is created and it's draw function is +// called. +// Options: +// "GRAPH" A graph is drawn +// "HIST" A histogram is drawn +// number The pixel with the given number is drawn +// void MRawEvtData::Draw(Option_t *opt) { @@ -176,5 +212,5 @@ // - // FIXME: BIG MEMORY LEAK! + // FIXME: BIG MEMORY LEAK! (( How and when are the objects deleted?) // @@ -244,13 +280,19 @@ } +// -------------------------------------------------------------------------- +// +// Deletes all arrays describing the pixel Id and Samples in pixels. +// The flag is for future usage. +// void MRawEvtData::DeletePixels(Bool_t flag) { - // - // Deletes all arrays describing the pixel Id and Samples in pixels - // DeleteArrays(); InitArrays(flag); } +// -------------------------------------------------------------------------- +// +// Deletes all the arrays +// void MRawEvtData::DeleteArrays() { @@ -261,4 +303,9 @@ } +// -------------------------------------------------------------------------- +// +// Deletes all the arrays +// The flag is for future usage. +// void MRawEvtData::InitArrays(Bool_t flag) { @@ -271,11 +318,12 @@ } +// -------------------------------------------------------------------------- +// +// This is to fill the data of one pixel to the MRawEvtHeader Class. +// The parameters are the pixelnumber and the FADC_SLICES values of ADCs +// Add to lo gains if lflag = 1 +// void MRawEvtData::AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag) { - // - // This is to fill the data of one pixel to the MRawEvtHeader Class. - // The parameters are the pixelnumber and the FADC_SLICES values of ADCs - // Add to lo gains if lflag = 1 - // MArrayS *arrpix = lflag ? fLoGainPixId : fHiGainPixId; MArrayB *arrsam = lflag ? fLoGainFadcSamples : fHiGainFadcSamples; @@ -315,10 +363,11 @@ } +// -------------------------------------------------------------------------- +// +// Fills members with information from a magic binary file. +// WARNING: you have to use Init() before you can do this +// void MRawEvtData::ReadEvt(istream &fin) { - // - // Fills members with information from a magic binary file. - // WARNING: you have to use Init() before you can do this - // const UShort_t nlo = fRunHeader->GetNumSamplesLoGain(); const UShort_t nhi = fRunHeader->GetNumSamplesHiGain(); Index: trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (revision 760) +++ trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (revision 761) @@ -105,5 +105,9 @@ ClassImp(MRawEvtHeader) -MRawEvtHeader::MRawEvtHeader(const char *name, const char *title) +// -------------------------------------------------------------------------- +// +// Default constructor. Create the array to store the data. +// +MRawEvtHeader::MRawEvtHeader(const char *name, const char *title) { *fName = name ? name : "MRawEvtHeader"; @@ -120,15 +124,20 @@ +// -------------------------------------------------------------------------- +// +// Destructor. Deletes the array to store pixlogainon +// MRawEvtHeader::~MRawEvtHeader() { -} - + delete fPixLoGainOn; +} + +// -------------------------------------------------------------------------- +// +// you have to init the conatainer before you can read from +// a raw binary file +// void MRawEvtHeader::Init(MRawRunHeader *rh, MTime *t) { - // - // you have to init the conatainer before you can read from - // a raw binary file - // - // // this is the number of entries in the array like specification @@ -148,11 +157,12 @@ } +// -------------------------------------------------------------------------- +// +// Implementation of the Clear function +// +// Resets all members to zero, clear the list of Pixels +// void MRawEvtHeader::Clear(Option_t *) { - // - // Implementation of the Clear function - // - // Resets all members to zero, clear the list of Pixels - // fDAQEvtNumber = 0; fNumTrigLvl1 = 0; @@ -164,9 +174,10 @@ } +// -------------------------------------------------------------------------- +// +// This member function prints all Data of one Event to *fLog. +// void MRawEvtHeader::Print(Option_t *o) { - // - // This member function prints all Data of one Event on screen. - // *fLog << "DAQEvtNr: " << dec << fDAQEvtNumber << " ("; *fLog << "Trigger: "; @@ -208,9 +219,10 @@ } +// -------------------------------------------------------------------------- +// +// used to set the header information (eg. from MC) +// void MRawEvtHeader::FillHeader(UInt_t uiN, Float_t ulTP) { - // - // used to set the header information (eg. from MC) - // fDAQEvtNumber = uiN; fTrigPattern[0] = (UInt_t) (ulTP/4294967296.0) ; @@ -218,10 +230,11 @@ } +// -------------------------------------------------------------------------- +// +// read the EVENT HEADER information from the input stream +// return FALSE if there is now header anymore, else TRUE +// int MRawEvtHeader::ReadEvt(istream &fin) { - // - // read the EVENT HEADER information from the input stream - // return FALSE if there is now header anymore, else TRUE - // fin.read((Byte_t*)&fDAQEvtNumber, 4); Index: trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc (revision 760) +++ trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc (revision 761) @@ -56,4 +56,8 @@ ClassImp(MRawEvtPixelIter) +// -------------------------------------------------------------------------- +// +// Return the number of stored pixels +// Byte_t MRawEvtPixelIter::GetNumPixels() const { @@ -61,4 +65,10 @@ } +// -------------------------------------------------------------------------- +// +// It steps to the next pixel. If there is no next pixel NULL is returned. +// If a next pixel where found, a pointer to the primary given (constructor) +// data structur is returned. +// MRawEvtData *MRawEvtPixelIter::Next() { @@ -98,4 +108,8 @@ } +// -------------------------------------------------------------------------- +// +// Reset the iteration. Jump to the first pixel. +// void MRawEvtPixelIter::Reset() { @@ -115,9 +129,10 @@ } +// -------------------------------------------------------------------------- +// +// Calls the draw-function of the actual pixel (see MRawEvtData::Draw) +// void MRawEvtPixelIter::Draw(Option_t *t) { - // - // Draw the actual pixel (for options see: MRawEvtData::Draw) - // char *txt = new char[6+strlen(t)]; sprintf(txt, "%s%d", t, *fHiGainId); @@ -126,4 +141,8 @@ } +// -------------------------------------------------------------------------- +// +// returns the sum of all hi gain fadc samples of the actual pixel +// ULong_t MRawEvtPixelIter::GetSumHiGainFadcSamples() const { @@ -142,4 +161,9 @@ } +// -------------------------------------------------------------------------- +// +// returns the sum of all lo gain fadc samples of the actual pixel. +// if no lo gain information is available 0 is returned. +// ULong_t MRawEvtPixelIter::GetSumLoGainFadcSamples() const {