Index: trunk/MagicSoft/Mars/mhist/MFillHFadc.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHFadc.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MFillHFadc.cc (revision 859) @@ -25,11 +25,17 @@ ////////////////////////////////////////////////////////////////////////////// -// -// MFillHFadc -// -// This task fill the n time slices from all pixels -// (stored in a MRawEvtData container) into histograms. -// This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix -// +// // +// MFillHFadc // +// // +// This task fill the n time slices from all pixels // +// (stored in a MRawEvtData container) into histograms. // +// This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix // +// // +// Input Containers: // +// MRawEvtData // +// // +// Output Containers: // +// MHFadcCam // +// // ////////////////////////////////////////////////////////////////////////////// @@ -43,5 +49,5 @@ #include "MRawEvtPixelIter.h" -ClassImp(MFillHFadc) +ClassImp(MFillHFadc); // -------------------------------------------------------------------------- @@ -62,8 +68,8 @@ // check if all necessary input containers are existing // - fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData"); + fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData"); if (!fRawEvtData) { - *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl; + *fLog << dbginf << "MRawEvtData not found... exit." << endl; return kFALSE; } Index: trunk/MagicSoft/Mars/mhist/MFillHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHHillas.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MFillHHillas.cc (revision 859) @@ -24,12 +24,18 @@ \* ======================================================================== */ -//////////////////////////////////////////////////////////////////////// -// -// MFillHHillas -// -// This task fills the hillas parameter from MHillas into -// histograms (MHHillas) -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// // +// MFillHHillas // +// // +// This task fills the hillas parameter from MHillas into // +// histograms (MHHillas) // +// // +// Input Containers: // +// MHillas // +// // +// Output Containers: // +// MHHillas // +// // +////////////////////////////////////////////////////////////////////////////// #include "MFillHHillas.h" @@ -39,5 +45,5 @@ #include "MParList.h" -ClassImp(MFillHHillas) +ClassImp(MFillHHillas); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MFillHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHHillas.h (revision 855) +++ trunk/MagicSoft/Mars/mhist/MFillHHillas.h (revision 859) @@ -16,5 +16,5 @@ class MFillHHillas : public MTask { private: - MHillas *fEvt; + const MHillas *fEvt; MHHillas *fHistos ; Index: trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc (revision 859) @@ -23,13 +23,19 @@ \* ======================================================================== */ -//////////////////////////////////////////////////////////////////////// -// -// MFillHStarMap -// -// This task fills a star map (a 2D histogram, MHStarMap) -// from the calculated hillas parameter (MHillas). -// The algorithm for this can be found in MHStarMap::Fill -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// // +// MFillHStarMap // +// // +// This task fills a star map (a 2D histogram, MHStarMap) // +// from the calculated hillas parameter (MHillas). // +// The algorithm for this can be found in MHStarMap::Fill // +// // +// Input Containers: // +// MHillas // +// // +// Output Containers: // +// MHStarMap // +// // +////////////////////////////////////////////////////////////////////////////// #include "MFillHStarMap.h" @@ -40,5 +46,5 @@ #include "MParList.h" -ClassImp(MFillHStarMap) +ClassImp(MFillHStarMap); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MFillHStarMap.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHStarMap.h (revision 855) +++ trunk/MagicSoft/Mars/mhist/MFillHStarMap.h (revision 859) @@ -14,20 +14,20 @@ class MHillas; -class MFillHStarMap : public MTask { - private: - MHillas *fEvt; - MHStarMap *fHistos ; +class MFillHStarMap : public MTask +{ +private: + const MHillas *fEvt; + MHStarMap *fHistos ; - public: - MFillHStarMap(const char *name=NULL, const char *title=NULL); +public: + MFillHStarMap(const char *name=NULL, const char *title=NULL); - Bool_t PreProcess(MParList *pList); - Bool_t Process(); - Bool_t PostProcess(); - - ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters + Bool_t PreProcess(MParList *pList); + Bool_t Process(); + Bool_t PostProcess(); + ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters }; - + #endif Index: trunk/MagicSoft/Mars/mhist/MHFadcCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 859) @@ -36,5 +36,5 @@ #include -ClassImp(MHFadcCam) +ClassImp(MHFadcCam); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MHFadcPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 859) @@ -37,5 +37,5 @@ #include -ClassImp(MHFadcPix) +ClassImp(MHFadcPix); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 859) @@ -17,5 +17,5 @@ #include "MHillas.h" -ClassImp(MHHillas) +ClassImp(MHHillas); MHHillas::MHHillas (const char *name, const char *title) @@ -55,5 +55,5 @@ } -void MHHillas::Fill(MHillas *par) +void MHHillas::Fill(const MHillas *par) { fAlpha ->Fill(fabs(par->GetAlpha())); Index: trunk/MagicSoft/Mars/mhist/MHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHHillas.h (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHHillas.h (revision 859) @@ -25,5 +25,5 @@ ~MHHillas(); - void Fill(MHillas *par); + void Fill(const MHillas *par); TH1F *GetHistAlpha() { return fAlpha; } Index: trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 859) @@ -29,5 +29,5 @@ #include -ClassImp(MHMcCollectionArea) +ClassImp(MHMcCollectionArea); MHMcCollectionArea::MHMcCollectionArea(const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc (revision 859) @@ -28,5 +28,5 @@ #include "MHMcEnergy.h" -ClassImp(MHMcEnergies) +ClassImp(MHMcEnergies); MHMcEnergies::MHMcEnergies(const UInt_t count, const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 859) @@ -32,5 +32,5 @@ #include -ClassImp(MHMcEnergy) +ClassImp(MHMcEnergy); MHMcEnergy::MHMcEnergy(const UInt_t idx, const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 859) @@ -42,5 +42,5 @@ #include "MHillas.h" -ClassImp(MHStarMap) +ClassImp(MHStarMap); MHStarMap::MHStarMap (const char *name, const char *title) @@ -133,5 +133,5 @@ } -void MHStarMap::Fill(MHillas *par) +void MHStarMap::Fill(const MHillas *par) { const float dist = par->GetDist(); Index: trunk/MagicSoft/Mars/mhist/MHStarMap.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.h (revision 855) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.h (revision 859) @@ -27,5 +27,5 @@ ~MHStarMap(); - void Fill(MHillas *par); + void Fill(const MHillas *par); TH2F *GetHist() { return fStarMap; }