Index: trunk/MagicSoft/Mars/mdatacheck/DataCheckIncl.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/DataCheckIncl.h (revision 706) +++ trunk/MagicSoft/Mars/mdatacheck/DataCheckIncl.h (revision 710) @@ -1,14 +1,3 @@ #ifndef __CINT__ -#include "MParList.h" - -#include "MRawRunHeader.h" -#include "MRawEvtHeader.h" -#include "MRawEvtData.h" -#include "MRawCrateArray.h" -#include "MTime.h" -#include "MInputStreamID.h" - -#include "MReadTree.h" - #endif // __CINT__ Index: trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 706) +++ trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 710) @@ -5,13 +5,5 @@ #pragma link off all functions; -#pragma link C++ class MHFadcCam; -#pragma link C++ class MHFadcPix; -#pragma link C++ class MHHillas; - #pragma link C++ class MShowSpect; - -#pragma link C++ class MFillHFadc; -#pragma link C++ class MFillHHillas; - #pragma link C++ class MDumpEvtHeader; Index: trunk/MagicSoft/Mars/mdatacheck/MFillHFadc.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MFillHFadc.cc (revision 706) +++ (revision ) @@ -1,65 +1,0 @@ -#include "MFillHFadc.h" - -#include "MLog.h" -#include "MLogManip.h" -#include "MParList.h" -#include "MHFadcCam.h" -#include "MRawEvtData.h" -#include "MRawEvtPixelIter.h" - -ClassImp(MFillHFadc) - - MFillHFadc::MFillHFadc (const char *name, const char *title) : fRawEvtData(NULL) -{ - *fName = name ? name : "MFillHFadc"; - *fTitle = title ? title : "Task to fill the adc spectra with raw data"; -} - -Bool_t MFillHFadc::PreProcess (MParList *pList) -{ - // connect the raw data with this task - - fHistos = (MHFadcCam*)pList->FindCreateObj("MHFadcCam"); - if (!fHistos) - return kFALSE; - - fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData"); - if (!fRawEvtData) - { - *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl; - return kFALSE ; - } - - return kTRUE ; - -} - -Bool_t MFillHFadc::Process() -{ - // loop over the pixels and fill the values in the histograms - - MRawEvtPixelIter pixel(fRawEvtData); - - const Int_t nhisamples = fRawEvtData->GetNumHiGainSamples() ; - const Int_t nlosamples = fRawEvtData->GetNumLoGainSamples() ; - - // cout << "HighSamples " << iHighSamples ; - - while ( pixel.Next() ) - { - for (Int_t i=0 ; iFillHi ( pixel.GetPixelId(), - pixel.GetHiGainFadcSamples()[i] ); - } - - for (Int_t i=0 ; iFillLo ( pixel.GetPixelId(), - pixel.GetLoGainFadcSamples()[i] ); - } - } - - return kTRUE; - -} Index: trunk/MagicSoft/Mars/mdatacheck/MFillHFadc.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MFillHFadc.h (revision 706) +++ (revision ) @@ -1,33 +1,0 @@ -#ifndef MFILLHFADC_H -#define MFILLHFADC_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MTASK_H -#include "MTask.h" -#endif - -class MParList; -class MHFadcCam; -class MRawEvtData; - -class MFillHFadc : public MTask { - private: - MRawEvtData *fRawEvtData; - - MHFadcCam *fHistos ; - - public: - MFillHFadc (const char *name=NULL, const char *title=NULL); - - Bool_t PreProcess(MParList *pList); - Bool_t Process() ; - - ClassDef(MFillHFadc, 0) // Task to fill a MHistosAdc Container with data - -}; - -#endif - Index: trunk/MagicSoft/Mars/mdatacheck/MFillHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MFillHHillas.cc (revision 706) +++ (revision ) @@ -1,37 +1,0 @@ -#include "MFillHHillas.h" - -#include "MLog.h" -#include "MLogManip.h" -#include "MHHillas.h" -#include "MParList.h" - -ClassImp(MFillHHillas) - -MFillHHillas::MFillHHillas (const char *name, const char *title) -{ - *fName = name ? name : "MFillHHillas"; - *fTitle = title ? title : "Task to fill Hillas histograms"; -} - -Bool_t MFillHHillas::PreProcess (MParList *pList) -{ - fEvt = (MHillas*)pList->FindObject("MHillas"); - if (!fEvt) - { - *fLog << dbginf << "MHillas not found... aborting." << endl; - return kFALSE ; - } - - fHistos = (MHHillas*)pList->FindCreateObj("MHHillas"); - if (!fHistos) - return kFALSE; - - return kTRUE ; -} - -Bool_t MFillHHillas::Process() -{ - fHistos->Fill(fEvt); - - return kTRUE; -} Index: trunk/MagicSoft/Mars/mdatacheck/MFillHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MFillHHillas.h (revision 706) +++ (revision ) @@ -1,32 +1,0 @@ -#ifndef MFILLHHILLAS_H -#define MFILLHHILLAS_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MTASK_H -#include "MTask.h" -#endif - -class MParList; -class MHHillas; -class MHillas; - -class MFillHHillas : public MTask { - private: - MHillas *fEvt; - MHHillas *fHistos ; - - public: - MFillHHillas (const char *name=NULL, const char *title=NULL); - - Bool_t PreProcess(MParList *pList); - Bool_t Process() ; - - ClassDef(MFillHHillas, 0) // Task to fill the Hillas histograms - -}; - -#endif - Index: trunk/MagicSoft/Mars/mdatacheck/MHFadcCam.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHFadcCam.cc (revision 706) +++ (revision ) @@ -1,66 +1,0 @@ -/////////////////////////////////////////////////////////////////////// -// -// MHFadcCam -// -// This class contains a list of all ADC spektra histograms -// -/////////////////////////////////////////////////////////////////////// - -#include "MHFadcCam.h" - -#include - -ClassImp(MHFadcCam) - -MHFadcCam::MHFadcCam (const char *name, const char *title) -{ - // - // default constructor - // creates an a list of histograms for all pixels and both gain channels - // - - // - // set the name and title of this object - // - - *fName = name ? name : "MHFadcCam" ; - *fTitle = title ? title : "Container for ADC spectra histograms" ; - - // - // loop over all Pixels and create two histograms - // one for the Low and one for the High gain - // connect all the histogram with the container fHist - // - fArray = new TObjArray(577); - - for (Int_t i=0; i<577; i++) - (*fArray)[i] = new MHFadcPix(i); -} - -MHFadcCam::~MHFadcCam () -{ - delete fArray; -} - -/*void MHFadcCam::SaveHist(char *name) -{ - // - // save all histogram in this class to a root file - // - - // - // FIXME: Don't open a file and write to this file! - // just Fill the current container (or the two histograms - // to an open file. The user must choose a file before. - // - TFile out( name, "recreate") ; - - // - // loop over all pixels and write the files out - // - - fHistLo->Write() ; - fHistHi->Write() ; -} - - */ Index: trunk/MagicSoft/Mars/mdatacheck/MHFadcCam.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHFadcCam.h (revision 706) +++ (revision ) @@ -1,54 +1,0 @@ -#ifndef MHFADCCAM_H -#define MHFADCCAM_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef ROOT_TObjArray -#include -#endif - -#ifndef MPARCONTAINER_H -#include "MParContainer.h" -#endif -#ifndef MHFADCPIX_H -#include "MHFadcPix.h" -#endif - -class TH1F; - -class MHFadcCam : public MParContainer -{ -private: - TObjArray *fArray; // List of Lo/Hi gain Histograms - -public: - MHFadcCam(const char *name=NULL, const char *title=NULL); - ~MHFadcCam(); - - void FillHi(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillHi(data); } - void FillLo(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillLo(data); } - - // void SaveHist(char *name); - - MHFadcPix *operator[](UInt_t i) { return (MHFadcPix*)(fArray->At(i)); } - - TH1F *GetHistHi(UInt_t i) { return (*this)[i]->GetHistHi(); } - TH1F *GetHistLo(UInt_t i) { return (*this)[i]->GetHistLo(); } - - void DrawHi(UInt_t i) { GetHistHi(i)->Draw(); } - void DrawLo(UInt_t i) { GetHistLo(i)->Draw(); } - - void Draw(UInt_t i) { (*this)[i]->Draw(); } - - Int_t GetEntries() - { - return fArray->GetEntries() ; - } - - ClassDef(MHFadcCam, 1) // list of Histograms with ADC spectra -}; - -#endif - Index: trunk/MagicSoft/Mars/mdatacheck/MHFadcPix.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHFadcPix.cc (revision 706) +++ (revision ) @@ -1,31 +1,0 @@ -/////////////////////////////////////////////////////////////////////// -// -// MHistosAdc -// -// This class contains a list of all ADC spektra histograms -// -/////////////////////////////////////////////////////////////////////// - -#include "MHFadcPix.h" - -#include - -ClassImp(MHFadcPix) - -void MHFadcPix::Draw(Option_t *) -{ - if (!gPad) - { - if (!gROOT->GetMakeDefCanvas()) - return; - (gROOT->GetMakeDefCanvas())(); - } - - gPad->Divide(1, 2); - - gPad->cd(0); - fHistHi->Draw(); - - gPad->cd(1); - fHistLo->Draw(); -} Index: trunk/MagicSoft/Mars/mdatacheck/MHFadcPix.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHFadcPix.h (revision 706) +++ (revision ) @@ -1,54 +1,0 @@ -#ifndef MHFADCPIX_H -#define MHFADCPIX_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef ROOT_TH1 -#include -#endif - -class MHFadcPix : public TObject -{ -private: - TH1F *fHistHi; - TH1F *fHistLo; - -public: - MHFadcPix(UInt_t pixid) - { - Char_t tmp1[40]; - Char_t tmp2[40]; - - sprintf(tmp1, "high%d", pixid); - sprintf(tmp2, "high gain Pixel %d", pixid); - - fHistHi = new TH1F(tmp1, tmp2, 256, 0, 255); - - sprintf(tmp1, "low %d", pixid); - sprintf(tmp2, "low gain Pixel %d", pixid); - - fHistLo = new TH1F(tmp1, tmp2, 256, 0, 255); - } - ~MHFadcPix() - { - delete fHistHi; - delete fHistLo; - } - TH1F *GetHistHi() { return fHistHi; } - TH1F *GetHistLo() { return fHistLo; } - - void FillHi(Byte_t i) { fHistHi->Fill(i); } - void FillLo(Byte_t i) { fHistLo->Fill(i); } - - void DrawHi() { fHistHi->Draw(); } - void DrawLo() { fHistLo->Draw(); } - - void Draw(Option_t *opt=NULL); - - ClassDef(MHFadcPix, 1) -}; - -#endif - Index: trunk/MagicSoft/Mars/mdatacheck/MHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHHillas.cc (revision 706) +++ (revision ) @@ -1,81 +1,0 @@ -/////////////////////////////////////////////////////////////////////// -// -// MHHillas -// -// This class contains histograms for every Hillas parameter -// -/////////////////////////////////////////////////////////////////////// - -#include "MHHillas.h" - -#include -#include -#include - -#include "MHillas.h" - -ClassImp(MHHillas) - -MHHillas::MHHillas (const char *name, const char *title) -{ - // - // default constructor - // creates an a list of histograms for all pixels and both gain channels - // - - // - // set the name and title of this object - // - - *fName = name ? name : "MHHillas" ; - *fTitle = title ? title : "Container for Hillas histograms" ; - - // - // loop over all Pixels and create two histograms - // one for the Low and one for the High gain - // connect all the histogram with the container fHist - // - fAlpha = new TH1F("Alpha [deg]", "Alpha of Hillas", 90, 0, 90); - fWidth = new TH1F("Width [mm]", "Width of Hillas", 100, 0, 300); - fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300); - fDist = new TH1F("Dist [mm]", "Dist of Hillas", 100, 0, 300); -} - -MHHillas::~MHHillas() -{ - delete fAlpha; - delete fWidth; - delete fLength; - delete fDist; -} - -void MHHillas::Fill(MHillas *par) -{ - fAlpha ->Fill(fabs(par->GetAlpha())); - fWidth ->Fill(par->GetWidth()); - fLength->Fill(par->GetLength()); - fDist ->Fill(par->GetDist()); -} - -void MHHillas::Draw(Option_t *) -{ - - // - // Fixme! Check for an existing canvas. - // And create one if no canvas exists only! - // - TCanvas *c = new TCanvas("Hillas", "Histograms of Hillas Parameters"); - c->Divide(2,2); - - c->cd(1); - fAlpha->Draw(); - c->cd(2); - fLength->Draw(); - c->cd(3); - fDist->Draw(); - c->cd(4); - fWidth->Draw(); - - c->Modified(); - c->Update(); -} Index: trunk/MagicSoft/Mars/mdatacheck/MHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHHillas.h (revision 706) +++ (revision ) @@ -1,40 +1,0 @@ -#ifndef MHHILLAS_H -#define MHHILLAS_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MPARCONTAINER_H -#include "MParContainer.h" -#endif - -class TH1F; -class MHillas; - -class MHHillas : public MParContainer -{ -private: - TH1F *fAlpha; - TH1F *fWidth; - TH1F *fLength; - TH1F *fDist; - -public: - MHHillas(const char *name=NULL, const char *title=NULL); - ~MHHillas(); - - void Fill(MHillas *par); - - TH1F *GetHistAlpha() { return fAlpha; } - TH1F *GetHistWidth() { return fWidth; } - TH1F *GetHistLength() { return fLength; } - TH1F *GetHistDist() { return fDist; } - - void Draw(Option_t *opt=NULL); - - ClassDef(MHHillas, 1) // list of Histograms with ADC spectra -}; - -#endif - Index: trunk/MagicSoft/Mars/mdatacheck/Makefile =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/Makefile (revision 706) +++ trunk/MagicSoft/Mars/mdatacheck/Makefile (revision 710) @@ -22,5 +22,5 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../mbase -I../mraw -I../manalysis +INCLUDES = -I. -I../mbase -I../mraw -I../mhist #------------------------------------------------------------------------------ @@ -29,10 +29,5 @@ SRCFILES = MDumpEvtHeader.cc \ - MFillHFadc.cc \ - MFillHHillas.cc \ MGDisplayAdc.cc \ - MHFadcPix.cc \ - MHFadcCam.cc \ - MHHillas.cc \ MShowSpect.cc \ MViewAdcSpectra.cc