#include <Riostream.h>
#include <stdlib.h>
+#include <TF2.h>
#include <TFile.h>
-#include <TGeometry.h>
+#include <TGeoGlobalMagField.h>
#include <TInterpreter.h>
#include <TMath.h>
#include <TMatrixF.h>
-#include <TVector.h>
-#include <TNode.h>
#include <TObjectTable.h>
#include <TParticle.h>
#include <TROOT.h>
#include <TRandom.h>
+#include <TStopwatch.h>
+#include <TString.h>
#include <TSystem.h>
-#include <TTUBS.h>
#include <TTree.h>
+#include <TVector.h>
#include <TVirtualMC.h>
-#include <TString.h>
-#include <TF2.h>
-#include <TStopwatch.h>
#include "AliDigits.h"
#include "AliMagF.h"
-#include "AliPoints.h"
#include "AliRun.h"
#include "AliRunLoader.h"
#include "AliSimDigits.h"
#include "AliTPCPRF2D.h"
#include "AliTPCParamSR.h"
#include "AliTPCRF1D.h"
-//#include "AliTPCTrackHits.h"
#include "AliTPCTrackHitsV2.h"
#include "AliTrackReference.h"
#include "AliMC.h"
#include "AliTPCExB.h"
#include "AliRawReader.h"
#include "AliTPCRawStream.h"
+#include "TTreeStream.h"
ClassImp(AliTPC)
//_____________________________________________________________________________
fNoiseTable(0),
fCurrentNoise(0),
fActiveSectors(0),
- fGainFactor(1.)
-
+ fGainFactor(1.),
+ fDebugStreamer(0)
{
//
fNoiseTable(0),
fCurrentNoise(0),
fActiveSectors(0),
- fGainFactor(1.)
+ fGainFactor(1.),
+ fDebugStreamer(0)
{
//
if (!strcmp(title,"Default")) {
- fTPCParam = new AliTPCParamSR;
+ //fTPCParam = new AliTPCParamSR;
+ fTPCParam = AliTPCcalibDB::Instance()->GetParameters();
} else {
AliWarning("In Config.C you must set non-default parameters.");
fTPCParam=0;
}
+
}
//_____________________________________________________________________________
fIshunt = 0;
delete fHits;
delete fDigits;
- delete fTPCParam;
+ //delete fTPCParam;
delete fTrackHits; //MI 15.09.2000
// delete fTrackHitsOld; //MI 10.12.2001
fDigitsArray = 0x0;
delete [] fNoiseTable;
delete [] fActiveSectors;
-
+ if (fDebugStreamer) delete fDebugStreamer;
}
//_____________________________________________________________________________
AddHit2(track,vol,hits);
}
-//_____________________________________________________________________________
-void AliTPC::BuildGeometry()
-{
-
- //
- // Build TPC ROOT TNode geometry for the event display
- //
- TNode *nNode, *nTop;
- TTUBS *tubs;
- Int_t i;
- const int kColorTPC=19;
- char name[5], title[25];
- const Double_t kDegrad=TMath::Pi()/180;
- const Double_t kRaddeg=180./TMath::Pi();
-
-
- Float_t innerOpenAngle = fTPCParam->GetInnerAngle();
- Float_t outerOpenAngle = fTPCParam->GetOuterAngle();
-
- Float_t innerAngleShift = fTPCParam->GetInnerAngleShift();
- Float_t outerAngleShift = fTPCParam->GetOuterAngleShift();
-
- Int_t nLo = fTPCParam->GetNInnerSector()/2;
- Int_t nHi = fTPCParam->GetNOuterSector()/2;
-
- const Double_t kloAng = (Double_t)TMath::Nint(innerOpenAngle*kRaddeg);
- const Double_t khiAng = (Double_t)TMath::Nint(outerOpenAngle*kRaddeg);
- const Double_t kloAngSh = (Double_t)TMath::Nint(innerAngleShift*kRaddeg);
- const Double_t khiAngSh = (Double_t)TMath::Nint(outerAngleShift*kRaddeg);
-
-
- const Double_t kloCorr = 1/TMath::Cos(0.5*kloAng*kDegrad);
- const Double_t khiCorr = 1/TMath::Cos(0.5*khiAng*kDegrad);
-
- Double_t rl,ru;
-
-
- //
- // Get ALICE top node
- //
-
- nTop=gAlice->GetGeometry()->GetNode("alice");
-
- // inner sectors
-
- rl = fTPCParam->GetInnerRadiusLow();
- ru = fTPCParam->GetInnerRadiusUp();
-
-
- for(i=0;i<nLo;i++) {
- sprintf(name,"LS%2.2d",i);
- name[4]='\0';
- sprintf(title,"TPC low sector %3d",i);
- title[24]='\0';
-
- tubs = new TTUBS(name,title,"void",rl*kloCorr,ru*kloCorr,250.,
- kloAng*(i-0.5)+kloAngSh,kloAng*(i+0.5)+kloAngSh);
- tubs->SetNumberOfDivisions(1);
- nTop->cd();
- nNode = new TNode(name,title,name,0,0,0,"");
- nNode->SetLineColor(kColorTPC);
- fNodes->Add(nNode);
- }
-
- // Outer sectors
-
- rl = fTPCParam->GetOuterRadiusLow();
- ru = fTPCParam->GetOuterRadiusUp();
-
- for(i=0;i<nHi;i++) {
- sprintf(name,"US%2.2d",i);
- name[4]='\0';
- sprintf(title,"TPC upper sector %d",i);
- title[24]='\0';
- tubs = new TTUBS(name,title,"void",rl*khiCorr,ru*khiCorr,250,
- khiAng*(i-0.5)+khiAngSh,khiAng*(i+0.5)+khiAngSh);
- tubs->SetNumberOfDivisions(1);
- nTop->cd();
- nNode = new TNode(name,title,name,0,0,0,"");
- nNode->SetLineColor(kColorTPC);
- fNodes->Add(nNode);
- }
-
-}
-
//_____________________________________________________________________________
void AliTPC::CreateMaterials()
{
// Origin: Marek Kowalski IFJ, Krakow, Marek.Kowalski@ifj.edu.pl
//-----------------------------------------------------------------
- Int_t iSXFLD=gAlice->Field()->Integ();
- Float_t sXMGMX=gAlice->Field()->Max();
+ Int_t iSXFLD=((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+ Float_t sXMGMX=((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
Float_t amat[5]; // atomic numbers
Float_t zmat[5]; // z
}
for (Int_t i=0;i<fTPCParam->GetNSector();i++) fActiveSectors[i]=kFALSE;
TBranch * branch=0;
- if (TreeH() == 0x0)
+ if (fLoader->TreeH() == 0x0)
{
AliFatal("Can not find TreeH in folder");
return;
}
- if (fHitType>1) branch = TreeH()->GetBranch("TPC2");
- else branch = TreeH()->GetBranch("TPC");
- Stat_t ntracks = TreeH()->GetEntries();
+ if (fHitType>1) branch = fLoader->TreeH()->GetBranch("TPC2");
+ else branch = fLoader->TreeH()->GetBranch("TPC");
+ Stat_t ntracks = fLoader->TreeH()->GetEntries();
// loop over all hits
AliDebug(1,Form("Got %d tracks",ntracks));
ResetHits();
//
if (fTrackHits && fHitType&4) {
- TBranch * br1 = TreeH()->GetBranch("fVolumes");
- TBranch * br2 = TreeH()->GetBranch("fNVolumes");
+ TBranch * br1 = fLoader->TreeH()->GetBranch("fVolumes");
+ TBranch * br2 = fLoader->TreeH()->GetBranch("fNVolumes");
br1->GetEvent(track);
br2->GetEvent(track);
Int_t *volumes = fTrackHits->GetVolumes();
//
// if (fTrackHitsOld && fHitType&2) {
-// TBranch * br = TreeH()->GetBranch("fTrackHitsInfo");
+// TBranch * br = fLoader->TreeH()->GetBranch("fTrackHitsInfo");
// br->GetEvent(track);
// AliObjectArray * ar = fTrackHitsOld->fTrackHitsInfo;
// for (UInt_t j=0;j<ar->GetSize();j++){
AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::GetRunLoaderName());
rl->CdGAFile();
AliTPCParamSR *param=(AliTPCParamSR*)gDirectory->Get("75x40_100x60");
- if(param){
- AliInfo("You are using 2 pad-length geom hits with 3 pad-lenght geom digits...");
- delete param;
- param = new AliTPCParamSR();
- }
- else {
- param=(AliTPCParamSR*)gDirectory->Get("75x40_100x60_150x60");
- }
+ // if(param){
+// AliInfo("You are using 2 pad-length geom hits with 3 pad-lenght geom digits...");
+// delete param;
+// param = new AliTPCParamSR();
+// }
+// else {
+// param=(AliTPCParamSR*)gDirectory->Get("75x40_100x60_150x60");
+// }
+ param = (AliTPCParamSR*)AliTPCcalibDB::Instance()->GetParameters();
+ if (!param->IsGeoRead()){
+ //
+ // read transformation matrices for gGeoManager
+ //
+ param->ReadGeoMatrices();
+ }
if(!param){
AliFatal("No TPC parameters found");
}
AliTPCPRF2D * prfinner = new AliTPCPRF2D;
AliTPCPRF2D * prfouter1 = new AliTPCPRF2D;
AliTPCPRF2D * prfouter2 = new AliTPCPRF2D;
- AliTPCRF1D * rf = new AliTPCRF1D(kTRUE);
- rf->SetGauss(param->GetZSigma(),param->GetZWidth(),1.);
- rf->SetOffset(3*param->GetZSigma());
- rf->Update();
+
+
+ //AliTPCRF1D * rf = new AliTPCRF1D(kTRUE);
+ //rf->SetGauss(param->GetZSigma(),param->GetZWidth(),1.);
+ //rf->SetOffset(3*param->GetZSigma());
+ //rf->Update();
+ //
+ // Use gamma 4
+ //
+ char strgamma4[1000];
+ sprintf(strgamma4,"AliTPCRF1D::Gamma4((x-0.135+%f)*%f,55,160)",3*param->GetZSigma(), 1000000000*param->GetTSample()/param->GetZWidth());
+ TF1 * fgamma4 = new TF1("fgamma4",strgamma4, -1,1);
+ AliTPCRF1D * rf = new AliTPCRF1D(kTRUE,1000);
+ rf->SetParam(fgamma4,param->GetZWidth(), 1,0.2);
+ rf->SetOffset(3*param->GetZSigma());
+ rf->Update();
+
TDirectory *savedir=gDirectory;
TFile *f=TFile::Open("$ALICE_ROOT/TPC/AliTPCprf2d.root");
if (!f->IsOpen())
//-----------------------------------------------------------
// summable digits - 16 bit "ADC", no noise, no saturation
//-----------------------------------------------------------
+ if (0) fDebugStreamer = new TTreeSRedirector("TPCSimdebug.root");
if (!fTPCParam->IsGeoRead()){
//
fLoader->UnloadHits();
fLoader->UnloadSDigits();
+ if (fDebugStreamer) {
+ delete fDebugStreamer;
+ fDebugStreamer=0;
+ }
}
//_____________________________________________________________________________
if(fDefaults == 0) SetDefaults();
- TTree *tH = TreeH(); // pointer to the hits tree
+ TTree *tH = fLoader->TreeH(); // pointer to the hits tree
if (tH == 0x0) {
AliFatal("Can not find TreeH in folder");
return;
Stat_t ntracks = tH->GetEntries();
- if( ntracks > 0){
- //-------------------------------------------
- // Only if there are any tracks...
- //-------------------------------------------
TObjArray **row;
delete [] row; // delete the array of pointers to TObjArray-s
- } // ntracks >0
} // end of Hits2DigitsSector
//-----------------------------------------------------------------
Float_t zerosup = fTPCParam->GetZeroSup();
+ AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetDedxGainFactor();
+ AliTPCCalPad * noiseTPC = AliTPCcalibDB::Instance()->GetPadNoise();
+ AliTPCCalROC * gainROC = gainTPC->GetCalROC(isec); // pad gains per given sector
+ AliTPCCalROC * noiseROC = noiseTPC->GetCalROC(isec); // noise per given sector
+
fCurrentIndex[1]= isec;
for(Int_t ip=0;ip<nofPads;ip++){
gi++;
Float_t q=total(ip,it);
- if(fDigitsSwitch == 0){
- q+=GetNoise();
+ if(fDigitsSwitch == 0){
+ Float_t gain = gainROC->GetValue(irow,ip); // get gain for given - pad-row pad
+ Float_t noisePad = noiseROC->GetValue(irow,ip);
+ //
+ q*=gain;
+ q+=GetNoise()*noisePad;
if(q <=fzerosup) continue; // do not fill zeros
q = TMath::Nint(q);
if(q >= fTPCParam->GetADCSat()) q = fTPCParam->GetADCSat() - 1; // saturation
} // end of loop over time buckets
} // end of lop over pads
+ //
+ // test
+ //
+ //
+ // glitch filters if normal simulated digits
+ //
+ if(!fDigitsSwitch) ((AliSimDigits*)dig)->GlitchFilter();
//
// This row has been digitized, delete nonused stuff
//
// Origin: Marian Ivanov, marian.ivanov@cern.ch
//-----------------------------------------------------------------
AliTPCcalibDB* const calib=AliTPCcalibDB::Instance();
+ if (gAlice){ // Set correctly the magnetic field in the ExB calculation
+ AliMagF * field = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField());
+ if (field) {
+ calib->SetExBField(field->SolenoidField());
+ }
+ }
Float_t gasgain = fTPCParam->GetGasGain();
gasgain = gasgain/fGainFactor;
TransportElectron(xyz,index);
Int_t rowNumber;
- fTPCParam->GetPadRow(xyz,index);
+ Int_t padrow = fTPCParam->GetPadRow(xyz,index);
//
// Add Time0 correction due unisochronity
// xyz[0] - pad row coordinate
// xyz[2] - is in now time bin coordinate system
Float_t correction =0;
if (calib->GetPadTime0()){
- if (!calib->GetPadTime0()->GetCalROC(isec)) continue;
- correction = calib->GetPadTime0()->GetCalROC(isec)->GetValue(TMath::Nint(xyz[0]),TMath::Nint(xyz[1]));
+ if (!calib->GetPadTime0()->GetCalROC(isec)) continue;
+ Int_t npads = fTPCParam->GetNPads(isec,padrow);
+ // Int_t pad = TMath::Nint(xyz[1]+fTPCParam->GetNPads(isec,TMath::Nint(xyz[0]))*0.5);
+ // pad numbering from -npads/2 .. npads/2-1
+ Int_t pad = TMath::Nint(xyz[1]+npads/2);
+ if (pad<0) pad=0;
+ if (pad>=npads) pad=npads-1;
+ correction = calib->GetPadTime0()->GetCalROC(isec)->GetValue(padrow,pad);
+ // printf("%d\t%d\t%d\t%f\n",isec,padrow,pad,correction);
+ if (fDebugStreamer){
+ (*fDebugStreamer)<<"Time0"<<
+ "isec="<<isec<<
+ "padrow="<<padrow<<
+ "pad="<<pad<<
+ "x0="<<xyz[0]<<
+ "x1="<<xyz[1]<<
+ "x2="<<xyz[2]<<
+ "hit.="<<tpcHit<<
+ "cor="<<correction<<
+ "\n";
+ }
}
xyz[2]+=correction;
+ xyz[2]+=fTPCParam->GetNTBinsL1(); // adding Level 1 time bin offset
//
// Electron track time (for pileup simulation)
- xyz[4] = tpcHit->Time()/fTPCParam->GetTSample();
+ xyz[2]+=tpcHit->Time()/fTPCParam->GetTSample(); // adding time of flight
+ xyz[4] =0;
+
+ //
// row 0 - cross talk from the innermost row
// row fNRow+1 cross talk from the outermost row
rowNumber = index[2]+1;
//transform position to local digit coordinates
//relative to nearest pad row
if ((rowNumber<0)||rowNumber>fTPCParam->GetNRow(isec)+1) continue;
- Float_t x1,y1;
+ /* Float_t x1,y1;
if (isec <fTPCParam->GetNInnerSector()) {
x1 = xyz[1]*fTPCParam->GetInnerPadPitchWidth();
y1 = fTPCParam->GetYInner(rowNumber);
// gain inefficiency at the wires edges - linear
x1=TMath::Abs(x1);
y1-=1.;
- if(x1>y1) xyz[3]*=TMath::Max(1.e-6,(y1-x1+1.));
+ if(x1>y1) xyz[3]*=TMath::Max(1.e-6,(y1-x1+1.)); */
nofElectrons[rowNumber]++;
//----------------------------------
AliDebug(1,"*********************************************");
}
-//_____________________________________________________________________________
-void AliTPC::MakeBranch(Option_t* option)
-{
- //
- // Create Tree branches for the TPC.
- //
- AliDebug(1,"");
- Int_t buffersize = 4000;
- char branchname[10];
- sprintf(branchname,"%s",GetName());
-
- const char *h = strstr(option,"H");
-
- if ( h && (fHitType<=1) && (fHits == 0x0)) fHits = new TClonesArray("AliTPChit", 176);//skowron 20.06.03
-
- AliDetector::MakeBranch(option);
-
- const char *d = strstr(option,"D");
-
- if (fDigits && fLoader->TreeD() && d) {
- MakeBranchInTree(gAlice->TreeD(), branchname, &fDigits, buffersize, 0);
- }
-
- if (fHitType>1) MakeBranch2(option,0); // MI change 14.09.2000
-}
-
//_____________________________________________________________________________
void AliTPC::ResetDigits()
{
// xyz and index must be already transformed to system 1
//
- fTPCParam->Transform1to2(xyz,index);
+ fTPCParam->Transform1to2(xyz,index); // mis-alignment applied in this step
//add diffusion
Float_t driftl=xyz[2];
//________________________________________________________________________
// Additional code because of the AliTPCTrackHitsV2
-void AliTPC::MakeBranch2(Option_t *option,const char */*file*/)
+void AliTPC::MakeBranch(Option_t *option)
{
//
// Create a new branch in the current Root Tree
// Get the pointer to the header
const char *cH = strstr(option,"H");
//
- if (fTrackHits && TreeH() && cH && fHitType&4) {
+ if (fTrackHits && fLoader->TreeH() && cH && fHitType&4) {
AliDebug(1,"Making branch for Type 4 Hits");
- TreeH()->Branch(branchname,"AliTPCTrackHitsV2",&fTrackHits,fBufferSize,99);
+ fLoader->TreeH()->Branch(branchname,"AliTPCTrackHitsV2",&fTrackHits,fBufferSize,99);
}
-// if (fTrackHitsOld && TreeH() && cH && fHitType&2) {
+// if (fTrackHitsOld && fLoader->TreeH() && cH && fHitType&2) {
// AliDebug(1,"Making branch for Type 2 Hits");
// AliObjectBranch * branch = new AliObjectBranch(branchname,"AliTPCTrackHits",&fTrackHitsOld,
-// TreeH(),fBufferSize,99);
-// TreeH()->GetListOfBranches()->Add(branch);
+// fLoader->TreeH(),fBufferSize,99);
+// fLoader->TreeH()->GetListOfBranches()->Add(branch);
// }
}
sprintf(branchname,"%s2",GetName());
//
// Branch address for hit tree
- TTree *treeH = TreeH();
+ TTree *treeH = fLoader->TreeH();
if ((treeH)&&(fHitType&4)) {
branch = treeH->GetBranch(branchname);
if (branch) {
void AliTPC::AddHit2(Int_t track, Int_t *vol, Float_t *hits)
{
//
- // add hit to the list
+ // add hit to the list
+
Int_t rtrack;
if (fIshunt) {
int primary = gAlice->GetMCApp()->GetPrimary(track);
// track is returned
//
if(track>=0) {
- gAlice->ResetHits();
- TreeH()->GetEvent(track);
+ gAlice->GetMCApp()->ResetHits();
+ fLoader->TreeH()->GetEvent(track);
}
//
if (fTrackHits && fHitType&4) {
return 0;
}
-void AliTPC::LoadPoints(Int_t)
-{
- //
- Int_t a = 0;
-
- if(fHitType==1) AliDetector::LoadPoints(a);
- else LoadPoints2(a);
-}
-
-
void AliTPC::RemapTrackHitIDs(Int_t *map)
{
//
//
// return kTRUE;
// if (fTrackHitsOld && fHitType&2) {
-// TBranch * br = TreeH()->GetBranch("fTrackHitsInfo");
+// TBranch * br = fLoader->TreeH()->GetBranch("fTrackHitsInfo");
// br->GetEvent(track);
// AliObjectArray * ar = fTrackHitsOld->fTrackHitsInfo;
// for (UInt_t j=0;j<ar->GetSize();j++){
// }
if (fTrackHits && fHitType&4) {
- TBranch * br1 = TreeH()->GetBranch("fVolumes");
- TBranch * br2 = TreeH()->GetBranch("fNVolumes");
+ TBranch * br1 = fLoader->TreeH()->GetBranch("fVolumes");
+ TBranch * br2 = fLoader->TreeH()->GetBranch("fNVolumes");
br2->GetEvent(track);
br1->GetEvent(track);
Int_t *volumes = fTrackHits->GetVolumes();
}
if (fHitType&1) {
- TBranch * br = TreeH()->GetBranch("fSector");
+ TBranch * br = fLoader->TreeH()->GetBranch("fSector");
br->GetEvent(track);
for (Int_t j=0;j<fHits->GetEntriesFast();j++){
if ( ((AliTPChit*)fHits->At(j))->fSector==id) return kTRUE;
}
-//_____________________________________________________________________________
-void AliTPC::LoadPoints2(Int_t)
-{
- //
- // Store x, y, z of all hits in memory
- //
- // if (fTrackHits == 0 && fTrackHitsOld==0) return;
- if (fTrackHits == 0 ) return;
- //
- Int_t nhits =0;
- if (fHitType&4) nhits = fTrackHits->GetEntriesFast();
- // if (fHitType&2) nhits = fTrackHitsOld->GetEntriesFast();
-
- if (nhits == 0) return;
- Int_t tracks = gAlice->GetMCApp()->GetNtrack();
- if (fPoints == 0) fPoints = new TObjArray(tracks);
- AliHit *ahit;
- //
- Int_t *ntrk=new Int_t[tracks];
- Int_t *limi=new Int_t[tracks];
- Float_t **coor=new Float_t*[tracks];
- for(Int_t i=0;i<tracks;i++) {
- ntrk[i]=0;
- coor[i]=0;
- limi[i]=0;
- }
- //
- AliPoints *points = 0;
- Float_t *fp=0;
- Int_t trk;
- Int_t chunk=nhits/4+1;
- //
- // Loop over all the hits and store their position
- //
- ahit = FirstHit2(-1);
- while (ahit){
- trk=ahit->GetTrack();
- if(ntrk[trk]==limi[trk]) {
- //
- // Initialise a new track
- fp=new Float_t[3*(limi[trk]+chunk)];
- if(coor[trk]) {
- memcpy(fp,coor[trk],sizeof(Float_t)*3*limi[trk]);
- delete [] coor[trk];
- }
- limi[trk]+=chunk;
- coor[trk] = fp;
- } else {
- fp = coor[trk];
- }
- fp[3*ntrk[trk] ] = ahit->X();
- fp[3*ntrk[trk]+1] = ahit->Y();
- fp[3*ntrk[trk]+2] = ahit->Z();
- ntrk[trk]++;
- ahit = NextHit2();
- }
-
-
-
- //
- for(trk=0; trk<tracks; ++trk) {
- if(ntrk[trk]) {
- points = new AliPoints();
- points->SetMarkerColor(kYellow); //PH kYellow it the default in TPC
- points->SetMarkerSize(1);//PH Default size=1
- points->SetDetector(this);
- points->SetParticle(trk);
- points->SetPolyMarker(ntrk[trk],coor[trk],1); // Default style=1
- fPoints->AddAt(points,trk);
- delete [] coor[trk];
- coor[trk]=0;
- }
- }
- delete [] coor;
- delete [] ntrk;
- delete [] limi;
-}
-
-
-//_____________________________________________________________________________
-void AliTPC::LoadPoints3(Int_t)
-{
- //
- // Store x, y, z of all hits in memory
- // - only intersection point with pad row
- if (fTrackHits == 0) return;
- //
- Int_t nhits = fTrackHits->GetEntriesFast();
- if (nhits == 0) return;
- Int_t tracks = gAlice->GetMCApp()->GetNtrack();
- if (fPoints == 0) fPoints = new TObjArray(2*tracks);
- fPoints->Expand(2*tracks);
- AliHit *ahit;
- //
- Int_t *ntrk=new Int_t[tracks];
- Int_t *limi=new Int_t[tracks];
- Float_t **coor=new Float_t*[tracks];
- for(Int_t i=0;i<tracks;i++) {
- ntrk[i]=0;
- coor[i]=0;
- limi[i]=0;
- }
- //
- AliPoints *points = 0;
- Float_t *fp=0;
- Int_t trk;
- Int_t chunk=nhits/4+1;
- //
- // Loop over all the hits and store their position
- //
- ahit = FirstHit2(-1);
-
- Int_t lastrow = -1;
- while (ahit){
- trk=ahit->GetTrack();
- Float_t x[3]={ahit->X(),ahit->Y(),ahit->Z()};
- Int_t index[3]={1,((AliTPChit*)ahit)->fSector,0};
- Int_t currentrow = fTPCParam->GetPadRow(x,index) ;
- if (currentrow!=lastrow){
- lastrow = currentrow;
- //later calculate intersection point
- if(ntrk[trk]==limi[trk]) {
- //
- // Initialise a new track
- fp=new Float_t[3*(limi[trk]+chunk)];
- if(coor[trk]) {
- memcpy(fp,coor[trk],sizeof(Float_t)*3*limi[trk]);
- delete [] coor[trk];
- }
- limi[trk]+=chunk;
- coor[trk] = fp;
- } else {
- fp = coor[trk];
- }
- fp[3*ntrk[trk] ] = ahit->X();
- fp[3*ntrk[trk]+1] = ahit->Y();
- fp[3*ntrk[trk]+2] = ahit->Z();
- ntrk[trk]++;
- }
- ahit = NextHit2();
- }
-
- //
- for(trk=0; trk<tracks; ++trk) {
- if(ntrk[trk]) {
- points = new AliPoints();
- points->SetMarkerColor(kMagenta); //PH kYellow + 1 is kMagenta
- points->SetMarkerStyle(5);
- points->SetMarkerSize(0.2);
- points->SetDetector(this);
- points->SetParticle(trk);
- points->SetPolyMarker(ntrk[trk],coor[trk],30);
- fPoints->AddAt(points,tracks+trk);
- delete [] coor[trk];
- coor[trk]=0;
- }
- }
- delete [] coor;
- delete [] ntrk;
- delete [] limi;
-}
-
-
AliLoader* AliTPC::MakeLoader(const char* topfoldername)
{
AliDebugClass(1,Form("TPC parameters %s found.",paramName));
} else {
AliWarningClass("TPC parameters not found. Create new (they may be incorrect)");
- paramTPC = new AliTPCParamSR;
+ //paramTPC = new AliTPCParamSR;
+ paramTPC = AliTPCcalibDB::Instance()->GetParameters();
+ if (!paramTPC->IsGeoRead()){
+ //
+ // read transformation matrices for gGeoManager
+ //
+ paramTPC->ReadGeoMatrices();
+ }
+
}
return paramTPC;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff