Index: trunk/MagicSoft/Mars/mbase/MArrayD.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayD.cc (revision 5086) +++ (revision ) @@ -1,73 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Thomas Bretz 12/2000 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - - -////////////////////////////////////////////////////////////////////////////// -// -// MArrayD -// -// Array of Double_t. It is almost the same than TArrayD but derives from -// TObject -// -// Another advantage is: operator[] has no range check! -// -////////////////////////////////////////////////////////////////////////////// -#include "MArrayD.h" -#include "TArrayD.h" - -ClassImp(MArrayD); - -// -------------------------------------------------------------------------- -// -// Cuts the last entries of an array containing only zeros. -// -void MArrayD::StripZeros(TArrayD &arr) -{ - - const Int_t n = arr.GetSize(); - - for (Int_t i=n-1; i>=0; i--) - if (arr[i] != 0) - { - arr.Set(i+1); - break; - } -} - -// -------------------------------------------------------------------------- -// -// Cuts the last entries of an array containing only zeros. -// -void MArrayD::StripZeros() -{ - const Int_t n = GetSize(); - - for (Int_t i=n-1; i>=0; i--) - if ((*this)[i] != 0) - { - Set(i+1); - break; - } -} - Index: trunk/MagicSoft/Mars/mbase/MArrayD.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayD.h (revision 5086) +++ (revision ) @@ -1,165 +1,0 @@ -#ifndef MARS_MArrayD -#define MARS_MArrayD - -#ifndef MARS_MArray -#include "MArray.h" -#endif - -#include - -class TArrayD; -class MArrayD : public MArray -{ -private: - Double_t *fArray; //[fN] Array of fN chars - -public: - - MArrayD() - { - fN = 0; - fArray = NULL; - } - - MArrayD(UInt_t n) - { - fN = 0; - fArray = NULL; - Set(n); - } - - MArrayD(UInt_t n, Double_t *array) - { - // Create TArrayC object and initialize it with values of array. - fN = 0; - fArray = NULL; - Set(n, array); - } - - MArrayD(const MArrayD &array) - { - // Copy constructor. - fArray = NULL; - Set(array.fN, array.fArray); - } - - UInt_t GetSize() const - { - return fN; - } - - MArrayD &operator=(const MArrayD &rhs) - { - // TArrayC assignment operator. - if (this != &rhs) - Set(rhs.fN, rhs.fArray); - return *this; - } - - virtual ~MArrayD() - { - // Delete TArrayC object. - delete [] fArray; - fArray = NULL; - } - - void Adopt(UInt_t n, Double_t *array) - { - // Adopt array arr into TArrayC, i.e. don't copy arr but use it directly - // in TArrayC. User may not delete arr, TArrayC dtor will do it. - if (fArray) - delete [] fArray; - - fN = n; - fArray = array; - } - - void AddAt(Double_t c, UInt_t i) - { - // Add char c at position i. Check for out of bounds. - fArray[i] = c; - } - - Double_t At(UInt_t i) const - { - return fArray[i]; - } - - Double_t *GetArray() const - { - return fArray; - } - - void Reset() - { - memset(fArray, 0, fN*sizeof(Double_t)); - } - - void Set(UInt_t n) - { - // Set size of this array to n chars. - // A new array is created, the old contents copied to the new array, - // then the old array is deleted. - - if (n==fN) - return; - - Double_t *temp = fArray; - if (n == 0) - fArray = NULL; - else - { - fArray = new Double_t[n]; - if (n < fN) - memcpy(fArray, temp, n*sizeof(Double_t)); - else - { - memcpy(fArray, temp, fN*sizeof(Double_t)); - memset(&fArray[fN], 0, (n-fN)*sizeof(Double_t)); - } - } - - if (fN) - delete [] temp; - - fN = n; - } - - void Set(UInt_t n, Double_t *array) - { - // Set size of this array to n chars and set the contents. - if (!array) - return; - - if (fArray && fN != n) - { - delete [] fArray; - fArray = 0; - } - fN = n; - - if (fN == 0) - return; - - if (!fArray) - fArray = new Double_t[fN]; - - memcpy(fArray, array, n*sizeof(Double_t)); - } - - Double_t &operator[](UInt_t i) - { - return fArray[i]; - } - const Double_t &operator[](UInt_t i) const - { - return fArray[i]; - } - - static void StripZeros(TArrayD &arr); - void StripZeros(); - - ClassDef(MArrayD, 1) //Array of Double_t -}; - -#endif Index: trunk/MagicSoft/Mars/mbase/MArrayF.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayF.cc (revision 5086) +++ (revision ) @@ -1,73 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Thomas Bretz 12/2000 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - - -////////////////////////////////////////////////////////////////////////////// -// -// MArrayF -// -// Array of Float_t. It is almost the same than TArrayF but derives from -// TObject -// -// Another advantage is: operator[] has no range check! -// -////////////////////////////////////////////////////////////////////////////// -#include "MArrayF.h" -#include "TArrayF.h" - -ClassImp(MArrayF); - -// -------------------------------------------------------------------------- -// -// Cuts the last entries of an array containing only zeros. -// -void MArrayF::StripZeros(TArrayF &arr) -{ - - const Int_t n = arr.GetSize(); - - for (Int_t i=n-1; i>=0; i--) - if (arr[i] != 0) - { - arr.Set(i+1); - break; - } -} - -// -------------------------------------------------------------------------- -// -// Cuts the last entries of an array containing only zeros. -// -void MArrayF::StripZeros() -{ - const Int_t n = GetSize(); - - for (Int_t i=n-1; i>=0; i--) - if ((*this)[i] != 0) - { - Set(i+1); - break; - } -} - Index: trunk/MagicSoft/Mars/mbase/MArrayF.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayF.h (revision 5086) +++ (revision ) @@ -1,165 +1,0 @@ -#ifndef MARS_MArrayF -#define MARS_MArrayF - -#ifndef MARS_MArray -#include "MArray.h" -#endif - -#include - -class TArrayF; -class MArrayF : public MArray -{ -private: - Float_t *fArray; //[fN] Array of fN chars - -public: - - MArrayF() - { - fN = 0; - fArray = NULL; - } - - MArrayF(UInt_t n) - { - fN = 0; - fArray = NULL; - Set(n); - } - - MArrayF(UInt_t n, Float_t *array) - { - // Create TArrayC object and initialize it with values of array. - fN = 0; - fArray = NULL; - Set(n, array); - } - - MArrayF(const MArrayF &array) - { - // Copy constructor. - fArray = NULL; - Set(array.fN, array.fArray); - } - - UInt_t GetSize() const - { - return fN; - } - - MArrayF &operator=(const MArrayF &rhs) - { - // TArrayC assignment operator. - if (this != &rhs) - Set(rhs.fN, rhs.fArray); - return *this; - } - - virtual ~MArrayF() - { - // Delete TArrayC object. - delete [] fArray; - fArray = NULL; - } - - void Adopt(UInt_t n, Float_t *array) - { - // Adopt array arr into TArrayC, i.e. don't copy arr but use it directly - // in TArrayC. User may not delete arr, TArrayC dtor will do it. - if (fArray) - delete [] fArray; - - fN = n; - fArray = array; - } - - void AddAt(Float_t c, UInt_t i) - { - // Add char c at position i. Check for out of bounds. - fArray[i] = c; - } - - Float_t At(UInt_t i) const - { - return fArray[i]; - } - - Float_t *GetArray() const - { - return fArray; - } - - void Reset() - { - memset(fArray, 0, fN*sizeof(Float_t)); - } - - void Set(UInt_t n) - { - // Set size of this array to n chars. - // A new array is created, the old contents copied to the new array, - // then the old array is deleted. - - if (n==fN) - return; - - Float_t *temp = fArray; - if (n == 0) - fArray = NULL; - else - { - fArray = new Float_t[n]; - if (n < fN) - memcpy(fArray, temp, n*sizeof(Float_t)); - else - { - memcpy(fArray, temp, fN*sizeof(Float_t)); - memset(&fArray[fN], 0, (n-fN)*sizeof(Float_t)); - } - } - - if (fN) - delete [] temp; - - fN = n; - } - - void Set(UInt_t n, Float_t *array) - { - // Set size of this array to n chars and set the contents. - if (!array) - return; - - if (fArray && fN != n) - { - delete [] fArray; - fArray = 0; - } - fN = n; - - if (fN == 0) - return; - - if (!fArray) - fArray = new Float_t[fN]; - - memcpy(fArray, array, n*sizeof(Float_t)); - } - - Float_t &operator[](UInt_t i) - { - return fArray[i]; - } - const Float_t &operator[](UInt_t i) const - { - return fArray[i]; - } - - static void StripZeros(TArrayF &arr); - void StripZeros(); - - ClassDef(MArrayF, 1) //Array of Float_t -}; - -#endif Index: trunk/MagicSoft/Mars/mbase/MArrayI.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayI.cc (revision 5086) +++ (revision ) @@ -1,39 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Thomas Bretz 12/2000 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - - -////////////////////////////////////////////////////////////////////////////// -// -// MArrayI -// -// Array of Int_t. It is almost the same than TArrayI but derives from -// TObject -// -// Another advantage is: operator[] has no range check! -// -////////////////////////////////////////////////////////////////////////////// -#include "MArrayI.h" - -ClassImp(MArrayI); - Index: trunk/MagicSoft/Mars/mbase/MArrayI.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MArrayI.h (revision 5086) +++ (revision ) @@ -1,161 +1,0 @@ -#ifndef MARS_MArrayI -#define MARS_MArrayI - -#ifndef MARS_MArray -#include "MArray.h" -#endif - -#include - -class MArrayI : public MArray -{ -private: - Int_t *fArray; //[fN] Array of fN chars - -public: - - MArrayI() - { - fN = 0; - fArray = NULL; - } - - MArrayI(UInt_t n) - { - fN = 0; - fArray = NULL; - Set(n); - } - - MArrayI(UInt_t n, Int_t *array) - { - // Create TArrayC object and initialize it with values of array. - fN = 0; - fArray = NULL; - Set(n, array); - } - - MArrayI(const MArrayI &array) - { - // Copy constructor. - fArray = NULL; - Set(array.fN, array.fArray); - } - - UInt_t GetSize() const - { - return fN; - } - - MArrayI &operator=(const MArrayI &rhs) - { - // TArrayC assignment operator. - if (this != &rhs) - Set(rhs.fN, rhs.fArray); - return *this; - } - - virtual ~MArrayI() - { - // Delete TArrayC object. - delete [] fArray; - fArray = NULL; - } - - void Adopt(UInt_t n, Int_t *array) - { - // Adopt array arr into TArrayC, i.e. don't copy arr but use it directly - // in TArrayC. User may not delete arr, TArrayC dtor will do it. - if (fArray) - delete [] fArray; - - fN = n; - fArray = array; - } - - void AddAt(Int_t c, UInt_t i) - { - // Add char c at position i. Check for out of bounds. - fArray[i] = c; - } - - Int_t At(UInt_t i) const - { - return fArray[i]; - } - - Int_t *GetArray() const - { - return fArray; - } - - void Reset() - { - memset(fArray, 0, fN*sizeof(Int_t)); - } - - void Set(UInt_t n) - { - // Set size of this array to n chars. - // A new array is created, the old contents copied to the new array, - // then the old array is deleted. - - if (n==fN) - return; - - Int_t *temp = fArray; - if (n == 0) - fArray = NULL; - else - { - fArray = new Int_t[n]; - if (n < fN) - memcpy(fArray, temp, n*sizeof(Int_t)); - else - { - memcpy(fArray, temp, fN*sizeof(Int_t)); - memset(&fArray[fN], 0, (n-fN)*sizeof(Int_t)); - } - } - - if (fN) - delete [] temp; - - fN = n; - } - - void Set(UInt_t n, Int_t *array) - { - // Set size of this array to n chars and set the contents. - if (!array) - return; - - if (fArray && fN != n) - { - delete [] fArray; - fArray = 0; - } - fN = n; - - if (fN == 0) - return; - - if (!fArray) - fArray = new Int_t[fN]; - - memcpy(fArray, array, n*sizeof(Int_t)); - } - - Int_t &operator[](UInt_t i) - { - return fArray[i]; - } - const Int_t &operator[](UInt_t i) const - { - return fArray[i]; - } - - ClassDef(MArrayI, 1) //Array of Int_t -}; - -#endif