fCalibCovar = new TMatrixD(ncalibs,ncalibs);
for (Int_t icalib=0;icalib<ncalibs; icalib++){
AliTPCTransformation * transform = (AliTPCTransformation *)fCalibration->At(icalib);
- (*fCalibParam)(icalib,0) = transform->fParam;
+ (*fCalibParam)(icalib,0) = transform->GetParam();
for (Int_t jcalib=0;jcalib<ncalibs; jcalib++){
if (icalib!=jcalib) (*fCalibCovar)(icalib,jcalib)= 0;
- if (icalib==jcalib) (*fCalibCovar)(icalib,jcalib) = transform->fSigma*transform->fSigma;
+ if (icalib==jcalib) (*fCalibCovar)(icalib,jcalib) = transform->GetSigma()*transform->GetSigma();
}
}
//
// save current param and covariance
for (Int_t i=0; i<ncalibs;i++){
AliTPCTransformation * transform = (AliTPCTransformation *)fCalibration->At(i);
- transform->fParam= (*fLinearParam)(i,0);
+ transform->SetParam( (*fLinearParam)(i,0));
(*fCalibParam)(i,0) = (*fLinearParam)(i,0);
for (Int_t j=0; j<ncalibs;j++){
(*fCalibCovar)(i,j) = (*fLinearCovar)(i,j);
//
//
//
- if (fCalibCovar) return;
+ if (!fCalibCovar) return;
if (!fCalibration) return;
if (!fCalibration->FindObject(varName)) return;
Int_t ncalibs = fCalibration->GetEntries();
fLastTimeStamp = time;
for (Int_t icalib=0;icalib<ncalibs; icalib++){
AliTPCTransformation * transform = (AliTPCTransformation *)fCalibration->At(icalib);
- if ((*fCalibCovar)(icalib,icalib)<transform->fSigmaMax*transform->fSigmaMax)
- (*fCalibCovar)(icalib,icalib)+= transform->fSigma2Time*TMath::Abs(deltaT);
+ if ((*fCalibCovar)(icalib,icalib)<transform->GetSigmaMax()*transform->GetSigmaMax())
+ (*fCalibCovar)(icalib,icalib)+= transform->GetSigma2Time()*TMath::Abs(deltaT);
}
}
Int_t npoints=0;
for (Int_t i=0;i<6;i++) cov[i]=0.001;
for (Int_t i=0;i<500;i++){
- AliTrackPoint point(0, 0, 0, cov, -1,0,0);
+ AliTrackPoint point(0, 0, 0, cov, 0,0,0);
array.AddPoint(npoints, &point);
npoints++;
}
Double_t dxdydz[3]={0,0,0};
for (Int_t icalib=0; icalib<ncalibs; icalib++){
AliTPCTransformation * transform = (AliTPCTransformation *)fCalibration->At(icalib);
- dxdydz[0] += transform->GetDeltaXYZ(0,volId, transform->fParam, xyz[0], xyz[1], xyz[2]);
- dxdydz[1] += transform->GetDeltaXYZ(1,volId, transform->fParam, xyz[0], xyz[1], xyz[2]);
- dxdydz[2] += transform->GetDeltaXYZ(2,volId, transform->fParam, xyz[0], xyz[1], xyz[2]);
+ dxdydz[0] += transform->GetDeltaXYZ(0,volId, transform->GetParam(), xyz[0], xyz[1], xyz[2]);
+ dxdydz[1] += transform->GetDeltaXYZ(1,volId, transform->GetParam(), xyz[0], xyz[1], xyz[2]);
+ dxdydz[2] += transform->GetDeltaXYZ(2,volId, transform->GetParam(), xyz[0], xyz[1], xyz[2]);
}
((Float_t*)array->GetX())[ipoint]+=csign*dxdydz[0];
((Float_t*)array->GetY())[ipoint]+=csign*dxdydz[1];
if (ipar0+ipar1==0) continue;
Double_t param = (gRandom->Rndm()-0.5)*0.5; // generate random parameters
char tname[100];
- sprintf(tname,"tscalingR%d%dSide%d",ipar0,ipar1,iside);
+ snprintf(tname,100,"tscalingR%d%dSide%d",ipar0,ipar1,iside);
transformation = new AliTPCTransformation(tname,AliTPCTransformation::BitsSide(iside),"TPCscalingRPol",0,0,1);
transformation->SetParams(0,5*0.25,0,&fpar);
kalmanFit0->AddCalibration(transformation);
if (ncalibs==0) return 0;
Double_t xyz[3]={0,0,0};
Double_t dxdydz[6]={0,0,0,0,0,0};
- Double_t alpha;
- Double_t r;
- if(icoordsys==0)alpha=TMath::ATan2(y,x); r =TMath::Sqrt(y*y+x*x);
- if(icoordsys==1)alpha=y; r=x;
+ Double_t alpha=0;
+ Double_t r=0;
+ if(icoordsys==0){alpha=TMath::ATan2(y,x); r =TMath::Sqrt(y*y+x*x);}
+ if(icoordsys==1){alpha=y; r=x;}
Double_t ca = TMath::Cos(alpha);
Double_t sa = TMath::Sin(alpha);
- if(icoordsys==0)xyz[0]=x; xyz[1]=y; xyz[2]=z;
- if(icoordsys==1)xyz[0]=x*ca; xyz[1]=x*sa; xyz[2]=z;
+ if(icoordsys==0){xyz[0]=x; xyz[1]=y; xyz[2]=z;}
+ if(icoordsys==1){xyz[0]=x*ca; xyz[1]=x*sa; xyz[2]=z;}
//
if (volID<0){
// Double_t alpha = TMath::ATan2(y,x);
if (calibID>=ncalibs) return 0;
//Int_t volID=-1;
//Double_t xyz[3]={x,y,z};
- Double_t r;
- Double_t alpha;
- if(icoordsys==0)r=TMath::Sqrt(x*x+y*y); alpha = TMath::ATan2(y,x);
- if(icoordsys==1)r=x; alpha = y;
+ Double_t r=0;
+ Double_t alpha=0;
+ if(icoordsys==0){r=TMath::Sqrt(x*x+y*y); alpha = TMath::ATan2(y,x);}
+ if(icoordsys==1){r=x; alpha = y;}
Double_t ca = TMath::Cos(alpha);
Double_t sa = TMath::Sin(alpha);
- Double_t xyz[3];
- if(icoordsys==0)xyz[0]=x;xyz[1]=y;xyz[2]=z;
- if(icoordsys==1)xyz[0]=x*ca; xyz[1]=x*sa; xyz[2]=z;
+ Double_t xyz[3]={0,0,0};
+ if(icoordsys==0){xyz[0]=x;xyz[1]=y;xyz[2]=z;}
+ if(icoordsys==1){xyz[0]=x*ca; xyz[1]=x*sa; xyz[2]=z;}
//xyz[3]=param; xyz[4]=volID;
if (volID<0){
if (AliTPCkalmanFit::fgInstance==0) return 0;
return AliTPCkalmanFit::fgInstance->GetTPCtransXYZ(coord, volID, calibID,icoordsys,x,y,z);
}
+
+
+void AliTPCkalmanFit::MakeTreeTrans(TTreeSRedirector *debug, const char *treeName){
+ //
+ // Make the Tree before and after current calibration
+ //
+ if (!fCalibParam) {
+ AliError("Kalman Fit not initialized");
+ return;
+ }
+ //
+ //
+ //
+ const Int_t ncalibs = fCalibration->GetEntries();
+ TMatrixD dxdydz(ncalibs,5);
+ Double_t * adx = new Double_t[ncalibs];
+ Double_t * ady = new Double_t[ncalibs];
+ Double_t * adz = new Double_t[ncalibs];
+ Double_t * adr = new Double_t[ncalibs];
+ Double_t * adrphi = new Double_t[ncalibs];
+
+ Double_t x[3];
+ for (x[0]=-250.;x[0]<=250.;x[0]+=10.){
+ for (x[1]=-250.;x[1]<=250.;x[1]+=10.){
+ for (x[2]=-250.;x[2]<=250.;x[2]+=20.) {
+ Double_t r=TMath::Sqrt(x[0]*x[0]+x[1]*x[1]);
+ if (r<20) continue;
+ if (r>260) continue;
+ //Double_t z = x[2];
+ Double_t phi=TMath::ATan2(x[1],x[0]);
+ Double_t ca=TMath::Cos(phi);
+ Double_t sa=TMath::Sin(phi);
+ Double_t dx=0;
+ Double_t dy=0;
+ Double_t dz=0;
+ Double_t dr=0;
+ Double_t rdphi=0;
+
+ Int_t volID= TMath::Nint(9*phi/TMath::Pi()-0.5);
+ if (volID<0) volID+=18;
+ if (x[2]<0) volID+=18; //C-side
+ if (r>120) volID+=36; //outer
+ Double_t volalpha=(volID+0.5)*TMath::Pi()/9;
+ Double_t cva=TMath::Cos(volalpha);
+ Double_t sva=TMath::Sin(volalpha);
+
+ Double_t lx=x[0]*cva+x[1]*sva;
+ Double_t ly=-x[0]*sva+x[1]*cva;
+
+
+ for(Int_t icalib=0;icalib<ncalibs;icalib++){
+ for(Int_t icoord=0;icoord<5;icoord++){
+ dxdydz(icalib,icoord)= GetTPCtransXYZ(icoord, -1, icalib, 0, x[0], x[1], x[2]);
+ }
+ }
+ dx=GetTPCDeltaXYZ(0, -1, 0, x[0], x[1], x[2]);
+ dy=GetTPCDeltaXYZ(1, -1, 0, x[0], x[1], x[2]);
+ dz=GetTPCDeltaXYZ(2, -1, 0, x[0], x[1], x[2]);
+ dr=GetTPCDeltaXYZ(3, -1, 0, x[0], x[1], x[2]);
+ rdphi=GetTPCDeltaXYZ(4, -1, 0, x[0], x[1], x[2]);
+
+
+ if(debug){
+ TTreeStream &cstream=
+ (*debug)<<treeName<<
+ "x="<<x[0]<<
+ "y="<<x[1]<<
+ "z="<<x[2]<<
+ "r="<<r<<
+ "ca="<<ca<<
+ "sa="<<sa<<
+ "lx="<<lx<<
+ "ly="<<ly<<
+ "sector="<<volID<<
+ "phi="<<phi<<
+ "dx="<<dx<<
+ "dy="<<dy<<
+ "dz="<<dz<<
+ "dr="<<dr<<
+ "rdphi="<<rdphi<<
+ "dxdydz.="<<&dxdydz;
+ for (Int_t icalib=0;icalib<ncalibs;icalib++){
+ AliTPCTransformation * transform = (AliTPCTransformation *)fCalibration->At(icalib);
+ char tname[1000];
+ //
+ snprintf(tname,1000,"dx%s=",transform->GetName());
+ adx[icalib] =dxdydz(icalib,0);
+ cstream<<tname<<adx[icalib];
+ snprintf(tname,1000,"dy%s=",transform->GetName());
+ ady[icalib] =dxdydz(icalib,1);
+ cstream<<tname<<ady[icalib];
+ snprintf(tname,1000,"dz%s=",transform->GetName());
+ adz[icalib] =dxdydz(icalib,2);
+ cstream<<tname<<adz[icalib];
+ //
+ snprintf(tname,1000,"dr%s=",transform->GetName());
+ adr[icalib] =dxdydz(icalib,3);
+ cstream<<tname<<adr[icalib];
+ snprintf(tname,1000,"rdphi%s=",transform->GetName());
+ adrphi[icalib] =dxdydz(icalib,4);
+ cstream<<tname<<adrphi[icalib];
+ }
+ cstream<<"\n";
+ }
+ }
+ }
+ Printf("x0=%f finished",x[0]);
+ }
+ delete [] adx;// = new Double_t[ncalibs];
+ delete [] ady;// = new Double_t[ncalibs];
+ delete [] adz;// = new Double_t[ncalibs];
+ delete [] adr;// = new Double_t[ncalibs];
+ delete [] adrphi;// = new Double_t[ncalibs];
+
+}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff