Index: /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 857) @@ -31,4 +31,10 @@ // files can be found on the Magic homepage. // // // +// Input Containers: // +// -/- // +// // +// Output Containers: // +// MCerPhotEvt // +// // ///////////////////////////////////////////////////////////////////////////// @@ -46,5 +52,5 @@ #include "MPedestalCam.h" -ClassImp(MCT1ReadAscii) +ClassImp(MCT1ReadAscii); // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 857) @@ -30,4 +30,10 @@ // time slices. At the moment it integrates simply the FADC values. // // // +// Input Containers: // +// MRawEvtData, MPedesdtalCam // +// // +// Output Containers: // +// MCerPhotEvt // +// // ////////////////////////////////////////////////////////////////////////////// @@ -44,5 +50,5 @@ #include "MPedestalCam.h" -ClassImp(MCerPhotCalc) +ClassImp(MCerPhotCalc); // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h (revision 857) @@ -21,7 +21,7 @@ class MCerPhotCalc : public MTask { - MRawEvtData *fRawEvt; // raw event data (time slices) - MPedestalCam *fPedestals; // Pedestals of all pixels in the camera - MCerPhotEvt *fCerPhotEvt; // Cerenkov Photon Event used for calculation + const MPedestalCam *fPedestals; // Pedestals of all pixels in the camera + MRawEvtData *fRawEvt; // raw event data (time slices) + MCerPhotEvt *fCerPhotEvt; // Cerenkov Photon Event used for calculation public: Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 857) @@ -36,5 +36,5 @@ #include "MCerPhotPix.h" -ClassImp(MCerPhotEvt) +ClassImp(MCerPhotEvt); // -------------------------------------------------------------------------- @@ -46,5 +46,5 @@ *fName = name ? name : "MCerPhotEvt"; - *fTitle = name ? name : "(Number of Photon)-Event Information"; + *fTitle = title ? title : "(Number of Photon)-Event Information"; fPixels = new TClonesArray ("MCerPhotPix", 577) ; Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h (revision 857) @@ -21,32 +21,28 @@ public: - MCerPhotEvt(const char *name=NULL, const char *title=NULL) ; + MCerPhotEvt(const char *name=NULL, const char *title=NULL); ~MCerPhotEvt() { delete fPixels; } - void Draw(Option_t* option = "" ) ; + void Draw(Option_t* option = ""); - UInt_t GetNumPixels() const { return fNumPixels; } + UInt_t GetNumPixels() const { return fNumPixels; } - void AddPixel(Int_t id, Float_t nph, Float_t err ); + void AddPixel(Int_t id, Float_t nph, Float_t err); - void Clear(Option_t *opt=NULL) ; + void Clear(Option_t *opt=NULL); + void Print(Option_t *opt=NULL); - void Print(Option_t *opt=NULL) ; + Bool_t IsPixelExisting( Int_t id ); + Bool_t IsPixelUsed ( Int_t id ); + Bool_t IsPixelCore ( Int_t id ); - // void CleanLevel1() ; - // void CleanLevel2() ; - // void CleanLevel3() ; - - Bool_t IsPixelExisting( Int_t id ); - Bool_t IsPixelUsed ( Int_t id ); - Bool_t IsPixelCore ( Int_t id ); - - Float_t GetNumPhotonsMin(); - Float_t GetNumPhotonsMax(); + Float_t GetNumPhotonsMin(); + Float_t GetNumPhotonsMax(); - MCerPhotPix &operator[](int i) { return *(MCerPhotPix*)(fPixels->At(i)); } + MCerPhotPix &operator[](int i) { return *(MCerPhotPix*)(fPixels->At(i)); } + MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->At(i)); } - ClassDef(MCerPhotEvt, 1) // class for an event containing cerenkov photons -}; + ClassDef(MCerPhotEvt, 1) // class for an event containing cerenkov photons +}; #endif Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc (revision 857) @@ -28,5 +28,5 @@ #include "MLog.h" -ClassImp(MCerPhotPix) +ClassImp(MCerPhotPix); // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/manalysis/MHillas.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 857) @@ -46,5 +46,5 @@ #include "MLog.h" -ClassImp(MHillas) +ClassImp(MHillas); // -------------------------------------------------------------------------- @@ -160,5 +160,5 @@ // (The calcualtion is some kind of two dimentional statistics) // -Bool_t MHillas::Calc(MGeomCam &geom, MCerPhotEvt &evt) +Bool_t MHillas::Calc(const MGeomCam &geom, const MCerPhotEvt &evt) { const UInt_t nevt = evt.GetNumPixels(); @@ -284,5 +284,5 @@ if (xmean<0) fTheta += kPI; // [rad] - SetHasChanged(); + SetReadyToSave(); return kTRUE; Index: /trunk/MagicSoft/Mars/manalysis/MHillas.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillas.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MHillas.h (revision 857) @@ -29,5 +29,5 @@ void Reset(); - Bool_t Calc(MGeomCam &geom, MCerPhotEvt &pix); + Bool_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix); void Print(Option_t *opt=NULL); Index: /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 857) @@ -30,4 +30,10 @@ // This is a task to calculate the Hillas parameters from each event // // // +// Input Containers: // +// MCerPhotEvt, MGeomCam // +// // +// Output Containers: // +// MHillas // +// // ///////////////////////////////////////////////////////////////////////////// @@ -42,5 +48,5 @@ #include "MLogManip.h" -ClassImp(MHillasCalc) +ClassImp(MHillasCalc); // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/manalysis/MHillasCalc.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillasCalc.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MHillasCalc.h (revision 857) @@ -20,7 +20,7 @@ class MHillasCalc : public MTask { - MGeomCam *fGeomCam; // Camera Geometry used to calculate Hillas - MCerPhotEvt *fCerPhotEvt; // Cerenkov Photon Event used for calculation - MHillas *fHillas; // ouput container to store result + const MGeomCam *fGeomCam; // Camera Geometry used to calculate Hillas + const MCerPhotEvt *fCerPhotEvt; // Cerenkov Photon Event used for calculation + MHillas *fHillas; // ouput container to store result public: Index: /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 857) @@ -25,10 +25,16 @@ ///////////////////////////////////////////////////////////////////////////// -// -// MImgCleanStd -// -// This is the standard image cleaning. If you want to know how it works -// Please look at the three CleanSteps and Process -// +// // +// MImgCleanStd // +// // +// This is the standard image cleaning. If you want to know how it works // +// Please look at the three CleanSteps and Process // +// // +// Input Containers: // +// MGeomCam, MCerPhotEvt // +// // +// Output Containers: // +// -/- // +// // ///////////////////////////////////////////////////////////////////////////// #include "MImgCleanStd.h" @@ -42,5 +48,5 @@ #include "MCerPhotEvt.h" -ClassImp(MImgCleanStd) +ClassImp(MImgCleanStd); // -------------------------------------------------------------------------- @@ -118,6 +124,6 @@ // state is 'used' // - MGeomPix &gpix = (*fCam)[id]; - const Int_t nnmax = gpix.GetNumNeighbors(); + const MGeomPix &gpix = (*fCam)[id]; + const Int_t nnmax = gpix.GetNumNeighbors(); Int_t cnt = 0; Index: /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h (revision 857) @@ -15,6 +15,6 @@ { private: - MGeomCam *fCam; - MCerPhotEvt *fEvt; + const MGeomCam *fCam; + MCerPhotEvt *fEvt; Float_t fCleanLvl1; Index: /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 857) @@ -25,5 +25,11 @@ ///////////////////////////////////////////////////////////////////////////// // // -// MMcPedestalCopy // +// MMcPedestalCopy // +// // +// Input Containers: // +// MMcFadcHeader // +// // +// Output Containers: // +// MPedestalCam // // // ///////////////////////////////////////////////////////////////////////////// @@ -39,5 +45,5 @@ #include "MMcFadcHeader.hxx" -ClassImp(MMcPedestalCopy) +ClassImp(MMcPedestalCopy); MMcPedestalCopy::MMcPedestalCopy(const char *name, const char *title) Index: /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h (revision 857) @@ -23,8 +23,8 @@ class MMcPedestalCopy : public MTask { - MMcFadcHeader *fMcPedestals; // - MPedestalCam *fPedestals; // + const MMcFadcHeader *fMcPedestals; // + MPedestalCam *fPedestals; // - TString *fSrc; + TString *fSrc; public: Index: /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc (revision 857) @@ -28,4 +28,10 @@ // MPedCalcPedRun // // // +// Input Containers: // +// MRawEvtData // +// // +// Output Containers: // +// MPedestalCam // +// // ///////////////////////////////////////////////////////////////////////////// @@ -43,5 +49,5 @@ #include "MPedestalCam.h" -ClassImp(MPedCalcPedRun) +ClassImp(MPedCalcPedRun); MPedCalcPedRun::MPedCalcPedRun(const char *name, const char *title) Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 857) @@ -34,5 +34,5 @@ #include "MLog.h" -ClassImp(MPedestalCam) +ClassImp(MPedestalCam); // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h (revision 857) @@ -25,5 +25,6 @@ void InitSize(const UInt_t i) { fArray->ExpandCreateFast(i); } - MPedestalPix &operator[](Int_t i) { return *(MPedestalPix*)fArray->At(i); } + MPedestalPix &operator[](Int_t i) { return *(MPedestalPix*)fArray->At(i); } + MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->At(i); } ClassDef(MPedestalCam, 1) // Storage Container for all pedestal information of the camera Index: /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 856) +++ /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 857) @@ -35,5 +35,5 @@ #include "MLog.h" -ClassImp(MPedestalPix) +ClassImp(MPedestalPix); MPedestalPix::MPedestalPix()