Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h (revision 937) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h (revision 938) @@ -8,36 +8,36 @@ class MCerPhotPix : public TObject { - private: - - Int_t fPixId ; // the pixel Id - Bool_t fIsUsed ; // the pixel is used for calculations --> kTRUE - Bool_t fIsCore ; // the pixel is a Core pixel --> kTRUE - Float_t fPhot ; // The number of Cerenkov photons - Float_t fErrPhot ; // the error of fPhot - - public: - - MCerPhotPix(Int_t pix = -1, Float_t phot=0. , Float_t errphot=0.) ; +private: - void Print(Option_t *opt = NULL) ; - - Int_t GetPixId() const { return fPixId ; } - Float_t GetNumPhotons() const { return fPhot ; } - Float_t GetErrorPhot() const { return fErrPhot ; } + Int_t fPixId; // the pixel Id + Bool_t fIsUsed; // the pixel is used for calculations --> kTRUE + Bool_t fIsCore; // the pixel is a Core pixel --> kTRUE + Float_t fPhot; // The number of Cerenkov photons + Float_t fErrPhot; // the error of fPhot - void SetPixelContent(Int_t pix, Float_t phot, Float_t errphot); +public: - Bool_t IsPixelUsed() const { return fIsUsed ; } - void SetPixelUnused() { fIsUsed = kFALSE ; } - void SetPixelUsed() { fIsUsed = kTRUE ; } + MCerPhotPix(Int_t pix = -1, Float_t phot=0., Float_t errphot=0.); - void SetCorePixel() { fIsCore = kTRUE ; } - Bool_t IsCorePixel() const { return fIsCore ; } + void Print(Option_t *opt = NULL) ; - void SetNumPhotons(Float_t f) { fPhot = f; } - void SetErrorPhot(Float_t f) { fErrPhot = f; } - - ClassDef(MCerPhotPix, 1) // class containing information about the Cerenkov Photons in a pixel -} ; + Int_t GetPixId() const { return fPixId; } + Float_t GetNumPhotons() const { return fPhot; } + Float_t GetErrorPhot() const { return fErrPhot; } + + void SetPixelContent(Int_t pix, Float_t phot, Float_t errphot); + + Bool_t IsPixelUsed() const { return fIsUsed; } + void SetPixelUnused() { fIsUsed = kFALSE; } + void SetPixelUsed() { fIsUsed = kTRUE; } + + void SetCorePixel() { fIsCore = kTRUE; } + Bool_t IsCorePixel() const { return fIsCore; } + + void SetNumPhotons(Float_t f) { fPhot = f; } + void SetErrorPhot(Float_t f) { fErrPhot = f; } + + ClassDef(MCerPhotPix, 1) // class containing information about the Cerenkov Photons in a pixel +}; #endif Index: trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 937) +++ trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 938) @@ -6,4 +6,5 @@ #pragma link C++ class MShowSpect; +#pragma link C++ class MViewAdcSpectra; #pragma link C++ class MDumpEvtHeader; Index: trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc (revision 937) +++ trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc (revision 938) @@ -44,12 +44,21 @@ #include "MHFadcCam.h" +ClassImp(MViewAdcSpectra); + +// ================================================================================ +// +// default constructor +// MViewAdcSpectra::MViewAdcSpectra() { - // default constructor -} + fHistosAdc = new MHFadcCam; +} +// ================================================================================ +// +// default destructor +// MViewAdcSpectra::~MViewAdcSpectra() { - // default destructor delete fHistosAdc; } @@ -57,68 +66,71 @@ // ================================================================================ -Bool_t MViewAdcSpectra::AdcSpectra ( Char_t *inputfile, Char_t *treeName ) +// +// This job reads in the FADC data from all events and fills +// the spectrum for each pmt pixel. +// +Bool_t MViewAdcSpectra::AdcSpectra(Char_t *inputfile, Char_t *treeName) { - // This job reads in the FADC data from all events and fills - // the spectrum for each pmt pixel. - // + cout << "MViewAdcSpectra:: Analyse the tree '" << treeName << "'"; + cout << "in the file '" << inputfile << "'" << endl; - cout << "PedAdcSpectra:: Analyse the tree " << treeName - << "in the file " << inputfile << endl ; - - // create a (empty) list of parameters which can be used by the tasks - // and an (empty) list of tasks which should be executed - // connect them in the required way. - - // - // create the data containers for the raw data - // - MParList plist; - - MRawRunHeader runheader; - plist.AddToList(&runheader); + // + // create a (empty) list of parameters which can be used by the tasks + // and an (empty) list of tasks which should be executed + // connect them in the required way. + // - MRawEvtHeader evtheader; - plist.AddToList(&evtheader); - - MRawEvtData evtdata; - plist.AddToList(&evtdata); - - MRawCrateArray cratearray; - plist.AddToList(&cratearray); - - MTime evttime("MTime"); - plist.AddToList(&evttime); + // + // create the data containers for the raw data + // + MParList plist; - fHistosAdc= new MHFadcCam; - plist.AddToList( fHistosAdc ) ; + MRawRunHeader runheader; + plist.AddToList(&runheader); - // - // set up the tasks for this job - // - MTaskList tasks; - plist.AddToList(&tasks); + MRawEvtHeader evtheader; + plist.AddToList(&evtheader); - MReadTree readin ( treeName, inputfile ) ; - tasks.AddToList( &readin ) ; + MRawEvtData evtdata; + plist.AddToList(&evtdata); - // MDumpEvtHeader *dumpheader = new MDumpEvtHeader() ; - // tasks->AddToList( dumpheader ) ; - - MFillHFadc fillspect; - tasks.AddToList( &fillspect ) ; + MRawCrateArray cratearray; + plist.AddToList(&cratearray); - MShowSpect showspect( "MHFadcCam" ) ; - tasks.AddToList( &showspect ) ; + MTime evttime("MTime"); + plist.AddToList(&evttime); - // set up the loop for the processing - - MEvtLoop magic; - magic.SetParList(&plist); + plist.AddToList(fHistosAdc); - // start the loop running + // + // set up the tasks for this job + // + MTaskList tasks; + plist.AddToList(&tasks); - magic.Eventloop() ; - - return kTRUE ; + MReadTree readin(treeName, inputfile); + tasks.AddToList(&readin); -} + // + // MDumpEvtHeader *dumpheader = new MDumpEvtHeader() ; + // tasks->AddToList( dumpheader ) ; + // + MFillHFadc fillspect; + tasks.AddToList(&fillspect); + + MShowSpect showspect("MHFadcCam"); + tasks.AddToList(&showspect); + + // + // set up the loop for the processing + // + MEvtLoop magic; + magic.SetParList(&plist); + + // + // start the loop running + // + magic.Eventloop(); + + return kTRUE; +} Index: trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.h (revision 937) +++ trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.h (revision 938) @@ -8,24 +8,22 @@ class MHFadcCam; -class MViewAdcSpectra { +class MViewAdcSpectra +{ +private: + MHFadcCam *fHistosAdc; - private: +public: - MHFadcCam *fHistosAdc; + MViewAdcSpectra(); + virtual ~MViewAdcSpectra(); + + Bool_t AdcSpectra(Char_t *inputFile, Char_t *treeName); - public: - - MViewAdcSpectra() ; - - ~MViewAdcSpectra() ; - - Bool_t AdcSpectra( Char_t *inputFile , Char_t *treeName ) ; + // Bool_t CrAdcSpectra ( Char_t *inputFile ) ; + // Bool_t PedTdcSpectra( Char_t *inputFile ) ; + // Bool_t CrTdcSpectra ( Char_t *inputFile ) ; - // Bool_t CrAdcSpectra ( Char_t *inputFile ) ; - - // Bool_t PedTdcSpectra( Char_t *inputFile ) ; - // Bool_t CrTdcSpectra ( Char_t *inputFile ) ; - -} ; + ClassDef(MViewAdcSpectra, 0) // Part of the gui, displays Adc Spectras +}; #endif Index: trunk/MagicSoft/Mars/mmain/MBrowser.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MBrowser.cc (revision 937) +++ trunk/MagicSoft/Mars/mmain/MBrowser.cc (revision 938) @@ -39,4 +39,6 @@ #include + +ClassImp(MBrowser); enum { Index: trunk/MagicSoft/Mars/mmain/MBrowser.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 937) +++ trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 938) @@ -91,4 +91,6 @@ virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2); + + ClassDef(MBrowser, 0) // Base class for the gui } ; Index: trunk/MagicSoft/Mars/mmain/MainLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MainLinkDef.h (revision 937) +++ trunk/MagicSoft/Mars/mmain/MainLinkDef.h (revision 938) @@ -4,4 +4,6 @@ #pragma link off all classes; #pragma link off all functions; + +#pragma link C++ class MBrowser; #pragma link C++ class MMars;