X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEmcRecPoint.h;h=58fb9e0ae78e17af662ea4224e27645bdda37f59;hb=2773b0133102315a52b5f788a9fd70d27e34eb52;hp=de2466be50903f19b88c1c8d7c1cbbf4ae374a82;hpb=ce2a9a95b90844d63175a5b5d8b7aa5323380709;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h index de2466be509..58fb9e0ae78 100644 --- a/PHOS/AliPHOSEmcRecPoint.h +++ b/PHOS/AliPHOSEmcRecPoint.h @@ -5,22 +5,33 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + * Revision 1.36 2007/04/05 10:18:58 policheh + * Introduced distance to nearest bad crystal. + * + * Revision 1.35 2007/03/06 06:47:28 kharlov + * DP:Possibility to use actual vertex position added + * + * Revision 1.34 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * + */ + //_________________________________________________________________________ // RecPoint implementation for PHOS-EMC // An EmcRecPoint is a cluster of digits // -//*-- Author: Dmitri Peressounko (RRC KI & SUBATECH) +//-- Author: Dmitri Peressounko (RRC KI & SUBATECH) // --- ROOT system --- -//#include "TObject.h" -#include "TArrayI.h" - // --- Standard library --- // --- AliRoot header files --- -#include "AliPHOSDigit.h" +//#include "AliPHOSDigit.h" #include "AliPHOSRecPoint.h" class AliPHOSEmcRecPoint : public AliPHOSRecPoint { @@ -33,12 +44,19 @@ public: virtual ~AliPHOSEmcRecPoint() ; + //This virtual function has signature different from AliPHOSRecPoint::AddDigit + //it hides, not overrides. using - declaration should fix the problem, at least for + //g++ + using AliPHOSRecPoint::AddDigit; virtual void AddDigit(AliPHOSDigit & digit, Float_t Energy) ; // add a digit to the digits list Int_t Compare(const TObject * obj) const; // method for sorting - virtual void EvalAll(Float_t logWeight,TClonesArray * digits) ; + virtual void EvalAll(TClonesArray * digits) ; //Those tasks which can be done without vertex + virtual void EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ; + void EvalCoreEnergy(Float_t logWeight, Float_t coreRadius, TClonesArray * digits) ; - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const; + //in base class this functions is non-const + virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/; Float_t GetCoreEnergy()const {return fCoreEnergy ;} virtual Float_t GetDispersion()const {return fDispersion ;} @@ -48,7 +66,7 @@ public: Float_t GetMaximalEnergy(void) const ; // get the highest energy in the cluster Int_t GetMaximumMultiplicity() const {return fMaxDigit ;} // gets the maximum number of digits allowed Int_t GetMultiplicity(void) const { return fMulDigit ; } // gets the number of digits making this recpoint - Int_t GetMultiplicityAtLevel(const Float_t level) const ; // computes multiplicity of digits with + Int_t GetMultiplicityAtLevel(Float_t level) const ; // computes multiplicity of digits with // energy above relative level Short_t GetNExMax(void) const {return fNExMax ;} // Number of maxima found in cluster in unfolding: // 0: was no unfolging @@ -61,7 +79,7 @@ public: Float_t GetTime(void) const{return fTime ; } Bool_t IsEmc(void) const { return kTRUE ; } // true if the recpoint is in EMC Bool_t IsSortable() const {return kTRUE ; } // says that emcrecpoints are sortable objects - void Print(Option_t * opt = "void")const ; + void Print(Option_t *)const ; void Purify(Float_t threshold) ; //Removes digits below threshold Float_t GetM2x() const {return fM2x; } // Get second X-moment @@ -70,14 +88,17 @@ public: Float_t GetM4z() const {return fM4z; } // Get forth Z-moment Float_t GetPhixe() const {return fPhixe;} // Get angle between center gravity and eigen vector - AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & rvalue) { return *this ; } + Float_t GetDistanceToBadCrystal() const {return fDistToBadCrystal;} + void SetDistanceToBadCrystal(Float_t dist) {fDistToBadCrystal=dist;} + + AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/) { return *this ; } protected: - void EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ; - virtual void EvalLocalPosition(Float_t logWeight,TClonesArray * digits) ;// computes the position in the PHOS module - virtual void EvalDispersion(Float_t logWeight,TClonesArray * digits) ; // computes the dispersion of the shower - virtual void EvalElipsAxis(Float_t logWeight, TClonesArray * digits ); // computes the axis of shower ellipsoide - void EvalMoments(Float_t logWeight, TClonesArray * digits ); // computes shower moments + virtual void EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TClonesArray * digits, TVector3 &vInc) ;// computes the position in the PHOS module + virtual void EvalDispersion(Float_t logWeight, TClonesArray * digits, TVector3 &vInc) ; // computes the dispersion of the shower + virtual void EvalElipsAxis(Float_t logWeight, TClonesArray * digits, TVector3 &vInc ); // computes the axis of shower ellipsoide + void EvalMoments(Float_t logWeight, TClonesArray * digits, TVector3 &vInc ); // computes shower moments + virtual void EvalPrimaries(TClonesArray * digits) ; void EvalTime( TClonesArray * digits ); virtual Bool_t AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * digit2 ) const ; @@ -93,10 +114,11 @@ public: Float_t fM3x; // Third moment along X axis Float_t fM4z; // Forth moment along Z axis Float_t fPhixe; // Angle between center-gravity vector and eigen vector + Float_t fDistToBadCrystal; // Distance to nearest bad crystal Int_t fDebug; //! debug level (0 - no output) - ClassDef(AliPHOSEmcRecPoint,2) // EMC RecPoint (cluster) + ClassDef(AliPHOSEmcRecPoint,3) // EMC RecPoint (cluster) };