Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 600) +++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 601) @@ -5,6 +5,6 @@ #pragma link off all functions; -#pragma link C++ class MNphotPix; -#pragma link C++ class MNphotEvent; +#pragma link C++ class MCerPhotPix; +#pragma link C++ class MCerPhotEvt; #pragma link C++ class MReadCT1Ascii; Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 601) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 601) @@ -0,0 +1,260 @@ +#include "MCerPhotEvt.h" + +#include +#include +#include + +#include "MCamGeom.h" +#include "MCamNeighbor.h" +#include "MCamDisplay.h" +#include "MHexagon.h" + +ClassImp(MCerPhotPix) +ClassImp(MCerPhotEvt) + +MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot , Float_t errphot ) +{ + // default constructor + fPixId = pix ; + fIsUsed = kTRUE ; + fPhot = phot ; + fErrPhot = errphot ; +} + +void MCerPhotPix::SetPixelContent(Int_t pix, Float_t phot , Float_t errphot) +{ + fPixId = pix ; + fIsUsed = kTRUE ; + fPhot = phot ; + fErrPhot = errphot ; +} + +void MCerPhotPix::Print() +{ + // information about a pixel + cout << "MCerPhotPix: Pixel: "<< fPixId ; + + if ( fIsUsed == kTRUE ) + cout << " Used " ; + else + if ( fIsUsed == kFALSE ) + cout << " UnUsed " ; + + cout << " Nphot= " << fPhot + << " Error(Nphot) = " << fErrPhot + << endl ; +} + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +MCerPhotEvt::MCerPhotEvt(const char *name, const char *title ) +{ + // the default constructor + + + *fName = name ? name : "MCerPhotEvt"; + *fTitle = name ? name : "(Number of Photon)-Event Information"; + + fType = 0 ; + fNbPixels = 0 ; + + fPixels = new TClonesArray ("MCerPhotPix", 577) ; + + fNN = new MCamNeighbor() ; + + fPixels->Clear() ; +} + +void MCerPhotEvt::Draw(Option_t* option) +{ + // FIXME!!! + // + + MCamDisplay *disp = new MCamDisplay(fType) ; + + disp->Draw( this ) ; + + // disp->Draw() ; + +} + + + + +Int_t MCerPhotEvt::GetNbPixels() +{ + return fNbPixels ; +} + +void MCerPhotEvt::AddPixel(Int_t id, Float_t nph, Float_t err) +{ + TClonesArray &caP = *fPixels ; + new ( caP[fNbPixels++] ) MCerPhotPix( id, nph, err ) ; +} + +void MCerPhotEvt::Clear() +{ + fNbPixels = 0 ; + fPixels->Clear() ; +} + +void MCerPhotEvt::Print() +{ + cout << "MCerPhotEvt::Print()" + << "Number of Pixels: " << fNbPixels + << "(" << fPixels->GetEntries() << ")" + << endl ; + + for (Int_t il=0; ilGetEntries(); il++ ) + { + ((MCerPhotPix *) fPixels->At(il))->Print() ; + } +} + +void MCerPhotEvt::CleanLevel1() +{ + // This method looks for all pixels with an entry (photons) + // that is three times bigger than the noise of the pixel + + Float_t entry, noise ; + + // first look for pixels above some noise level + + for (Int_t il=0; ilGetEntries(); il++ ) + { + entry = ((MCerPhotPix *) fPixels->At(il))->GetPhotons() ; + noise = 3 * ((MCerPhotPix *) fPixels->At(il))->GetErrorPhot() ; + + if (entry < 3 * noise ) + ((MCerPhotPix *) fPixels->At(il))->SetPixelUnused() ; + + } +} + +void MCerPhotEvt::CleanLevel2() +{ + // check if the survived pixel have a neighbor, that also + // survived + + Int_t id, id2 ; + Int_t itest ; + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( ((MCerPhotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) + { + id = ((MCerPhotPix *) fPixels->At(il))->GetPixId() ; + + itest = 0 ; + for (Int_t in=0 ; in < 6 ; in++ ) { + + id2 = fNN->GetNN(id, in ) ; + + if ( PixelIsUsed(id2) == kTRUE ) + cout << " hulibu " << id << "/" << id2 << endl ; + + + } + } + } +} + +Bool_t MCerPhotEvt::PixelExist(Int_t id ) +{ + // Checks if in the pixel list is an entry with pixel id + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( id == ((MCerPhotPix *) fPixels->At(il))->GetPixId() ) { + + cout << " PixelExist " << il ; + return kTRUE ; + } + } + + return kFALSE ; + +} + +Bool_t MCerPhotEvt::PixelIsUsed(Int_t id ) +{ + // Checks if in the pixel list is an entry with pixel id + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( id == ((MCerPhotPix *) fPixels->At(il))->GetPixId() && + ((MCerPhotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) { + + cout << " PixelIsUsed " << il ; + return kTRUE ; + } + } + + return kFALSE ; + +} + +Int_t MCerPhotEvt::GetPixelId(Int_t i ) +{ + return ( ( (MCerPhotPix *) fPixels->At(i))->GetPixId() ) ; +} + +Bool_t MCerPhotEvt::IsPixelUsed(Int_t i ) +{ + return ( ( (MCerPhotPix *) fPixels->At(i))->IsPixelUsed() ) ; +} + +Float_t MCerPhotEvt::GetPhotons(Int_t i ) +{ + return ( ( (MCerPhotPix *) fPixels->At(i))->GetPhotons() ) ; +} + +Float_t MCerPhotEvt::GetErrorPhot(Int_t i ) +{ + return ( ( (MCerPhotPix *) fPixels->At(i))->GetErrorPhot() ) ; +} + + +Float_t MCerPhotEvt::GetMinimumPhoton() +{ + if ( fNbPixels <= 0 ) + return -5. ; + + Float_t minWert ; + minWert = ((MCerPhotPix *) fPixels->At(0))->GetPhotons() ; + + Float_t testWert ; + + for ( Int_t i =0 ; iAt(i))->GetPhotons() ; + + if ( minWert >= testWert ) + minWert = testWert ; + } + + return minWert ; +} + +Float_t MCerPhotEvt::GetMaximumPhoton() +{ + if ( fNbPixels <= 0 ) + return 50. ; + + Float_t maxWert ; + maxWert = ((MCerPhotPix *) fPixels->At(0))->GetPhotons() ; + + Float_t testWert ; + + for ( Int_t i =0 ; iAt(i))->GetPhotons() ; + + if ( maxWert <= testWert ) + maxWert = testWert ; + } + + return maxWert ; +} + Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h (revision 601) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h (revision 601) @@ -0,0 +1,115 @@ +#ifndef MNPHOTEVENT_H +#define MNPHOTEVENT_H + +#ifndef MPARCONTAINER_H +#include "MParContainer.h" +#endif + +#include +#include +class TClonesArray ; +class TObjArray ; +class MCamNeighbor ; + +class MCerPhotPix : public TObject +{ + private: + + Int_t fPixId ; // the pixel Id + Bool_t fIsUsed ; // the pixel is used for calculations --> kTRUE + Float_t fPhot ; // The number of Cerenkov photons + Float_t fErrPhot ; // the error of fPhot + + public: + + MCerPhotPix(Int_t pix = -9999, Float_t phot=0. , Float_t errphot=0.) ; + + void Print() ; + + Int_t GetPixId() + { + return fPixId ; + } + + Float_t GetPhotons() + { + return fPhot ; + } + + Float_t GetErrorPhot() + { + return fErrPhot ; + } + + void SetPixelContent(Int_t pix , Float_t phot , Float_t errphot ) ; + + Bool_t IsPixelUsed() + { + return fIsUsed ; + } + + void SetPixelUnused() + { + fIsUsed = kFALSE ; + } + + void SetPixelUsed() + { + fIsUsed = kTRUE ; + } + + + + ClassDef(MCerPhotPix, 1) // Cerenkov Photons class for the pixel +} ; + + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +class MCerPhotEvt : public MParContainer +{ + private: + + Int_t fType ; // + Int_t fNbPixels ; // + TClonesArray *fPixels ; // + + + MCamNeighbor *fNN ; //! the class with the information about neighbors + + public: + + MCerPhotEvt(const char *name=NULL, const char *title=NULL) ; + + void Draw(Option_t* option = "" ) ; + + Int_t GetNbPixels() ; + + void AddPixel(Int_t id, Float_t nph, Float_t err ); + + void Clear() ; + + void Print() ; + + void CleanLevel1() ; + void CleanLevel2() ; + + Bool_t PixelExist( Int_t id ) ; + Bool_t PixelIsUsed( Int_t id ) ; + + Int_t GetPixelId(Int_t i ) ; + Bool_t IsPixelUsed(Int_t i ) ; + Float_t GetPhotons(Int_t i ) ; + Float_t GetErrorPhot(Int_t i ) ; + + Float_t GetMinimumPhoton() ; + Float_t GetMaximumPhoton() ; + + ClassDef(MCerPhotEvt, 1) // class for Nphotons Events +}; + +#endif + + Index: trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc (revision 600) +++ (revision ) @@ -1,260 +1,0 @@ -#include "MNphotEvent.h" - -#include -#include -#include - -#include "MCamGeom.h" -#include "MCamNeighbor.h" -#include "MCamDisplay.h" -#include "MHexagon.h" - -ClassImp(MNphotPix) -ClassImp(MNphotEvent) - -MNphotPix::MNphotPix(Int_t pix, Float_t phot , Float_t errphot ) -{ - // default constructor - fPixId = pix ; - fIsUsed = kTRUE ; - fPhot = phot ; - fErrPhot = errphot ; -} - -void MNphotPix::SetPixelContent(Int_t pix, Float_t phot , Float_t errphot) -{ - fPixId = pix ; - fIsUsed = kTRUE ; - fPhot = phot ; - fErrPhot = errphot ; -} - -void MNphotPix::Print() -{ - // information about a pixel - cout << "MNphotPix: Pixel: "<< fPixId ; - - if ( fIsUsed == kTRUE ) - cout << " Used " ; - else - if ( fIsUsed == kFALSE ) - cout << " UnUsed " ; - - cout << " Nphot= " << fPhot - << " Error(Nphot) = " << fErrPhot - << endl ; -} - -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - -MNphotEvent::MNphotEvent(const char *name, const char *title ) -{ - // the default constructor - - - *fName = name ? name : "MNphotEvent"; - *fTitle = name ? name : "(Number of Photon)-Event Information"; - - fType = 0 ; - fNbPixels = 0 ; - - fPixels = new TClonesArray ("MNphotPix", 577) ; - - fNN = new MCamNeighbor() ; - - fPixels->Clear() ; -} - -void MNphotEvent::Draw(Option_t* option) -{ - // FIXME!!! - // - - MCamDisplay *disp = new MCamDisplay(fType) ; - - disp->Draw( this ) ; - - // disp->Draw() ; - -} - - - - -Int_t MNphotEvent::GetNbPixels() -{ - return fNbPixels ; -} - -void MNphotEvent::AddPixel(Int_t id, Float_t nph, Float_t err) -{ - TClonesArray &caP = *fPixels ; - new ( caP[fNbPixels++] ) MNphotPix( id, nph, err ) ; -} - -void MNphotEvent::Clear() -{ - fNbPixels = 0 ; - fPixels->Clear() ; -} - -void MNphotEvent::Print() -{ - cout << "MNphotEvent::Print()" - << "Number of Pixels: " << fNbPixels - << "(" << fPixels->GetEntries() << ")" - << endl ; - - for (Int_t il=0; ilGetEntries(); il++ ) - { - ((MNphotPix *) fPixels->At(il))->Print() ; - } -} - -void MNphotEvent::CleanLevel1() -{ - // This method looks for all pixels with an entry (photons) - // that is three times bigger than the noise of the pixel - - Float_t entry, noise ; - - // first look for pixels above some noise level - - for (Int_t il=0; ilGetEntries(); il++ ) - { - entry = ((MNphotPix *) fPixels->At(il))->GetPhotons() ; - noise = 3 * ((MNphotPix *) fPixels->At(il))->GetErrorPhot() ; - - if (entry < 3 * noise ) - ((MNphotPix *) fPixels->At(il))->SetPixelUnused() ; - - } -} - -void MNphotEvent::CleanLevel2() -{ - // check if the survived pixel have a neighbor, that also - // survived - - Int_t id, id2 ; - Int_t itest ; - - for (Int_t il=0; ilGetEntries(); il++ ) - { - if ( ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) - { - id = ((MNphotPix *) fPixels->At(il))->GetPixId() ; - - itest = 0 ; - for (Int_t in=0 ; in < 6 ; in++ ) { - - id2 = fNN->GetNN(id, in ) ; - - if ( PixelIsUsed(id2) == kTRUE ) - cout << " hulibu " << id << "/" << id2 << endl ; - - - } - } - } -} - -Bool_t MNphotEvent::PixelExist(Int_t id ) -{ - // Checks if in the pixel list is an entry with pixel id - - for (Int_t il=0; ilGetEntries(); il++ ) - { - if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() ) { - - cout << " PixelExist " << il ; - return kTRUE ; - } - } - - return kFALSE ; - -} - -Bool_t MNphotEvent::PixelIsUsed(Int_t id ) -{ - // Checks if in the pixel list is an entry with pixel id - - for (Int_t il=0; ilGetEntries(); il++ ) - { - if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() && - ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) { - - cout << " PixelIsUsed " << il ; - return kTRUE ; - } - } - - return kFALSE ; - -} - -Int_t MNphotEvent::GetPixelId(Int_t i ) -{ - return ( ( (MNphotPix *) fPixels->At(i))->GetPixId() ) ; -} - -Bool_t MNphotEvent::IsPixelUsed(Int_t i ) -{ - return ( ( (MNphotPix *) fPixels->At(i))->IsPixelUsed() ) ; -} - -Float_t MNphotEvent::GetPhotons(Int_t i ) -{ - return ( ( (MNphotPix *) fPixels->At(i))->GetPhotons() ) ; -} - -Float_t MNphotEvent::GetErrorPhot(Int_t i ) -{ - return ( ( (MNphotPix *) fPixels->At(i))->GetErrorPhot() ) ; -} - - -Float_t MNphotEvent::GetMinimumPhoton() -{ - if ( fNbPixels <= 0 ) - return -5. ; - - Float_t minWert ; - minWert = ((MNphotPix *) fPixels->At(0))->GetPhotons() ; - - Float_t testWert ; - - for ( Int_t i =0 ; iAt(i))->GetPhotons() ; - - if ( minWert >= testWert ) - minWert = testWert ; - } - - return minWert ; -} - -Float_t MNphotEvent::GetMaximumPhoton() -{ - if ( fNbPixels <= 0 ) - return 50. ; - - Float_t maxWert ; - maxWert = ((MNphotPix *) fPixels->At(0))->GetPhotons() ; - - Float_t testWert ; - - for ( Int_t i =0 ; iAt(i))->GetPhotons() ; - - if ( maxWert <= testWert ) - maxWert = testWert ; - } - - return maxWert ; -} - Index: trunk/MagicSoft/Mars/manalysis/MNphotEvent.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MNphotEvent.h (revision 600) +++ (revision ) @@ -1,115 +1,0 @@ -#ifndef MNPHOTEVENT_H -#define MNPHOTEVENT_H - -#ifndef MPARCONTAINER_H -#include "MParContainer.h" -#endif - -#include -#include -class TClonesArray ; -class TObjArray ; -class MCamNeighbor ; - -class MNphotPix : public TObject -{ - private: - - Int_t fPixId ; // the pixel Id - Bool_t fIsUsed ; // the pixel is used for calculations --> kTRUE - Float_t fPhot ; // The number of Cerenkov photons - Float_t fErrPhot ; // the error of fPhot - - public: - - MNphotPix(Int_t pix = -9999, Float_t phot=0. , Float_t errphot=0.) ; - - void Print() ; - - Int_t GetPixId() - { - return fPixId ; - } - - Float_t GetPhotons() - { - return fPhot ; - } - - Float_t GetErrorPhot() - { - return fErrPhot ; - } - - void SetPixelContent(Int_t pix , Float_t phot , Float_t errphot ) ; - - Bool_t IsPixelUsed() - { - return fIsUsed ; - } - - void SetPixelUnused() - { - fIsUsed = kFALSE ; - } - - void SetPixelUsed() - { - fIsUsed = kTRUE ; - } - - - - ClassDef(MNphotPix, 1) // Cerenkov Photons class for the pixel -} ; - - -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -class MNphotEvent : public MParContainer -{ - private: - - Int_t fType ; // - Int_t fNbPixels ; // - TClonesArray *fPixels ; // - - - MCamNeighbor *fNN ; //! the class with the information about neighbors - - public: - - MNphotEvent(const char *name=NULL, const char *title=NULL) ; - - void Draw(Option_t* option = "" ) ; - - Int_t GetNbPixels() ; - - void AddPixel(Int_t id, Float_t nph, Float_t err ); - - void Clear() ; - - void Print() ; - - void CleanLevel1() ; - void CleanLevel2() ; - - Bool_t PixelExist( Int_t id ) ; - Bool_t PixelIsUsed( Int_t id ) ; - - Int_t GetPixelId(Int_t i ) ; - Bool_t IsPixelUsed(Int_t i ) ; - Float_t GetPhotons(Int_t i ) ; - Float_t GetErrorPhot(Int_t i ) ; - - Float_t GetMinimumPhoton() ; - Float_t GetMaximumPhoton() ; - - ClassDef(MNphotEvent, 1) // class for Nphotons Events -}; - -#endif - - Index: trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc (revision 600) +++ trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc (revision 601) @@ -13,5 +13,5 @@ #include "MParList.h" -#include "MNphotEvent.h" +#include "MCerPhotEvt.h" ClassImp(MReadCT1Ascii) @@ -49,12 +49,12 @@ return kFALSE ; - // look for the MNphotEvent class in the plist + // look for the MCerPhotEvt class in the plist - fNphot = (MNphotEvent*)pList->FindObject("MNphotEvent"); + fNphot = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); if (!fNphot ) { - cout << "MRawCT1Ascii::PreProcess - WARNING: MNphotEvent not found... exit" << endl; + cout << "MRawCT1Ascii::PreProcess - WARNING: MCerPhotEvt not found... exit" << endl; return kFALSE ; } Index: trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h (revision 600) +++ trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h (revision 601) @@ -6,5 +6,5 @@ #endif -class MNphotEvent ; +class MCerPhotEvt ; class MReadCT1Ascii : public MTask @@ -15,5 +15,5 @@ FILE* fInputfile ; //! the inputfile - MNphotEvent *fNphot ; //! the data container for all data. + MCerPhotEvt *fNphot ; //! the data container for all data. Float_t fPedest[127] ; //! Index: trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- trunk/MagicSoft/Mars/manalysis/Makefile (revision 600) +++ trunk/MagicSoft/Mars/manalysis/Makefile (revision 601) @@ -31,5 +31,5 @@ .SUFFIXES: .c .cc .cxx .h .hxx .o -SRCFILES = MNphotEvent.cc \ +SRCFILES = MCerPhotEvt.cc \ MReadCT1Ascii.cc