#include "AliITSClusterFinderV2SSD.h"
-#include "AliITSclusterV2.h"
+#include "AliITSRecPoint.h"
+#include "AliITSgeomTGeo.h"
#include "AliITSDetTypeRec.h"
#include "AliRawReader.h"
#include "AliITSRawStreamSSD.h"
-
#include <TClonesArray.h>
-#include "AliITSgeom.h"
#include "AliITSdigitSSD.h"
+#include "AliITSCalibrationSSD.h"
+
+Short_t *AliITSClusterFinderV2SSD::fPairs = 0x0;
+Int_t AliITSClusterFinderV2SSD::fPairsSize = 0;
ClassImp(AliITSClusterFinderV2SSD)
-AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(AliITSgeom* geom):AliITSClusterFinderV2(geom){
+AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(AliITSDetTypeRec* dettyp):AliITSClusterFinderV2(dettyp),
+fLastSSD1(AliITSgeomTGeo::GetModuleIndex(6,1,1)-1),
+fYpitchSSD(0.0095),
+fHwSSD(3.65),
+fHlSSD(2.00),
+fTanP(0.0275),
+fTanN(0.0075){
//Default constructor
- fITSgeom = geom;
- fLastSSD1=fITSgeom->GetModuleIndex(6,1,1)-1;
- fYpitchSSD=0.0095;
- fHwSSD=3.65;
- fHlSSD=2.00;
- fTanP=0.0275;
- fTanN=0.0075;
-
-
-
}
//------------------------------------------------------------
// Actual SSD cluster finder
//------------------------------------------------------------
+ AliITSCalibrationSSD* cal = (AliITSCalibrationSSD*)GetResp(fModule);
+ Float_t gain=0;
+
Int_t smaxall=alldigits->GetEntriesFast();
if (smaxall==0) return;
- TObjArray *digits = new TObjArray;
+ // TObjArray *digits = new TObjArray;
+ TObjArray digits;
for (Int_t i=0;i<smaxall; i++){
AliITSdigitSSD *d=(AliITSdigitSSD*)alldigits->UncheckedAt(i);
+
+ if(d->IsSideP()) gain = cal->GetGainP(d->GetStripNumber());
+ else gain = cal->GetGainN(d->GetStripNumber());
+
+ Float_t q=gain*d->GetSignal(); // calibration brings mip peaks around 120 (in ADC units)
+ q=cal->ADCToKeV(q); // converts the charge in KeV from ADC units
+ //Float_t q=d->GetSignal()/4.29;// temp. fix (for PID purposed - normalis. to be checked)
+ d->SetSignal(Int_t(q));
+
if (d->GetSignal()<3) continue;
- digits->AddLast(d);
+ digits.AddLast(d);
}
- Int_t smax = digits->GetEntriesFast();
+ Int_t smax = digits.GetEntriesFast();
if (smax==0) return;
const Int_t kMax=1000;
Float_t y=0., q=0., qmax=0.;
Int_t lab[4]={-2,-2,-2,-2};
- AliITSdigitSSD *d=(AliITSdigitSSD*)digits->UncheckedAt(0);
+ AliITSdigitSSD *d=(AliITSdigitSSD*)digits.UncheckedAt(0);
q += d->GetSignal();
y += d->GetCoord2()*d->GetSignal();
qmax=d->GetSignal();
milab[0]=d->GetTrack(0); milab[1]=d->GetTrack(1); milab[2]=d->GetTrack(2);
for (Int_t s=1; s<smax; s++) {
- d=(AliITSdigitSSD*)digits->UncheckedAt(s);
+ d=(AliITSdigitSSD*)digits.UncheckedAt(s);
Int_t strip=d->GetCoord2();
if ((strip-curr) > 1 || flag!=d->GetCoord1()) {
c[*n].SetY(y/q);
}
-void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStream* input,
+void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
TClonesArray** clusters)
{
//------------------------------------------------------------
Int_t prevStrip = -1;
Int_t prevFlag = -1;
Int_t prevModule = -1;
+ Float_t gain=0;
+ AliITSCalibrationSSD* cal=NULL;
+
// read raw data input stream
while (kTRUE) {
Bool_t next = input->Next();
- if(input->GetSignal()<3 && next) continue;
+ if(input->GetSignal()<(3*4.) && next) continue;
// check if a new cluster starts
Int_t strip = input->GetCoord2();
Int_t flag = input->GetCoord1();
// when all data from a module was read, search for clusters
if (prevFlag >= 0) {
- clusters[iModule] = new TClonesArray("AliITSclusterV2");
+ clusters[iModule] = new TClonesArray("AliITSRecPoint");
fModule = iModule;
FindClustersSSD(&clusters1D[0][0], nClusters[0],
&clusters1D[1][0], nClusters[1], clusters[iModule]);
nClusters[0] = nClusters[1] = 0;
y = q = 0.;
nDigits = 0;
+
+ cal = (AliITSCalibrationSSD*)GetResp(input->GetModuleID());
+
}
+ if(input->GetSideFlag()==0) gain = cal->GetGainP(input->GetStrip());
+ else gain = cal->GetGainN(input->GetStrip());
+
// add digit to current cluster
- q += input->GetSignal();
- y += strip * input->GetSignal();
+ q += cal->ADCToKeV( gain * input->GetSignal() ); // signal is corrected for gain and converted in KeV
+ y += strip * cal->ADCToKeV( gain * input->GetSignal() );
nDigits++;
prevStrip = strip;
prevFlag = flag;
//------------------------------------------------------------
// Actual SSD cluster finder
//------------------------------------------------------------
+
+ const TGeoHMatrix *mT2L=AliITSgeomTGeo::GetTracking2LocalMatrix(fModule);
+
TClonesArray &cl=*clusters;
//
Float_t tanp=fTanP, tann=fTanN;
Int_t cused2[3000];
for (Int_t i=0;i<3000;i++) {cnegative[i]=0; cused1[i]=0;}
for (Int_t i=0;i<3000;i++) {cpositive[i]=0; cused2[i]=0;}
- static Short_t pairs[1000][1000];
- memset(pairs,0,sizeof(Short_t)*1000000);
-// Short_t ** pairs = new Short_t*[1000];
-// for (Int_t i=0; i<1000; i++) {
-// pairs[i] = new Short_t[1000];
-// memset(pairs[i],0,sizeof(Short_t)*1000);
-// }
+ for (Int_t i=0;i<30000;i++) {negativepair[i]=0; positivepair[i]=0;}
+
+ if ((np*nn) > fPairsSize) {
+ if (fPairs) delete [] fPairs;
+ fPairsSize = 4*np*nn;
+ fPairs = new Short_t[fPairsSize];
+ }
+ memset(fPairs,0,sizeof(Short_t)*np*nn);
//
// find available pairs
//
positivepair[j*10+cpositive[j]] =i;
cnegative[i]++; //counters
cpositive[j]++;
- pairs[i][j]=100;
+ fPairs[i*nn+j]=100;
}
}
}
positivepair[j*10+cpositive[j]] =i;
cnegative[i]++; //counters
cpositive[j]++;
- pairs[i][j]=100;
+ fPairs[i*nn+j]=100;
}
}
}
zt-=fHlSSD; yt-=fHwSSD;
ybest=yt; zbest=zt;
qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
CheckLabels2(milab);
milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(1);
+ fPairs[ip*nn+j]=1;
+ if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+ cl2->SetType(2);
+ fPairs[ip*nn+j]=2;
+ }
+ cused1[ip]++;
+ cused2[j]++;
+
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(1);
+ fPairs[ip*nn+j]=1;
+ if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+ cl2->SetType(2);
+ fPairs[ip*nn+j]=2;
+ }
+ cused1[ip]++;
+ cused2[j]++;
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(1);
- pairs[ip][j]=1;
- if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
- cl2->SetType(2);
- pairs[ip][j]=2;
- }
- cused1[ip]++;
- cused2[j]++;
}
}
if (TMath::Abs(pcharge-neg[in].GetQ())<10){
//
// add first pair
- if (pairs[ip][in]==100){ //
+ if (fPairs[ip*nn+in]==100){ //
Float_t yp=pos[ip].GetY()*fYpitchSSD;
Float_t yn=neg[in].GetY()*fYpitchSSD;
Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
zt-=fHlSSD; yt-=fHwSSD;
ybest =yt; zbest=zt;
qbest =pos[ip].GetQ();
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
milab[3]=(((ip<<10) + in)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(5);
+ fPairs[ip*nn+in] = 5;
+ if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
+ cl2->SetType(6);
+ fPairs[ip*nn+in] = 6;
+ }
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(5);
+ fPairs[ip*nn+in] = 5;
+ if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
+ cl2->SetType(6);
+ fPairs[ip*nn+in] = 6;
+ }
+
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(5);
- pairs[ip][in] = 5;
- if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
- cl2->SetType(6);
- pairs[ip][in] = 6;
- }
}
+
//
// add second pair
- // if (!(cused1[ip2] || cused2[in])){ //
- if (pairs[ip2][in]==100){
+ // if (!(cused1[ip2] || cused2[in])){ //
+ if (fPairs[ip2*nn+in]==100){
Float_t yp=pos[ip2].GetY()*fYpitchSSD;
Float_t yn=neg[in].GetY()*fYpitchSSD;
Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
zt-=fHlSSD; yt-=fHwSSD;
ybest =yt; zbest=zt;
qbest =pos[ip2].GetQ();
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
ratio = (pos[ip2].GetQ()-neg[in].GetQ())/(pos[ip2].GetQ()+neg[in].GetQ());
milab[3]=(((ip2<<10) + in)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip2].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
-
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(5);
+ fPairs[ip2*nn+in] =5;
+ if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
+ cl2->SetType(6);
+ fPairs[ip2*nn+in] =6;
+ }
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(5);
+ fPairs[ip2*nn+in] =5;
+ if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
+ cl2->SetType(6);
+ fPairs[ip2*nn+in] =6;
+ }
+
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(5);
- pairs[ip2][in] =5;
- if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
- cl2->SetType(6);
- pairs[ip2][in] =6;
- }
}
cused1[ip]++;
cused1[ip2]++;
}
}
}
-
+
//
for (Int_t jn=0;jn<nn;jn++){
if (cused2[jn]) continue;
//
// add first pair
// if (!(cused1[ip]||cused2[jn])){
- if (pairs[ip][jn]==100){
+ if (fPairs[ip*nn+jn]==100){
Float_t yn=neg[jn].GetY()*fYpitchSSD;
Float_t yp=pos[ip].GetY()*fYpitchSSD;
Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
zt-=fHlSSD; yt-=fHwSSD;
ybest =yt; zbest=zt;
qbest =neg[jn].GetQ();
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
milab[3]=(((ip<<10) + jn)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip].GetNd(),neg[jn].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(7);
+ fPairs[ip*nn+jn] =7;
+ if ((pos[ip].GetNd()+neg[jn].GetNd())>6){ //multi cluster
+ cl2->SetType(8);
+ fPairs[ip*nn+jn]=8;
+ }
+
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(7);
+ fPairs[ip*nn+jn] =7;
+ if ((pos[ip].GetNd()+neg[jn].GetNd())>6){ //multi cluster
+ cl2->SetType(8);
+ fPairs[ip*nn+jn]=8;
+ }
+
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(7);
- pairs[ip][jn] =7;
- if ((pos[ip].GetNd()+neg[jn].GetNd())>6){ //multi cluster
- cl2->SetType(8);
- pairs[ip][jn]=8;
- }
}
//
// add second pair
// if (!(cused1[ip]||cused2[jn2])){
- if (pairs[ip][jn2]==100){
+ if (fPairs[ip*nn+jn2]==100){
Float_t yn=neg[jn2].GetY()*fYpitchSSD;
Double_t yp=pos[ip].GetY()*fYpitchSSD;
Double_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
zt-=fHlSSD; yt-=fHwSSD;
ybest =yt; zbest=zt;
qbest =neg[jn2].GetQ();
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
ratio = (pos[ip].GetQ()-neg[jn2].GetQ())/(pos[ip].GetQ()+neg[jn2].GetQ());
milab[3]=(((ip<<10) + jn2)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip].GetNd(),neg[jn2].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ fPairs[ip*nn+jn2]=7;
+ cl2->SetType(7);
+ if ((pos[ip].GetNd()+neg[jn2].GetNd())>6){ //multi cluster
+ cl2->SetType(8);
+ fPairs[ip*nn+jn2]=8;
+ }
+
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ fPairs[ip*nn+jn2]=7;
+ cl2->SetType(7);
+ if ((pos[ip].GetNd()+neg[jn2].GetNd())>6){ //multi cluster
+ cl2->SetType(8);
+ fPairs[ip*nn+jn2]=8;
+ }
+
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- pairs[ip][jn2]=7;
- cl2->SetType(7);
- if ((pos[ip].GetNd()+neg[jn2].GetNd())>6){ //multi cluster
- cl2->SetType(8);
- pairs[ip][jn2]=8;
- }
}
cused1[ip]++;
cused2[jn]++;
if (TMath::Abs(chargedif)<minchargediff+4.) count++;
}
if (count>1) continue;
- if (pairs[ip][j]<100) continue;
+ if (fPairs[ip*nn+j]<100) continue;
//
//almost gold clusters
Float_t yp=pos[ip].GetY()*fYpitchSSD;
zt-=fHlSSD; yt-=fHwSSD;
ybest=yt; zbest=zt;
qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
lp[4]=qbest; //Q
ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
- else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(10);
+ fPairs[ip*nn+j]=10;
+ if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+ cl2->SetType(11);
+ fPairs[ip*nn+j]=11;
+ }
+ cused1[ip]++;
+ cused2[j]++;
}
-
-
+ else{
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(10);
+ fPairs[ip*nn+j]=10;
+ if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+ cl2->SetType(11);
+ fPairs[ip*nn+j]=11;
+ }
+ cused1[ip]++;
+ cused2[j]++;
+
+ fDetTypeRec->AddRecPoint(*cl2);
+ }
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(10);
- pairs[ip][j]=10;
- if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
- cl2->SetType(11);
- pairs[ip][j]=11;
- }
- cused1[ip]++;
- cused2[j]++;
}
}
// Int_t j = negativepair[10*i+di];
if (neg[j].GetQ()<3) continue;
if (cused2[j]||cused1[i]) continue;
- if (pairs[i][j]>0 &&pairs[i][j]<100) continue;
+ if (fPairs[i*nn+j]>0 &&fPairs[i*nn+j]<100) continue;
ratio = (pos[i].GetQ()-neg[j].GetQ())/(pos[i].GetQ()+neg[j].GetQ());
Float_t yn=neg[j].GetY()*fYpitchSSD;
Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
if (TMath::Abs(zt)<fHlSSD+0.01*(neg[j].GetNd()+pos[i].GetNd())) {
ybest=yt; zbest=zt;
qbest=0.5*(pos[i].GetQ()+neg[j].GetQ());
- lp[0]=-(-ybest+fYshift[fModule]);
- lp[1]= -zbest+fZshift[fModule];
+ {
+ Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+ mT2L->MasterToLocal(loc,trk);
+ lp[0]=trk[1];
+ lp[1]=trk[2];
+ }
lp[2]=0.0025*0.0025; //SigmaY2
lp[3]=0.110*0.110; //SigmaZ2
CheckLabels2(milab);
milab[3]=(((i<<10) + j)<<10) + idet; // pos|neg|det
Int_t info[3] = {pos[i].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
- AliITSclusterV2 * cl2;
- if(clusters) cl2 = new (cl[ncl]) AliITSclusterV2(milab,lp,info);
+ AliITSRecPoint * cl2;
+ if(clusters){
+ cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(100+cpositive[j]+cnegative[i]);
+ }
else{
- cl2 = new AliITSclusterV2(milab,lp,info);
- fDetTypeRec->AddClusterV2(*cl2);
+ cl2 = new AliITSRecPoint(milab,lp,info);
+ cl2->SetChargeRatio(ratio);
+ cl2->SetType(100+cpositive[j]+cnegative[i]);
+ fDetTypeRec->AddRecPoint(*cl2);
}
ncl++;
- cl2->SetChargeRatio(ratio);
- cl2->SetType(100+cpositive[j]+cnegative[i]);
//cl2->SetType(0);
/*
- if (pairs[i][j]<100){
- printf("problem:- %d\n", pairs[i][j]);
+ if (fPairs[i*nn+j]<100){
+ printf("problem:- %d\n", fPairs[i*nn+j]);
}
if (cnegative[i]<2&&cpositive[j]<2){
- printf("problem:- %d\n", pairs[i][j]);
+ printf("problem:- %d\n", fPairs[i*nn+j]);
}
*/
}
}
}
-// for (Int_t i=0; i<1000; i++) delete [] pairs[i];
-// delete [] pairs;
-
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff