Include stdlib.h needed on HP

[u/mrichter/AliRoot.git] / ITS / AliITSclusterTable.cxx

diff --git a/ITS/AliITSclusterTable.cxx b/ITS/AliITSclusterTable.cxx
index 25435c43d9282ceae6d5e190dfd4dc2ff8da3a68..c2bc0eafe6dcf1afe683dcc0d60156053018d59b 100644 (file)
--- a/ITS/AliITSclusterTable.cxx
+++ b/ITS/AliITSclusterTable.cxx
@@ -30,6 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////////
 
 

+#include <stdlib.h>

 #include "AliITSclusterTable.h"
 #include "AliITSclusterV2.h"
 #include "AliITSgeom.h"
 #include "AliITSclusterTable.h"
 #include "AliITSclusterV2.h"
 #include "AliITSgeom.h"


@@ -38,7 +39,6 @@
 #include<TClonesArray.h>
 #include<TTree.h>
 ClassImp(AliITSclusterTable)
 #include<TClonesArray.h>
 #include<TTree.h>
 ClassImp(AliITSclusterTable)

-

 //__________________________________________________________
 AliITSclusterTable::AliITSclusterTable(){
 // Default constructor
 //__________________________________________________________
 AliITSclusterTable::AliITSclusterTable(){
 // Default constructor


@@ -51,6 +51,10 @@ AliITSclusterTable::AliITSclusterTable(){
   fLambdaList = 0;
   fXList = 0;
   fYList =0;
   fLambdaList = 0;
   fXList = 0;
   fYList =0;

+  fZList =0;
+  fSxList = 0;
+  fSyList =0;
+  fSzList =0;

   for(Int_t i=0;i<3;i++){fPrimaryVertex[i]=0;}
 }
 
   for(Int_t i=0;i<3;i++){fPrimaryVertex[i]=0;}
 }
 


@@ -69,8 +73,11 @@ AliITSclusterTable::AliITSclusterTable(AliITSgeom* geom, AliITStrackerSA* tracke
   fLambdaList = 0;
   fXList = 0;
   fYList = 0;
   fLambdaList = 0;
   fXList = 0;
   fYList = 0;

+  fZList =0;
+  fSxList = 0;
+  fSyList =0;
+  fSzList =0;

 }
 }

-

 //______________________________________________________________________
 AliITSclusterTable::AliITSclusterTable(const AliITSclusterTable &tab) : 
                     TObject(tab) {
 //______________________________________________________________________
 AliITSclusterTable::AliITSclusterTable(const AliITSclusterTable &tab) : 
                     TObject(tab) {


@@ -96,28 +103,39 @@ AliITSclusterTable::~AliITSclusterTable(){
     for (Int_t i=0; i<nm; i++){
       delete fDet[i];
     }
     for (Int_t i=0; i<nm; i++){
       delete fDet[i];
     }

-    delete fDet;
+    delete[] fDet;

   }
   }

-  if (fLbl)delete [] fLbl;
+  if (fLbl)delete [] fLbl; // memory leak!

   if (fNCl)delete [] fNCl;
   if (fNCl)delete [] fNCl;

-  if (fPhiList)delete [] fPhiList;
-  if (fLambdaList) delete [] fLambdaList;
-  if (fXList) delete [] fXList;
-  if (fYList) delete [] fYList;
+  for (Int_t i = 0; i < fGeom->GetNlayers(); i++) {
+    if (fPhiList) delete fPhiList[i];
+    if (fLambdaList) delete fLambdaList[i];
+    if (fXList) delete fXList[i];
+    if (fYList) delete fYList[i];
+    if (fZList) delete fZList[i];
+    if (fSxList) delete fSxList[i];
+    if (fSyList) delete fSyList[i];
+    if (fSzList) delete fSzList[i];
+  }
+  if (fPhiList) delete[] fPhiList;
+  if (fLambdaList) delete[] fLambdaList;
+  if (fXList) delete[] fXList;
+  if (fYList) delete[] fYList;
+  if (fZList) delete[] fZList;
+  if (fSxList) delete[] fSxList;
+  if (fSyList) delete[] fSyList;
+  if (fSzList) delete[] fSzList;

 }
 
 //__________________________________________________________
 
 }
 
 //__________________________________________________________
 

-void AliITSclusterTable::FillArray(TTree* clusterTree,Int_t evnumber){
+void AliITSclusterTable::FillArray(TTree* clusterTree){

   
   //
   Int_t nm = fGeom->GetIndexMax();
   fDet = new TArrayI*[nm];
   
   //
   Int_t nm = fGeom->GetIndexMax();
   fDet = new TArrayI*[nm];

-  fTracker->SetEventNumber(evnumber);
-  fTracker->LoadClusters(clusterTree);

 
   TArrayI** vect = new TArrayI*[fGeom->GetNlayers()];
 
   TArrayI** vect = new TArrayI*[fGeom->GetNlayers()];

-  

   Int_t * firstmod = new Int_t[fGeom->GetNlayers()+1];
   firstmod[fGeom->GetNlayers()]=fGeom->GetIndexMax();  // upper limit
   for(Int_t nlayer=0;nlayer<fGeom->GetNlayers();nlayer++){
   Int_t * firstmod = new Int_t[fGeom->GetNlayers()+1];
   firstmod[fGeom->GetNlayers()]=fGeom->GetIndexMax();  // upper limit
   for(Int_t nlayer=0;nlayer<fGeom->GetNlayers();nlayer++){


@@ -135,7 +153,6 @@ void AliITSclusterTable::FillArray(TTree* clusterTree,Int_t evnumber){
   TClonesArray* clus = new TClonesArray("AliITSclusterV2",10000);
   brancht->SetAddress(&clus);
  
   TClonesArray* clus = new TClonesArray("AliITSclusterV2",10000);
   brancht->SetAddress(&clus);
  

-  

   for(Int_t mod=0;mod<nm;mod++){
     Int_t nc=0;
     clusterTree->GetEvent(mod);
   for(Int_t mod=0;mod<nm;mod++){
     Int_t nc=0;
     clusterTree->GetEvent(mod);


@@ -145,32 +162,29 @@ void AliITSclusterTable::FillArray(TTree* clusterTree,Int_t evnumber){
     Int_t nlr = FindIndex(fGeom->GetNlayers(),firstmod,mod);
     if(nlr<0){
       Fatal("FillArray","Wrong module number %d . Limits: %d , %d",mod,firstmod[0],firstmod[fGeom->GetNlayers()+1]);
     Int_t nlr = FindIndex(fGeom->GetNlayers(),firstmod,mod);
     if(nlr<0){
       Fatal("FillArray","Wrong module number %d . Limits: %d , %d",mod,firstmod[0],firstmod[fGeom->GetNlayers()+1]);

-      return;
+      exit(1);

     }
     else {
       for(Int_t n=0;n<vect[nlr]->GetSize();n++){
        Int_t mm=vect[nlr]->At(n);
     }
     else {
       for(Int_t n=0;n<vect[nlr]->GetSize();n++){
        Int_t mm=vect[nlr]->At(n);

-       if(mm==mod) {fDet[mod]->AddAt(n,nc); nc+=1; }
+       if(nc>=fDet[mod]->GetSize()) fDet[mod]->Set(nc*2+10);
+       if(mm==mod) {(*fDet[mod])[nc]=n; nc+=1; }

       }
     }
   }
 
       }
     }
   }
 

-
-  fTracker->UnloadClusters();
-
+  clus->Delete();
+  delete clus;

   for(Int_t n=0;n<fGeom->GetNlayers();n++)delete vect[n];
   for(Int_t n=0;n<fGeom->GetNlayers();n++)delete vect[n];

-  delete vect;
+  delete [] vect;

   delete [] firstmod;
 }
 
 //_________________________________________________________________
   delete [] firstmod;
 }
 
 //_________________________________________________________________

-void AliITSclusterTable::FillArrayLabel(Int_t numberofparticles,TTree* clusterTree,Int_t evnumber){
+void AliITSclusterTable::FillArrayLabel(Int_t numberofparticles){

   //
 
   //
 

-

   fLbl = new TArrayI*[numberofparticles];
   fLbl = new TArrayI*[numberofparticles];

-  fTracker->SetEventNumber(evnumber);
-  fTracker->LoadClusters(clusterTree);

   const Int_t knm =fGeom->GetNlayers();
   for(Int_t nlab=0;nlab<numberofparticles;nlab++){
     fLbl[nlab] = new TArrayI(knm);
   const Int_t knm =fGeom->GetNlayers();
   for(Int_t nlab=0;nlab<numberofparticles;nlab++){
     fLbl[nlab] = new TArrayI(knm);


@@ -192,7 +206,6 @@ void AliITSclusterTable::FillArrayLabel(Int_t numberofparticles,TTree* clusterTr
     delete [] nn;
   }
 
     delete [] nn;
   }
 

-  fTracker->UnloadClusters();

 }
 
 //_______________________________________________________________
 }
 
 //_______________________________________________________________


@@ -226,21 +239,18 @@ Int_t AliITSclusterTable::FindIndex(Int_t ndim, Int_t *ptr, Int_t value){
   return retval;
 }
 
   return retval;
 }
 

-void AliITSclusterTable::FillArrayCoorAngles(TTree* clusterTree,Int_t evnumber){
+void AliITSclusterTable::FillArrayCoorAngles(){

   //Fill arrays with phi,lambda and indices of clusters for each layer
   //Fill arrays with phi,lambda and indices of clusters for each layer

-  Info("FillArrayCoorAngles","Filling Array...");
-
+ 

   fPhiList = new TArrayD*[fGeom->GetNlayers()];
   fLambdaList = new TArrayD*[fGeom->GetNlayers()];
   fPhiList = new TArrayD*[fGeom->GetNlayers()];
   fLambdaList = new TArrayD*[fGeom->GetNlayers()];

-  fXList = new TArrayD*[fGeom->GetNlayers()];
-  fYList = new TArrayD*[fGeom->GetNlayers()];
-  fZList = new TArrayD*[fGeom->GetNlayers()];
-  fSxList = new TArrayD*[fGeom->GetNlayers()];
-  fSyList = new TArrayD*[fGeom->GetNlayers()];
-  fSzList = new TArrayD*[fGeom->GetNlayers()];
+  fXList = new TArrayF*[fGeom->GetNlayers()];
+  fYList = new TArrayF*[fGeom->GetNlayers()];
+  fZList = new TArrayF*[fGeom->GetNlayers()];
+  fSxList = new TArrayF*[fGeom->GetNlayers()];
+  fSyList = new TArrayF*[fGeom->GetNlayers()];
+  fSzList = new TArrayF*[fGeom->GetNlayers()];

 
 

-  fTracker->SetEventNumber(evnumber);
-  fTracker->LoadClusters(clusterTree);

   Int_t * firstmod = new Int_t[fGeom->GetNlayers()+1];
   firstmod[fGeom->GetNlayers()]=fGeom->GetIndexMax();  // upper limit
 
   Int_t * firstmod = new Int_t[fGeom->GetNlayers()+1];
   firstmod[fGeom->GetNlayers()]=fGeom->GetIndexMax();  // upper limit
 


@@ -249,18 +259,18 @@ void AliITSclusterTable::FillArrayCoorAngles(TTree* clusterTree,Int_t evnumber){
     Int_t ncl = fTracker->GetNumberOfClustersLayer(nlay);
     fPhiList[nlay] = new TArrayD(ncl);
     fLambdaList[nlay]=new TArrayD(ncl);
     Int_t ncl = fTracker->GetNumberOfClustersLayer(nlay);
     fPhiList[nlay] = new TArrayD(ncl);
     fLambdaList[nlay]=new TArrayD(ncl);

-    fXList[nlay]=new TArrayD(ncl);
-    fYList[nlay]=new TArrayD(ncl);
-    fZList[nlay]=new TArrayD(ncl);
-    fSxList[nlay]=new TArrayD(ncl);
-    fSyList[nlay]=new TArrayD(ncl);
-    fSzList[nlay]=new TArrayD(ncl);
+    fXList[nlay]=new TArrayF(ncl);
+    fYList[nlay]=new TArrayF(ncl);
+    fZList[nlay]=new TArrayF(ncl);
+    fSxList[nlay]=new TArrayF(ncl);
+    fSyList[nlay]=new TArrayF(ncl);
+    fSzList[nlay]=new TArrayF(ncl);

 
     for(Int_t j=0;j<ncl;j++){
       AliITSclusterV2* cl = fTracker->GetClusterLayer(nlay,j);
       Double_t phi=0;Double_t lambda=0;
 
     for(Int_t j=0;j<ncl;j++){
       AliITSclusterV2* cl = fTracker->GetClusterLayer(nlay,j);
       Double_t phi=0;Double_t lambda=0;

-      Double_t x=0;Double_t y=0;Double_t z=0;
-      Double_t sx=0;Double_t sy=0;Double_t sz=0;
+      Float_t x=0;Float_t y=0;Float_t z=0;
+      Float_t sx=0;Float_t sy=0;Float_t sz=0;

       Int_t module = cl->GetDetectorIndex()+firstmod[nlay];
       GetCoorAngles(cl,module,phi,lambda,x,y,z);
       GetCoorErrors(cl,module,sx,sy,sz);
       Int_t module = cl->GetDetectorIndex()+firstmod[nlay];
       GetCoorAngles(cl,module,phi,lambda,x,y,z);
       GetCoorErrors(cl,module,sx,sy,sz);


@@ -277,11 +287,9 @@ void AliITSclusterTable::FillArrayCoorAngles(TTree* clusterTree,Int_t evnumber){
     
   }
   
     
   }
   

-  fTracker->UnloadClusters();

   delete [] firstmod;
 }
   delete [] firstmod;
 }

-
-void AliITSclusterTable::GetCoorAngles(AliITSclusterV2* cl,Int_t module,Double_t &phi,Double_t &lambda, Double_t &x, Double_t &y,Double_t &z){
+void AliITSclusterTable::GetCoorAngles(AliITSclusterV2* cl,Int_t module,Double_t &phi,Double_t &lambda, Float_t &x, Float_t &y,Float_t &z){

   //Returns values of phi (azimuthal) and lambda angles for a given cluster
   
   Double_t rot[9];     fGeom->GetRotMatrix(module,rot);
   //Returns values of phi (azimuthal) and lambda angles for a given cluster
   
   Double_t rot[9];     fGeom->GetRotMatrix(module,rot);


@@ -292,8 +300,8 @@ void AliITSclusterTable::GetCoorAngles(AliITSclusterV2* cl,Int_t module,Double_t
   Double_t phi1=TMath::Pi()/2+alpha;
   if (lay==1) phi1+=TMath::Pi();
 
   Double_t phi1=TMath::Pi()/2+alpha;
   if (lay==1) phi1+=TMath::Pi();
 

-  Double_t cp=TMath::Cos(phi1), sp=TMath::Sin(phi1);
-  Double_t r=tx*cp+ty*sp;
+  Float_t cp=TMath::Cos(phi1), sp=TMath::Sin(phi1);
+  Float_t r=tx*cp+ty*sp;

 
   x= r*cp - cl->GetY()*sp;
   y= r*sp + cl->GetY()*cp;
 
   x= r*cp - cl->GetY()*sp;
   y= r*sp + cl->GetY()*cp;


@@ -303,7 +311,7 @@ void AliITSclusterTable::GetCoorAngles(AliITSclusterV2* cl,Int_t module,Double_t
   lambda=TMath::ATan2(z-fPrimaryVertex[2],TMath::Sqrt((x-fPrimaryVertex[0])*(x-fPrimaryVertex[0])+(y-fPrimaryVertex[1])*(y-fPrimaryVertex[1])));
 }
 
   lambda=TMath::ATan2(z-fPrimaryVertex[2],TMath::Sqrt((x-fPrimaryVertex[0])*(x-fPrimaryVertex[0])+(y-fPrimaryVertex[1])*(y-fPrimaryVertex[1])));
 }
 

-void AliITSclusterTable::GetCoorErrors(AliITSclusterV2* cl, Int_t module,Double_t &sx,Double_t &sy, Double_t &sz){
+void AliITSclusterTable::GetCoorErrors(AliITSclusterV2* cl, Int_t module,Float_t &sx,Float_t &sy, Float_t &sz){

 
   //returns x,y,z of cluster in global coordinates
 
 
   //returns x,y,z of cluster in global coordinates
 


@@ -314,9 +322,8 @@ void AliITSclusterTable::GetCoorErrors(AliITSclusterV2* cl, Int_t module,Double_
   Double_t phi=TMath::Pi()/2+alpha;
   if (lay==1) phi+=TMath::Pi();
 
   Double_t phi=TMath::Pi()/2+alpha;
   if (lay==1) phi+=TMath::Pi();
 

-  Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
+  Float_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);

 
 

- 

   sx = TMath::Sqrt(sp*sp*cl->GetSigmaY2());
   sy = TMath::Sqrt(cp*cp*cl->GetSigmaY2());
   sz = TMath::Sqrt(cl->GetSigmaZ2());
   sx = TMath::Sqrt(sp*sp*cl->GetSigmaY2());
   sy = TMath::Sqrt(cp*cp*cl->GetSigmaY2());
   sz = TMath::Sqrt(cl->GetSigmaZ2());