/* History of cvs commits:
*
* $Log$
- * Revision 1.55 2007/01/19 20:31:19 kharlov
- * Improved formatting for Print()
+ * Revision 1.59 2007/10/18 15:12:22 kharlov
+ * Moved MakePrimary to EMCRecPoint to rpduce correct order of primaries
*
- * Revision 1.54 2006/08/28 10:01:56 kharlov
- * Effective C++ warnings fixed (Timur Pocheptsov)
+ * Revision 1.58 2007/04/16 09:03:37 kharlov
+ * Incedent angle correction fixed
*
- * Revision 1.53 2005/12/20 14:28:47 hristov
- * Additional protection
+ * Revision 1.57 2007/04/05 10:18:58 policheh
+ * Introduced distance to nearest bad crystal.
*
- * Revision 1.52 2005/05/28 14:19:04 schutz
- * Compilation warnings fixed by T.P.
+ * Revision 1.56 2007/03/06 06:47:28 kharlov
+ * DP:Possibility to use actual vertex position added
*
+ * Revision 1.55 2007/01/19 20:31:19 kharlov
+ * Improved formatting for Print()
*/
//_________________________________________________________________________
// 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 "AliPHOSGeometry.h"
#include "AliPHOSDigit.h"
#include "AliPHOSEmcRecPoint.h"
+#include "AliPHOSReconstructor.h"
ClassImp(AliPHOSEmcRecPoint)
+Long64_t AliPHOSEmcRecPoint::fgInstCount=0;
+
+
//____________________________________________________________________________
AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() :
AliPHOSRecPoint(),
fCoreEnergy(0.), fDispersion(0.),
fEnergyList(0), fTime(-1.), fNExMax(0),
fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
- fPhixe(0.), fDebug(0)
+ fPhixe(0.), fDistToBadCrystal(-1),fDebug(0)
+ ,fInstCount(0)
{
// ctor
fMulDigit = 0 ;
fAmp = 0. ;
fLocPos.SetX(1000000.) ; //Local position should be evaluated
+
+ fLambda[0] = 0.;
+ fLambda[1] = 0.;
+ fInstCount=fgInstCount++;
+ if (gDebug==-10) AliInfo(Form("0Create instance %lld",fInstCount));
}
//____________________________________________________________________________
fCoreEnergy(0.), fDispersion(0.),
fEnergyList(0), fTime(-1.), fNExMax(0),
fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.),
- fPhixe(0.), fDebug(0)
+ fPhixe(0.), fDistToBadCrystal(-1), fDebug(0)
+ ,fInstCount(0)
{
// ctor
fMulDigit = 0 ;
fAmp = 0. ;
fLocPos.SetX(1000000.) ; //Local position should be evaluated
+
+ fLambda[0] = 0.;
+ fLambda[1] = 0.;
+ fInstCount=fgInstCount++;
+ if (gDebug==-10) AliInfo(Form("1Create instance %lld",fInstCount));
}
//____________________________________________________________________________
fCoreEnergy(rp.fCoreEnergy), fDispersion(rp.fDispersion),
fEnergyList(0), fTime(rp.fTime), fNExMax(rp.fNExMax),
fM2x(rp.fM2x), fM2z(rp.fM2z), fM3x(rp.fM3x), fM4z(rp.fM4z),
- fPhixe(rp.fPhixe), fDebug(rp.fDebug)
+ fPhixe(rp.fPhixe), fDistToBadCrystal(rp.fDistToBadCrystal), fDebug(rp.fDebug)
+ ,fInstCount(0)
{
// cpy ctor
fMulDigit = rp.fMulDigit ;
fAmp = rp.fAmp ;
- fEnergyList = new Float_t[rp.fMulDigit] ;
- Int_t index ;
- for(index = 0 ; index < fMulDigit ; index++)
- fEnergyList[index] = rp.fEnergyList[index] ;
+ if (rp.fMulDigit>0) fEnergyList = new Float_t[rp.fMulDigit] ;
+ for(Int_t index = 0 ; index < fMulDigit ; index++)
+ fEnergyList[index] = rp.fEnergyList[index] ;
+
+ for(Int_t i=0; i<2; i++) {
+ fLambda[i] = rp.fLambda[i];
+ }
+ fInstCount=fgInstCount++;
+ if (gDebug==-10) AliInfo(Form("2Create instance %lld",fInstCount));
}
//____________________________________________________________________________
// dtor
if ( fEnergyList )
delete[] fEnergyList ;
+ if (gDebug==-10) AliInfo(Form("Delete instance %lld (%lld)",fInstCount, fgInstCount));
+ if (fInstCount>=fgInstCount-1) fgInstCount--;
+
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::AddDigit(AliPHOSDigit & digit, Float_t Energy)
+void AliPHOSEmcRecPoint::AddDigit(AliPHOSDigit & digit, Float_t Energy, Float_t time)
{
// Adds a digit to the RecPoint
// and accumulates the total amplitude and the multiplicity
delete [] tempoE ;
} // if
+ //time
+ Bool_t isMax=kTRUE ;
+ for(Int_t index = 0 ; index < fMulDigit ; index++ ){
+ if(fEnergyList[index]>Energy){
+ isMax=kFALSE ;
+ break ;
+ }
+ }
+ if(isMax){
+ fTime=time ;
+ }
+ //Alternative time calculation - still to be validated
+ // fTime = (fTime*fAmp + time*Energy)/(fAmp+Energy) ;
+
fDigitsList[fMulDigit] = digit.GetIndexInList() ;
fEnergyList[fMulDigit] = Energy ;
fMulDigit++ ;
fAmp += Energy ;
-
EvalPHOSMod(&digit) ;
}
AliError(Form("Cannot find Run Loader in Default Event Folder"));
return;
}
- AliPHOSLoader*
gime = dynamic_cast<AliPHOSLoader*>(rn->GetLoader("PHOSLoader"));
- if (gime == 0x0)
+ AliPHOSLoader*
phosLoader = dynamic_cast<AliPHOSLoader*>(rn->GetLoader("PHOSLoader"));
+ if (phosLoader == 0x0)
{
AliError(Form("Cannot find PHOS Loader from Run Loader"));
return;
}
- const TClonesArray * digits = gime->Digits() ;
+ const TClonesArray * digits = phosLoader->Digits() ;
switch (event) {
// 2. gets the histogram title
Text_t title[100] ;
- sprintf(title,"Energy=%1.2f GeV ; Digits ; %d ", GetEnergy(), GetDigitsMultiplicity()) ;
+ snprintf(title,100,"Energy=%1.2f GeV ; Digits ; %d ", GetEnergy(), GetDigitsMultiplicity()) ;
if (!histo) {
delete histo ;
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits, TVector3 &vInc)
+void AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */)
{
// Calculates the dispersion of the shower at the origine of the RecPoint
//DP: should we correct dispersion for non-perpendicular hit????????
}
//______________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits)
+void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, Float_t coreRadius, TClonesArray * digits)
{
// This function calculates energy in the core,
// i.e. within a radius rad = 3cm around the center. Beyond this radius
// should be less than 2%
//DP: non-perpendicular incidence??????????????
- Float_t coreRadius = 3 ;
-
Float_t x = 0 ;
Float_t z = 0 ;
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, TVector3 &vInc)
+void AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */)
{
// Calculates the axis of the shower ellipsoid
// //Apply correction due to non-perpendicular incidence
// Double_t CosX ;
// Double_t CosZ ;
-// AliPHOSGetter * gime = AliPHOSGetter::Instance() ;
-// AliPHOSGeometry * phosgeom = (AliPHOSGeometry*)gime->PHOSGeometry();
+// AliPHOSGeometry * phosgeom = AliPHOSGeometry::GetInstance() ;
// Double_t DistanceToIP= (Double_t ) phosgeom->GetIPtoCrystalSurface() ;
// CosX = DistanceToIP/TMath::Sqrt(DistanceToIP*DistanceToIP+x*x) ;
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits, TVector3 &vInc)
+void AliPHOSEmcRecPoint::EvalMoments(Float_t logWeight,TClonesArray * digits, TVector3 & /* vInc */)
{
// Calculate the shower moments in the eigen reference system
// M2x, M2z, M3x, M4z
fPhixe = phi;
}
+//______________________________________________________________________________
+void AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
+{
+ // Constructs the list of primary particles (tracks) which have contributed to this RecPoint
+
+ AliPHOSDigit * digit ;
+ Int_t * tempo = new Int_t[fMaxTrack] ;
+
+ //First find digit with maximal energy deposition and copy its primaries
+ Float_t emax=0.;
+ Int_t imaxDigit=0;
+ for(Int_t id=0; id<GetDigitsMultiplicity(); id++){
+ if(emax<fEnergyList[id]){
+ imaxDigit=id ;
+ emax=fEnergyList[id];
+ }
+ }
+ digit = static_cast<AliPHOSDigit *>(digits->At( fDigitsList[imaxDigit] )) ;
+ Int_t nprimaries = digit->GetNprimary() ;
+ if ( nprimaries > fMaxTrack ) {
+ fMulTrack = - 1 ;
+ Error("EvalPrimaries", "GetNprimaries ERROR > increase fMaxTrack" ) ;
+ nprimaries = fMaxTrack; //skip the rest
+ }
+ for(fMulTrack=0; fMulTrack<nprimaries ; fMulTrack++){
+ tempo[fMulTrack] = digit->GetPrimary(fMulTrack+1) ;
+ }
+
+ //Now add other digits contributions
+ for (Int_t index = 0 ; index < GetDigitsMultiplicity() ; index++ ) { // all digits
+ if(index==imaxDigit) //already in
+ continue ;
+ digit = static_cast<AliPHOSDigit *>(digits->At( fDigitsList[index] )) ;
+ nprimaries = digit->GetNprimary() ;
+ for(Int_t ipr=0; ipr<nprimaries; ipr++){
+ Int_t iprimary = digit->GetPrimary(ipr+1) ;
+ Bool_t notIn=1 ;
+ for(Int_t kndex = 0 ; (kndex < fMulTrack)&& notIn ; kndex++ ) { //check if not already stored
+ if(iprimary == tempo[kndex]){
+ notIn = kFALSE ;
+ }
+ }
+ if(notIn){
+ if(fMulTrack<fMaxTrack){
+ tempo[fMulTrack]=iprimary ;
+ fMulTrack++ ;
+ }
+ else{
+ Error("EvalPrimaries", "GetNprimaries ERROR > increase fMaxTrack!!!" ) ;
+ break ;
+ }
+ }
+ }
+ } // all digits
+ if(fMulTrack > 0){
+ if(fTracksList)delete [] fTracksList;
+ fTracksList = new Int_t[fMulTrack] ;
+ }
+ for(Int_t index = 0; index < fMulTrack; index++){
+ fTracksList[index] = tempo[index] ;
+ }
+
+ delete [] tempo ;
+
+}
+
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
+void AliPHOSEmcRecPoint::EvalAll(TClonesArray * digits )
{
- EvalCoreEnergy(logWeight, digits);
+// EvalCoreEnergy(logWeight, digits);
EvalTime(digits) ;
+ EvalPrimaries(digits) ;
AliPHOSRecPoint::EvalAll(digits) ;
}
//____________________________________________________________________________
Float_t depthx = 0.;
Float_t depthz = 0.;
if (fAmp>0&&vInc.Y()!=0.) {
- depthx = ( para * TMath::Log(fAmp) + parb ) * vInc.X()/vInc.Y() ;
- depthz = ( para * TMath::Log(fAmp) + parb ) * vInc.Z()/vInc.Y() ;
+ depthx = ( para * TMath::Log(fAmp) + parb ) * vInc.X()/TMath::Abs(vInc.Y()) ;
+ depthz = ( para * TMath::Log(fAmp) + parb ) * vInc.Z()/TMath::Abs(vInc.Y()) ;
}
else
AliError(Form("Wrong amplitude %f\n", fAmp));
fLocPos.SetY(0.) ;
fLocPos.SetZ(z - depthz) ;
- fLocPosM = 0 ;
}
//____________________________________________________________________________
return iDigitN ;
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalTime(TClonesArray * digits)
+void AliPHOSEmcRecPoint::EvalTime(TClonesArray * /*digits*/)
{
// Define a rec.point time as a time in the cell with the maximum energy
+ //Time already evaluated during AddDigit()
+/*
Float_t maxE = 0;
Int_t maxAt = 0;
for(Int_t idig=0; idig < fMulDigit; idig++){
}
}
fTime = ((AliPHOSDigit*) digits->At(fDigitsList[maxAt]))->GetTime() ;
-
+*/
}
//____________________________________________________________________________
-void AliPHOSEmcRecPoint::Purify(Float_t threshold){
+void AliPHOSEmcRecPoint::Purify(Float_t threshold, const TClonesArray * digits){
//Removes digits below threshold
- Int_t * tempo = new Int_t[fMaxDigit];
- Float_t * tempoE = new Float_t[fMaxDigit];
+ Int_t tempo[fMaxDigit];
+ Float_t tempoE[fMaxDigit];
Int_t mult = 0 ;
for(Int_t iDigit=0;iDigit< fMulDigit ;iDigit++){
mult++ ;
}
}
-
- fMulDigit = mult ;
+
+ if(mult==0){ //too soft cluster
+ fMulDigit =0 ;
+ fAmp = 0.; //Recalculate total energy
+ }
+
+ //Remove non-connected cells
+ Int_t index[mult] ;
+ Bool_t used[mult] ;
+ for(Int_t i=0; i<mult; i++) used[i]=0 ;
+ Int_t inClu=0 ;
+ Double_t eMax=0. ;
+ //find maximum
+ for(Int_t iDigit=0; iDigit<mult; iDigit++) {
+ if(eMax<tempoE[iDigit]){
+ eMax=tempoE[iDigit];
+ index[0]=iDigit ;
+ inClu=1 ;
+ }
+ }
+ if(mult>0)
+ used[index[0]]=kTRUE ; //mark as used
+ for(Int_t i=0; i<inClu; i++){
+ AliPHOSDigit * digit = (AliPHOSDigit *) digits->At(tempo[index[i]]) ;
+ for(Int_t iDigit=0 ;iDigit<mult; iDigit++){
+ if(used[iDigit]) //already used
+ continue ;
+ AliPHOSDigit * digitN = (AliPHOSDigit *) digits->At(tempo[iDigit]) ;
+ if(AreNeighbours(digit,digitN)){
+ index[inClu]= iDigit ;
+ inClu++ ;
+ used[iDigit]=kTRUE ;
+ }
+ }
+ }
+
+ fMulDigit = inClu ;
delete [] fDigitsList ;
delete [] fEnergyList ;
fDigitsList = new Int_t[fMulDigit];
fAmp = 0.; //Recalculate total energy
for(Int_t iDigit=0;iDigit< fMulDigit ;iDigit++){
- fDigitsList[iDigit] = tempo[iDigit];
- fEnergyList[iDigit] = tempoE[iDigit] ;
- fAmp+=tempoE[iDigit];
- }
-
- delete [] tempo ;
- delete [] tempoE ;
-
+ fDigitsList[iDigit] = tempo[index[iDigit]];
+ fEnergyList[iDigit] = tempoE[index[iDigit]] ;
+ fAmp+=tempoE[index[iDigit]];
+ }
}
//____________________________________________________________________________
void AliPHOSEmcRecPoint::Print(Option_t *) const
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff