Coding conventions (M.Ivanov)

diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx
index f9967da1f319cc38b6afa52be8f31a700fe741e2..534e824574df3b4f1755462b26b84f9f1f539ce2 100644 (file)
--- a/ITS/AliITStrackerMI.cxx
+++ b/ITS/AliITStrackerMI.cxx
@@ -18,25 +18,21 @@
 //    It reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks
 //                   and fills with them the ESD
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
 //    It reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks
 //                   and fills with them the ESD
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch

+//                  Marian Ivanov, CERN, Marian.Ivanov@cern.ch 

 //     dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
 //     dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch

+//     

 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------

-
-#include <new>
-
-#include <TFile.h>
+#include "AliITSrecoV2.h"

 #include <TTree.h>
 #include <TTree.h>

-#include <TRandom.h>
-

 #include "AliITSgeom.h"
 #include "AliITSgeom.h"

-#include "AliITSRecPoint.h"

 #include "AliTPCtrack.h"
 #include "AliESD.h"
 #include "AliITSclusterV2.h"
 #include "AliTPCtrack.h"
 #include "AliESD.h"
 #include "AliITSclusterV2.h"

-//#include "AliITStrackerV2.h"

 #include "AliITStrackerMI.h"
 #include "TMatrixD.h"
 #include "AliHelix.h"
 #include "AliITStrackerMI.h"
 #include "TMatrixD.h"
 #include "AliHelix.h"

-#include "AliV0vertex.h"
+
+

 
 ClassImp(AliITStrackerMI)
 ClassImp(AliITSRecV0Info)
 
 ClassImp(AliITStrackerMI)
 ClassImp(AliITSRecV0Info)


@@ -2837,7 +2833,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackV2* track, const AliITSc
 
 }
 
 
 }
 

-Int_t    AliITStrackerMI::UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index)
+Int_t    AliITStrackerMI::UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index) const 

 {
   //
   //
 {
   //
   //


@@ -3101,7 +3097,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz)
 }
 
 
 }
 
 

-void AliITStrackerMI::UpdateESDtrack(AliITStrackV2* track, ULong_t flags)
+void AliITStrackerMI::UpdateESDtrack(AliITStrackV2* track, ULong_t flags) const

 {
   //
   //
 {
   //
   //


@@ -3221,6 +3217,9 @@ Double_t  AliITStrackerMI::FindBestPair(Int_t esdtrack0, Int_t esdtrack1,AliITSR
 
 void  AliITSRecV0Info::Update(Float_t vertex[3], Float_t mass1, Float_t mass2)
 {
 
 void  AliITSRecV0Info::Update(Float_t vertex[3], Float_t mass1, Float_t mass2)
 {

+  //
+  //Update V0 information
+  //

   Float_t v[3] = {fXr[0]-vertex[0],fXr[1]-vertex[1],fXr[2]-vertex[2]};
   Float_t p[3] = {fPdr[0]+fPm[0], fPdr[1]+fPm[1],fPdr[2]+fPm[2]};
 
   Float_t v[3] = {fXr[0]-vertex[0],fXr[1]-vertex[1],fXr[2]-vertex[2]};
   Float_t p[3] = {fPdr[0]+fPm[0], fPdr[1]+fPm[1],fPdr[2]+fPm[2]};
 

diff --git a/ITS/AliITStrackerMI.h b/ITS/AliITStrackerMI.h
index 43b39b8e51e611bd57ff30585aee7590a7e4b6ae..fc790f714fa990572bf519cc254dbd348ceed86c 100644 (file)
--- a/ITS/AliITStrackerMI.h
+++ b/ITS/AliITStrackerMI.h
@@ -7,12 +7,12 @@
 //                          ITS tracker
 //     reads AliITSclusterMI clusters and creates AliITStrackV2 tracks
 //           Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //                          ITS tracker
 //     reads AliITSclusterMI clusters and creates AliITStrackV2 tracks
 //           Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 

+//                   Marian Ivanov, CERN, Marian.Ivanov@cern.ch

 //-------------------------------------------------------------------------
 
 #include <TObjArray.h>
 
 #include "AliTracker.h"
 //-------------------------------------------------------------------------
 
 #include <TObjArray.h>
 
 #include "AliTracker.h"

-#include "AliITSrecoV2.h"

 #include "AliITStrackV2.h"
 #include "AliITSclusterV2.h"
 
 #include "AliITStrackV2.h"
 #include "AliITSclusterV2.h"
 


@@ -26,7 +26,8 @@ class AliV0vertex;
 
 
 class AliITSRecV0Info: public TObject {
 
 
 class AliITSRecV0Info: public TObject {

-public:
+  friend class AliITStrackerMI;
+protected:

   void Update(Float_t vertex[3], Float_t mass1, Float_t mass2);
   Double_t       fDist1;    //info about closest distance according closest MC - linear DCA
   Double_t       fDist2;    //info about closest distance parabolic DCA
   void Update(Float_t vertex[3], Float_t mass1, Float_t mass2);
   Double_t       fDist1;    //info about closest distance according closest MC - linear DCA
   Double_t       fDist2;    //info about closest distance parabolic DCA


@@ -74,7 +75,7 @@ public:
   void GetNTeor(Int_t layer, const AliITSclusterV2* cl, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz);
   Int_t  GetError(Int_t layer, const AliITSclusterV2*cl, Float_t theta, Float_t phi, Float_t expQ, Float_t &erry, Float_t &errz);
   Double_t GetPredictedChi2MI(AliITStrackV2* track, const AliITSclusterV2 *cluster,Int_t layer);
   void GetNTeor(Int_t layer, const AliITSclusterV2* cl, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz);
   Int_t  GetError(Int_t layer, const AliITSclusterV2*cl, Float_t theta, Float_t phi, Float_t expQ, Float_t &erry, Float_t &errz);
   Double_t GetPredictedChi2MI(AliITStrackV2* track, const AliITSclusterV2 *cluster,Int_t layer);

-  Int_t UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t layer);
+  Int_t UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t layer) const;

   class AliITSdetector { 
   public:
     AliITSdetector(){}
   class AliITSdetector { 
   public:
     AliITSdetector(){}


@@ -119,7 +120,7 @@ public:
     Double_t GetR() const {return fR;}
     Int_t FindClusterIndex(Float_t z) const;
     AliITSclusterV2 *GetCluster(Int_t i) const {return i<fN? fClusters[i]:0;} 
     Double_t GetR() const {return fR;}
     Int_t FindClusterIndex(Float_t z) const;
     AliITSclusterV2 *GetCluster(Int_t i) const {return i<fN? fClusters[i]:0;} 

-    Float_t         *GetWeight(Int_t i) {return i<fN ?&fClusterWeight[i]:0;}
+    Float_t         *GetWeight(Int_t i)   {return i<fN ?&fClusterWeight[i]:0;}

     AliITSdetector &GetDetector(Int_t n) const { return fDetectors[n]; }
     Int_t FindDetectorIndex(Double_t phi, Double_t z) const;
     Double_t GetThickness(Double_t y, Double_t z, Double_t &x0) const;
     AliITSdetector &GetDetector(Int_t n) const { return fDetectors[n]; }
     Int_t FindDetectorIndex(Double_t phi, Double_t z) const;
     Double_t GetThickness(Double_t y, Double_t z, Double_t &x0) const;


@@ -132,6 +133,7 @@ public:
     void IncAccepted(){fAccepted++;}
     Int_t GetAccepted() const {return fAccepted;}
   protected:
     void IncAccepted(){fAccepted++;}
     Int_t GetAccepted() const {return fAccepted;}
   protected:

+    AliITSlayer(const AliITSlayer& layer){;}

     Double_t fR;                // mean radius of this layer
     Double_t fPhiOffset;        // offset of the first detector in Phi
     Int_t fNladders;            // number of ladders
     Double_t fR;                // mean radius of this layer
     Double_t fPhiOffset;        // offset of the first detector in Phi
     Int_t fNladders;            // number of ladders


@@ -158,16 +160,16 @@ public:
     Float_t fY10[11][kMaxClusterPerLayer10];                // y position of the clusters  slice in y    
     Float_t fZ10[11][kMaxClusterPerLayer10];                // z position of the clusters  slice in y 
     Int_t fN10[11];                                       // number of cluster in slice
     Float_t fY10[11][kMaxClusterPerLayer10];                // y position of the clusters  slice in y    
     Float_t fZ10[11][kMaxClusterPerLayer10];                // z position of the clusters  slice in y 
     Int_t fN10[11];                                       // number of cluster in slice

-    Float_t fDy10;
-    Float_t fBy10[11][2];                  
+    Float_t fDy10;                                        // delta y
+    Float_t fBy10[11][2];                                 // slice borders

     //
     AliITSclusterV2 *fClusters20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y
     Int_t        fClusterIndex20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y    
     Float_t fY20[21][kMaxClusterPerLayer20];                // y position of the clusters  slice in y    
     Float_t fZ20[21][kMaxClusterPerLayer20];                // z position of the clusters  slice in y 
     Int_t fN20[21];                                       // number of cluster in slice
     //
     AliITSclusterV2 *fClusters20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y
     Int_t        fClusterIndex20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y    
     Float_t fY20[21][kMaxClusterPerLayer20];                // y position of the clusters  slice in y    
     Float_t fZ20[21][kMaxClusterPerLayer20];                // z position of the clusters  slice in y 
     Int_t fN20[21];                                       // number of cluster in slice

-    Float_t fDy20;
-    Float_t fBy20[21][2];
+    Float_t fDy20;                                        //delta y 
+    Float_t fBy20[21][2];                                 //slice borders

     //
     AliITSclusterV2** fClustersCs;                         //clusters table in current slice
     Int_t   *fClusterIndexCs;                             //cluster index in current slice 
     //
     AliITSclusterV2** fClustersCs;                         //clusters table in current slice
     Int_t   *fClusterIndexCs;                             //cluster index in current slice 


@@ -184,7 +186,7 @@ public:
     Int_t fI;            // index of the current cluster within the "window"
     Int_t fImax;            // index of the last cluster within the "window"    
     Int_t fSkip;     // indicates possibility to skip cluster
     Int_t fI;            // index of the current cluster within the "window"
     Int_t fImax;            // index of the last cluster within the "window"    
     Int_t fSkip;     // indicates possibility to skip cluster

-    Int_t fAccepted;
+    Int_t fAccepted;     // accept indicator 

     Double_t fRoad;      // road defined by the cluster density
   };
   AliITStrackerMI::AliITSlayer    & GetLayer(Int_t layer) const;
     Double_t fRoad;      // road defined by the cluster density
   };
   AliITStrackerMI::AliITSlayer    & GetLayer(Int_t layer) const;


@@ -230,7 +232,7 @@ protected:
   Float_t  * GetNz(Int_t trackindex) const {return &fCoeficients[trackindex*48+36];}
   void       SignDeltas( TObjArray *ClusterArray, Float_t zv);
   void MakeCoeficients(Int_t ntracks);
   Float_t  * GetNz(Int_t trackindex) const {return &fCoeficients[trackindex*48+36];}
   void       SignDeltas( TObjArray *ClusterArray, Float_t zv);
   void MakeCoeficients(Int_t ntracks);

-  void UpdateESDtrack(AliITStrackV2* track, ULong_t flags);
+  void UpdateESDtrack(AliITStrackV2* track, ULong_t flags) const;

   Int_t fI;                              // index of the current layer
   static AliITSlayer fgLayers[kMaxLayer];// ITS layers
   AliITStrackV2 fTracks[kMaxLayer];      // track estimations at the ITS layers
   Int_t fI;                              // index of the current layer
   static AliITSlayer fgLayers[kMaxLayer];// ITS layers
   AliITStrackV2 fTracks[kMaxLayer];      // track estimations at the ITS layers


@@ -245,6 +247,8 @@ protected:
   Int_t fLayersNotToSkip[kMaxLayer];     // layer masks
   Int_t fLastLayerToTrackTo;             // the innermost layer to track to
   Float_t * fCoeficients;                //! working array with errors and mean cluser shape
   Int_t fLayersNotToSkip[kMaxLayer];     // layer masks
   Int_t fLastLayerToTrackTo;             // the innermost layer to track to
   Float_t * fCoeficients;                //! working array with errors and mean cluser shape

+ private:
+  AliITStrackerMI(const AliITStrackerMI * tracker){;}

   ClassDef(AliITStrackerMI,1)   //ITS tracker V2
 };
 
   ClassDef(AliITStrackerMI,1)   //ITS tracker V2
 };
 

diff --git a/TPC/AliTPCTrackHitsV2.cxx b/TPC/AliTPCTrackHitsV2.cxx
index 0e4523b68467d5f190b68a86d7985f0f1aa18c1a..ac814bc42aa35c393bff8c8dad88cbd773ace6ea 100644 (file)
--- a/TPC/AliTPCTrackHitsV2.cxx
+++ b/TPC/AliTPCTrackHitsV2.cxx
@@ -53,15 +53,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 

-#include <stdlib.h>
-//#include "TVector3.h"

 #include "AliTPCTrackHitsV2.h"
 #include "AliTPCTrackHitsV2.h"

-

 #include "TClonesArray.h"    
 #include "AliTPC.h"
 
 #include "TClonesArray.h"    
 #include "AliTPC.h"
 

-#include <Riostream.h>
-

 
 
 ClassImp(AliTPCTrackHitsV2) 
 
 
 ClassImp(AliTPCTrackHitsV2) 


@@ -81,6 +76,8 @@ const Double_t AliTPCTrackHitsV2::fgkPrecision2=1e-20;  //precision
 
 
 struct  AliTPCTempHitInfoV2 {
 
 
 struct  AliTPCTempHitInfoV2 {

+  friend class AliTPCTrackHitsV2;
+protected:

   enum    { kStackSize = 10000};
   AliTPCTempHitInfoV2();   
   AliTPCTempHitInfoV2(const AliTPCTempHitInfoV2 &hit)
   enum    { kStackSize = 10000};
   AliTPCTempHitInfoV2();   
   AliTPCTempHitInfoV2(const AliTPCTempHitInfoV2 &hit)