fMaxDigit(100), fMulDigit(0), fMaxTrack(200),
fMulTrack(0), fDigitsList(0), fTracksList(0),
fClusterType(-1), fCoreEnergy(0), fDispersion(0),
- fEnergyList(0), fTimeList(0), fAbsIdList(0),
+ fEnergyList(0), fAbsIdList(0),
fTime(0.), fNExMax(0), fCoreRadius(10), //HG check this
fDETracksList(0), fMulParent(0), fMaxParent(0),
fParentsList(0), fDEParentsList(0), fSuperModuleNumber(0),
fMaxDigit(100), fMulDigit(0), fMaxTrack(1000), fMulTrack(0),
fDigitsList(new Int_t[fMaxDigit]), fTracksList(new Int_t[fMaxTrack]),
fClusterType(-1), fCoreEnergy(0), fDispersion(0),
- fEnergyList(new Float_t[fMaxDigit]), fTimeList(new Float_t[fMaxDigit]),
+ fEnergyList(new Float_t[fMaxDigit]),
fAbsIdList(new Int_t[fMaxDigit]), fTime(-1.), fNExMax(0), fCoreRadius(10),
fDETracksList(new Float_t[fMaxTrack]), fMulParent(0), fMaxParent(1000),
fParentsList(new Int_t[fMaxParent]), fDEParentsList(new Float_t[fMaxParent]),
fDigitsList(new Int_t[rp.fMaxDigit]), fTracksList(new Int_t[rp.fMaxTrack]),
fClusterType(rp.fClusterType), fCoreEnergy(rp.fCoreEnergy),
fDispersion(rp.fDispersion),
- fEnergyList(new Float_t[rp.fMaxDigit]), fTimeList(new Float_t[rp.fMaxDigit]),
+ fEnergyList(new Float_t[rp.fMaxDigit]),
fAbsIdList(new Int_t[rp.fMaxDigit]), fTime(rp.fTime), fNExMax(rp.fNExMax),fCoreRadius(rp.fCoreRadius),
fDETracksList(new Float_t[rp.fMaxTrack]), fMulParent(rp.fMulParent),
fMaxParent(rp.fMaxParent), fParentsList(new Int_t[rp.fMaxParent]),
for(Int_t i = 0; i < rp.fMulDigit; i++) {
fEnergyList[i] = rp.fEnergyList[i];
- fTimeList[i] = rp.fTimeList[i];
- fAbsIdList[i] = rp.fAbsIdList[i];
+ fAbsIdList[i] = rp.fAbsIdList[i];
}
for(Int_t i = 0; i < rp.fMulTrack; i++) fDETracksList[i] = rp.fDETracksList[i];
// dtor
if ( fEnergyList )
delete[] fEnergyList ;
- if ( fTimeList )
- delete[] fTimeList ;
if ( fAbsIdList )
delete[] fAbsIdList ;
if ( fDETracksList)
if(&rp == this) return *this;
- fGeomPtr = rp.fGeomPtr;
- fAmp = rp.fAmp;
+ fGeomPtr = rp.fGeomPtr;
+ fAmp = rp.fAmp;
fIndexInList = rp.fIndexInList;
- fGlobPos = rp.fGlobPos;
- fLocPos = rp.fLocPos;
- fMaxDigit = rp.fMaxDigit;
- fMulDigit = rp.fMulDigit;
- fMaxTrack = rp.fMaxTrack;
- fMulTrack = rp.fMaxTrack;
+ fGlobPos = rp.fGlobPos;
+ fLocPos = rp.fLocPos;
+ fMaxDigit = rp.fMaxDigit;
+ fMulDigit = rp.fMulDigit;
+ fMaxTrack = rp.fMaxTrack;
+ fMulTrack = rp.fMulTrack;
+
+ if(fDigitsList) delete [] fDigitsList;
+ fDigitsList = new Int_t[rp.fMaxDigit];
+ if(fTracksList) delete [] fTracksList;
+ fTracksList = new Int_t[rp.fMaxTrack];
for(Int_t i = 0; i<fMaxDigit; i++) fDigitsList[i] = rp.fDigitsList[i];
for(Int_t i = 0; i<fMaxTrack; i++) fTracksList[i] = rp.fTracksList[i];
+
fClusterType = rp.fClusterType;
fCoreEnergy = rp.fCoreEnergy;
fDispersion = rp.fDispersion;
+
+
+ if(fEnergyList) delete [] fEnergyList;
+ fEnergyList = new Float_t[rp.fMaxDigit];
+ if(fAbsIdList) delete [] fAbsIdList;
+ fAbsIdList = new Int_t[rp.fMaxDigit];
for(Int_t i = 0; i<fMaxDigit; i++) {
fEnergyList[i] = rp.fEnergyList[i];
- fTimeList[i] = rp.fTimeList[i];
fAbsIdList[i] = rp.fAbsIdList[i];
}
- fTime = rp.fTime;
- fNExMax = rp.fNExMax;
+
+ fTime = rp.fTime;
+ fNExMax = rp.fNExMax;
fCoreRadius = rp.fCoreRadius;
+
+ if(fDETracksList) delete [] fDETracksList;
+ fDETracksList = new Float_t[rp.fMaxTrack];
for(Int_t i = 0; i < fMaxTrack; i++) fDETracksList[i] = rp.fDETracksList[i];
+
fMulParent = rp.fMulParent;
fMaxParent = rp.fMaxParent;
+
+ if(fParentsList) delete [] fParentsList;
+ fParentsList = new Int_t[rp.fMaxParent];
+ if(fDEParentsList) delete [] fDEParentsList;
+ fDEParentsList = new Float_t[rp.fMaxParent];
for(Int_t i = 0; i < fMaxParent; i++) {
- fParentsList[i] = rp.fParentsList[i];
+ fParentsList[i] = rp.fParentsList[i];
fDEParentsList[i] = rp.fDEParentsList[i];
}
+
fSuperModuleNumber = rp.fSuperModuleNumber;
- fDigitIndMax = rp.fDigitIndMax;
+ fDigitIndMax = rp.fDigitIndMax;
fLambda[0] = rp.fLambda[0];
fLambda[1] = rp.fLambda[1];
if(fEnergyList == 0)
fEnergyList = new Float_t[fMaxDigit];
- if(fTimeList == 0)
- fTimeList = new Float_t[fMaxDigit];
+
if(fAbsIdList == 0) {
fAbsIdList = new Int_t [fMaxDigit];
}
fMaxDigit*=2 ;
Int_t * tempo = new Int_t [fMaxDigit];
Float_t * tempoE = new Float_t[fMaxDigit];
- Float_t * tempoT = new Float_t[fMaxDigit];
Int_t * tempoId = new Int_t [fMaxDigit];
Int_t index ;
for ( index = 0 ; index < fMulDigit ; index++ ){
tempo [index] = fDigitsList[index] ;
tempoE [index] = fEnergyList[index] ;
- tempoT [index] = fTimeList [index] ;
tempoId[index] = fAbsIdList [index] ;
}
delete [] fDigitsList ;
delete [] fEnergyList ;
- delete [] fTimeList ;
delete [] fAbsIdList ;
fDigitsList = tempo;
fEnergyList = tempoE;
- fTimeList = tempoT;
fAbsIdList = tempoId;
} // if
fDigitsList[fMulDigit] = digit.GetIndexInList() ;
fEnergyList[fMulDigit] = energy ;
- fTimeList [fMulDigit] = digit.GetTime();
fAbsIdList [fMulDigit] = digit.GetId();
fMulDigit++ ;
fAmp += energy ;
if(shared) fSharedCluster = kTRUE;
-
- //GCB, May-2010, setting moved to EvalAll method, set the super module number for the largest energy digit position.
- //JLK 10-Oct-2007 this hasn't been filled before because it was in
- //the wrong place in previous versions.
- //Now we evaluate it only if the supermodulenumber for this recpoint
- //has not yet been set (or is the 0th one)
- //if(fSuperModuleNumber == 0)
- //fSuperModuleNumber = fGeomPtr->GetSuperModuleNumber(digit.GetId());
-
}
//____________________________________________________________________________
Bool_t AliEMCALRecPoint::AreNeighbours(AliEMCALDigit * digit1, AliEMCALDigit * digit2 ) const
// In case of a shared cluster, index of SM in C side, columns start at 48 and ends at 48*2-1
// C Side impair SM, nSupMod%2=1; A side pair SM nSupMod%2=0
if(fSharedCluster){
- if(nSupMod1%2) relid1[1]+=AliEMCALGeoParams::fgkEMCALCols;
- else relid2[1]+=AliEMCALGeoParams::fgkEMCALCols;
+ //printf("Shared cluster in 2 SMs!\n");
+
+ // if(nSupMod1%2) relid1[1]+=AliEMCALGeoParams::fgkEMCALCols;//bad
+ // else relid2[1]+=AliEMCALGeoParams::fgkEMCALCols;//bad
+ if(nSupMod1%2) relid2[1]+=AliEMCALGeoParams::fgkEMCALCols;
+ else relid1[1]+=AliEMCALGeoParams::fgkEMCALCols;
}
rowdiff = TMath::Abs( relid1[0] - relid2[0] ) ;
coldiff = TMath::Abs( relid1[1] - relid2[1] ) ;
- if (( coldiff <= 1 ) && ( rowdiff <= 1 ) && (coldiff + rowdiff > 0))
- areNeighbours = kTRUE ;
+ //if (( coldiff <= 1 ) && ( rowdiff <= 1 ) && (coldiff + rowdiff > 0))
+ if ((coldiff + rowdiff == 1 ))
+ areNeighbours = kTRUE ;
return areNeighbours;
}
return rv ;
}
-// GCB, May-2010, Method not used, just comment it but remove?
-//____________________________________________________________________________
-//Int_t AliEMCALRecPoint::DistancetoPrimitive(Int_t px, Int_t py)
-//{
-// // Compute distance from point px,py to a AliEMCALRecPoint considered as a Tmarker
-// // Compute the closest distance of approach from point px,py to this marker.
-// // The distance is computed in pixels units.
-// // HG Still need to update -> Not sure what this should achieve
-//
-// TVector3 pos(0.,0.,0.) ;
-// GetLocalPosition(pos) ;
-// Float_t x = pos.X() ;
-// Float_t y = pos.Y() ;
-// const Int_t kMaxDiff = 10;
-// Int_t pxm = gPad->XtoAbsPixel(x);
-// Int_t pym = gPad->YtoAbsPixel(y);
-// Int_t dist = (px-pxm)*(px-pxm) + (py-pym)*(py-pym);
-//
-// if (dist > kMaxDiff) return 9999;
-// return dist;
-//}
-
//___________________________________________________________________________
void AliEMCALRecPoint::Draw(Option_t *option)
{
AppendPad(option);
}
-// GCB, May-2010, Method not used, just comment it but remove?
-//______________________________________________________________________________
-//void AliEMCALRecPoint::ExecuteEvent(Int_t /*event*/, Int_t, Int_t)
-//{
-// // Execute action corresponding to one event
-// // This member function is called when a AliEMCALRecPoint is clicked with the locator
-// //
-// // If Left button is clicked on AliEMCALRecPoint, the digits are switched on
-// // and switched off when the mouse button is released.
-//
-// // static Int_t pxold, pyold;
-//
-// /* static TGraph * digitgraph = 0 ;
-// static TPaveText* clustertext = 0 ;
-//
-// if (!gPad->IsEditable()) return;
-//
-// switch (event) {
-//
-//
-// case kButton1Down:{
-// AliEMCALDigit * digit ;
-//
-// Int_t iDigit;
-// Int_t relid[2] ;
-//
-// const Int_t kMulDigit=AliEMCALRecPoint::GetDigitsMultiplicity() ;
-// Float_t * xi = new Float_t [kMulDigit] ;
-// Float_t * zi = new Float_t [kMulDigit] ;
-//
-// for(iDigit = 0; iDigit < kMulDigit; iDigit++) {
-// Fatal("AliEMCALRecPoint::ExecuteEvent", " -> Something wrong with the code");
-// digit = 0 ; //dynamic_cast<AliEMCALDigit *>((fDigitsList)[iDigit]);
-// fGeomPtr->AbsToRelNumbering(digit->GetId(), relid) ;
-// fGeomPtr->PosInAlice(relid, xi[iDigit], zi[iDigit]) ;
-// }
-//
-// if (!digitgraph) {
-// digitgraph = new TGraph(fMulDigit,xi,zi);
-// digitgraph-> SetMarkerStyle(5) ;
-// digitgraph-> SetMarkerSize(1.) ;
-// digitgraph-> SetMarkerColor(1) ;
-// digitgraph-> Draw("P") ;
-// }
-// if (!clustertext) {
-//
-// TVector3 pos(0.,0.,0.) ;
-// GetLocalPosition(pos) ;
-// clustertext = new TPaveText(pos.X()-10,pos.Z()+10,pos.X()+50,pos.Z()+35,"") ;
-// Text_t line1[40] ;
-// Text_t line2[40] ;
-// sprintf(line1,"Energy=%1.2f GeV",GetEnergy()) ;
-// sprintf(line2,"%d Digits",GetDigitsMultiplicity()) ;
-// clustertext ->AddText(line1) ;
-// clustertext ->AddText(line2) ;
-// clustertext ->Draw("");
-// }
-// gPad->Update() ;
-// Print("") ;
-// delete[] xi ;
-// delete[] zi ;
-// }
-//
-//break;
-//
-// case kButton1Up:
-// if (digitgraph) {
-// delete digitgraph ;
-// digitgraph = 0 ;
-// }
-// if (clustertext) {
-// delete clustertext ;
-// clustertext = 0 ;
-// }
-//
-// break;
-//
-// }*/
-//}
-
//____________________________________________________________________________
void AliEMCALRecPoint::EvalAll(Float_t logWeight,TClonesArray * digits, const Bool_t justClusters)
{
fDigitIndMax = GetMaximalEnergyIndex();
fGeomPtr->GetCellIndex(fAbsIdList[fDigitIndMax], nSupMod,nModule,nIphi,nIeta);
fGeomPtr->GetCellPhiEtaIndexInSModule(nSupMod,nModule,nIphi,nIeta, iphi,ieta);
-
- // TVector3 dR;
- // TVector3 cellpos;
- // Float_t minDist = 100000;
- // Float_t dist = 0;
- // Int_t absId = -1;
//Loop on tower status map
for(Int_t irow = 0; irow < AliEMCALGeoParams::fgkEMCALRows; irow++){
dist=TMath::Sqrt(dRrow*dRrow+dReta*dReta);
if(dist < minDist) minDist = dist;
- // //Tower is bad, get the absId of the index.
- // absId = fGeomPtr->GetAbsCellIdFromCellIndexes(fSuperModuleNumber, irow, icol);
- //
- // //Get the position of this tower.
- //
- // //Calculate the distance in local coordinates
- // //fGeomPtr->RelPosCellInSModule(absId,cellpos);
- // //Calculate distance between this tower and cluster, set if is smaller than previous.
- // //dR = cellpos-fLocPos;
- //
- // //Calculate the distance in global coordinates
- // fGeomPtr->GetGlobal(absId,cellpos);
- // //Calculate distance between this tower and cluster, set if it is smaller than previous.
- // dR = cellpos-fGlobPos;
- //
- // dist = dR.Mag();
- // if(dist < minDist) minDist = dist;
-
}
}
dist=TMath::Sqrt(dRrow*dRrow+dReta*dReta);
if(dist < minDist) minDist = dist;
-
-//
-// //Tower is bad, get the absId of the index.
-// absId = fGeomPtr->GetAbsCellIdFromCellIndexes(nSupMod2, irow, icol);
-//
-// //Get the position of this tower.
-//
-// //Calculate the distance in global coordinates
-// fGeomPtr->GetGlobal(absId,cellpos);
-// //Calculate distance between this tower and cluster, set if it is smaller than previous.
-// dR = cellpos-fGlobPos;
-//
-// dist = dR.Mag();
-// if(dist < minDist) minDist = dist;
+
}
}
continue;
}
- //fGeomPtr->RelPosCellInSModule(digit->GetId(), idMax, dist, xyzi[0], xyzi[1], xyzi[2]);
fGeomPtr->RelPosCellInSModule(digit->GetId(), dist, xyzi[0], xyzi[1], xyzi[2]);
//Temporal patch, due to mapping problem, need to swap "y" in one of the 2 SM, although no effect in position calculation. GCB 05/2010
clXYZ[i] = clRmsXYZ[i] = -1.;
}
}
- // clRmsXYZ[i] ??
// // Cluster of one single digit, smear the position to avoid discrete position
// // smear x and z with +- 3 cm to uniform (avoid discrete effects). Tower size is approx 6 cm.
}
//Get the local coordinates of the cell
- //fGeomPtr->RelPosCellInSModule(digit->GetId(), idMax, dist, lxyzi[0], lxyzi[1], lxyzi[2]);
fGeomPtr->RelPosCellInSModule(digit->GetId(), dist, lxyzi[0], lxyzi[1], lxyzi[2]);
//Now get the global coordinate
clXYZ[i] = clRmsXYZ[i] = -1.;
}
}
- // clRmsXYZ[i] ??
// // Cluster of one single digit, smear the position to avoid discrete position
// // smear x and z with +- 3 cm to uniform (avoid discrete effects). Tower size is approx 6 cm.
digit = maxAt[iDigit] ;
for(iDigitN = 0; iDigitN < fMulDigit; iDigitN++) {
+ if(iDigitN == iDigit) continue;//the same digit
digitN = (AliEMCALDigit *) digits->At(fDigitsList[iDigitN]) ;
if ( AreNeighbours(digit, digitN) ) {
// but may be digit too is not local max ?
if(fEnergyList[iDigit] < fEnergyList[iDigitN] + locMaxCut)
maxAt[iDigit] = 0 ;
- }
- else {
+ } else {
maxAt[iDigit] = 0 ;
// but may be digitN too is not local max ?
if(fEnergyList[iDigit] > fEnergyList[iDigitN] - locMaxCut)
iDigitN++ ;
}
}
+
return iDigitN ;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff