Coding Conventions & Cleanup

diff --git a/CONTAINERS/AliArrayBranch.cxx b/CONTAINERS/AliArrayBranch.cxx
index 1e238c3852df8a6da8d629c5b28d9ba51d5bf2d7..e37dcf58e7a8d0c0d80d66407c643201bbb359dd 100644 (file)
--- a/CONTAINERS/AliArrayBranch.cxx
+++ b/CONTAINERS/AliArrayBranch.cxx
@@ -15,6 +15,12 @@
 
 /* $Id$ */
 
+//-----------------------------------------------------
+// A Branch for the case of an array of clone objects. 
+//-----------------------------------------------------
+// Author M.Ivanov
+//*KEND.
+
 #include "TROOT.h"
 #include "AliArrayBranch.h"
 #include "TFile.h"
@@ -39,11 +45,6 @@
 #include "AliObjectArray.h"
 #include "AliDataType.h"
 
-//-----------------------------------------------------
-// A Branch for the case of an array of clone objects. 
-//-----------------------------------------------------
-
-//*KEND.
 
 R__EXTERN TTree *gTree;
 
@@ -657,6 +658,9 @@ void AliArrayBranch::Streamer(TBuffer &b)
 
 void AliArrayBranch::Import(TLeaf * leaf, Int_t n)
 {
+  //
+  // Import leaf n from the branch
+  //
 
   const Int_t kIntUndefined = -9999;
   Int_t j = 0;
@@ -996,6 +1000,9 @@ AliTree::AliTree(const char *name,const char *title, Int_t maxvirtualsize):
 TBranch * AliTree::AliBranch(const char *name, void *clonesaddress, Int_t bufsize, Int_t splitlevel,
                             Int_t compres)
 {
+  //
+  // Create an AliBranch and returns a reference to the TBranch
+  //
   if (clonesaddress == 0) return 0;
   char *cpointer =(char*)clonesaddress;
   char **ppointer =(char**)cpointer;
@@ -1016,6 +1023,9 @@ TBranch * AliTree::AliBranch(const char *name, void *clonesaddress, Int_t bufsiz
 TBranch* AliTree::AliBranch(const char *name, const char *classname, void *addobj, 
                     Int_t bufsize, Int_t splitlevel)
 {
+  //
+  // Create an AliBranch and returns a reference to the TBranch
+  //
   gTree = this;
   TClass *cl = gROOT->GetClass(classname);
   if (!cl) {

diff --git a/CONTAINERS/AliArrayBranch.h b/CONTAINERS/AliArrayBranch.h
index eb5214dfcf3d9abcd01728a74f02bd88c2a3b3e5..58f1a353fadd8de4722a3a637f8c3c5494654f7a 100644 (file)
--- a/CONTAINERS/AliArrayBranch.h
+++ b/CONTAINERS/AliArrayBranch.h
@@ -21,9 +21,10 @@ class AliObjectArray;
  
 class AliArraySubBranch : public TBranch {
 public: 
-  AliArraySubBranch(){;}
+  AliArraySubBranch(){}
   AliArraySubBranch(const char* name, void* address, const char* leaflist, Int_t basketsize = 32000, 
-    Int_t compress = -1):TBranch(name, address, leaflist, basketsize, compress){;}
+    Int_t compress = -1):TBranch(name, address, leaflist, basketsize, compress){}
+  virtual ~AliArraySubBranch() {}
   virtual Int_t  GetEntryExport(Long64_t entry, Int_t getall, TClonesArray* list, Int_t n) { return TBranch::GetEntryExport(entry, getall, list, n); }
   virtual Int_t  GetEntryExport(Int_t entry, Int_t getall, AliObjectArray* list, Int_t n);
   virtual void ReadBasketExport(TBuffer &b, TLeaf *leaf, AliObjectArray *list, Int_t n); 
@@ -32,16 +33,6 @@ public:
 
 class AliArrayBranch : public TBranch {
 
-private: 
-  void Import(TLeaf * leaf, Int_t n);  //integer fill leef buffer 
-protected:
-    AliObjectArray     *fList;           //Pointer to the clonesarray
-    Int_t            fRead;            //flag = 1 if clonesarray has been read
-    Int_t            fN;               //Number of elements in ClonesArray
-    Int_t            fNdataMax;        //Maximum value of fN
-    TString          fClassName;       //name of the class of the objets in the ClonesArray
-    TBranch          *fBranchCount;    //Branch with clones count
-
 public:
     AliArrayBranch();
     AliArrayBranch(const Text_t *name, void *clonesaddress, TTree * tree, Int_t basketsize=32000,Int_t compress=-1);
@@ -50,14 +41,26 @@ public:
     virtual void    Browse(TBrowser *b);
     virtual Int_t   Fill();
     virtual Int_t   GetEntry(Long64_t entry=0, Int_t getall = 0);
-    virtual Int_t   GetN() {return fN;}
-    AliObjectArray    *GetList() {return fList;}
-    Bool_t          IsFolder() {return kTRUE;}
+    virtual Int_t   GetN() const {return fN;}
+    AliObjectArray    *GetList() const {return fList;}
     virtual void    Print(Option_t *option="") const;
     virtual void    Reset(Option_t *option="");
     virtual void    SetAddress(void *add);
     virtual void    SetBasketSize(Int_t buffsize);
     virtual Bool_t          IsFolder() const {return kTRUE;}
+
+protected:
+    AliObjectArray     *fList;           //Pointer to the clonesarray
+    Int_t            fRead;            //flag = 1 if clonesarray has been read
+    Int_t            fN;               //Number of elements in ClonesArray
+    Int_t            fNdataMax;        //Maximum value of fN
+    TString          fClassName;       //name of the class of the objets in the ClonesArray
+    TBranch          *fBranchCount;    //Branch with clones count
+
+private: 
+    AliArrayBranch(const AliArrayBranch &);
+    AliArrayBranch & operator=(const AliArrayBranch &);
+    void Import(TLeaf * leaf, Int_t n);  //integer fill leef buffer 
     ClassDef(AliArrayBranch,1)  //Branch in case of an array of clone objects
 };
 

diff --git a/ITS/AliITSspdTestBeam.cxx b/ITS/AliITSspdTestBeam.cxx
index 7d994ea6a1791354e759e4c9efda9f484647b5e9..2e2b76e8a2963653817cd8dab5af36e157968905 100644 (file)
--- a/ITS/AliITSspdTestBeam.cxx
+++ b/ITS/AliITSspdTestBeam.cxx
@@ -25,11 +25,8 @@
 // the class AliITSvSPD002 must be read in, one way or the other, so that
 // the Geometry transoformation class AliITSgeom will prpoerly be inilized.
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <iomanip>
-#include <Riostream.h>
-#include <fstream>
+
+//#include <Riostream.h>
 #include <TArrayI.h>
 
 #include "AliITSspdTestBeam.h"

diff --git a/ITS/AliITSspdTestBeam.h b/ITS/AliITSspdTestBeam.h
index 8ee39298690a6f523b1ead1c7b394d15709ea5d7..9790550e6454d2b1dc564baac2168cca2a88cb73 100644 (file)
--- a/ITS/AliITSspdTestBeam.h
+++ b/ITS/AliITSspdTestBeam.h
@@ -1,26 +1,32 @@
-#include <Rtypes.h>
 #ifndef ALIITSSPDTESTBEAM_H
 #define ALIITSSPDTESTBEAM_H
 
 /* Copyright (c) 1998-2001, ALICE Experiment at CERN, All rights reserved *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
+//
+// Class for the reading of the SPD 
+// Test beam data
+// More information on this class will follow
+// 
+
+#include <Rtypes.h>
 #include <TTask.h>
 
-//class ifstream;
 class AliITS;
 class AliITSspdTestBeamHeader;
 class AliITSspdTestBeamTail;
 class AliITSspdTestBeamBurst;
 class AliITSspdTestBeamData;
 
-class AliITSspdTestBeam : public TTask{
-  public:
+class AliITSspdTestBeam : public TTask
+{
+public:
     AliITSspdTestBeam();
     AliITSspdTestBeam(const Char_t *filename,const Char_t *opt="2002",
                       AliITS *its=0);
-    AliITSspdTestBeam(const AliITSspdTestBeam &s):TTask(s){if(this==&s) return;Error("Copy constructor","You are not allowed to make a copy of AliITSspdTestBeam");exit(1);} //Not to be used!
-    AliITSspdTestBeam& operator=(AliITSspdTestBeam &s){if(this==&s) return *this;Error("operator=","You are not allowed to make a copy of AliITSspdTestBeam");exit(1);return *this;} //Not to be used!
     virtual ~AliITSspdTestBeam();
     //
     virtual Int_t OpenInputFile(const Char_t *filename,Int_t start=0,
@@ -28,7 +34,9 @@ class AliITSspdTestBeam : public TTask{
     virtual Int_t Read(Int_t i=0);
     virtual Int_t Decode();
     virtual Int_t GetNumberOfPilots()const{return 3;}
-  private:
+private:
+    AliITSspdTestBeam(const AliITSspdTestBeam &);
+    AliITSspdTestBeam & operator=(const AliITSspdTestBeam &);
     void SetTerminationWord(){fTermination=0xffffd9f0;}
     //
     AliITSspdTestBeamHeader  *fRH;    //! Run Header
@@ -80,13 +88,11 @@ class AliITSTestBeamData{
 #ifndef ALIITSSPDTESTBEAMHEADER_H
 #define ALIITSSPDTESTBEAMHEADER_H
 
-#include <Riostream.h>
-
-//class ostream;
-
 /* Copyright (c) 1998-2001, ALICE Experiment at CERN, All rights reserved *
  * See cxx source for full Copyright notice                               */
 
+#include <Riostream.h>
+
 class AliITSspdTestBeamHeader : public AliITSTestBeamData{
   public:
     AliITSspdTestBeamHeader(){};
@@ -128,8 +134,6 @@ ostream &operator<<(ostream &os,AliITSspdTestBeamHeader &source);
 
 #include <Riostream.h>
 
-//class ostream;
-
 class AliITSspdTestBeamTail : public AliITSTestBeamData{
   public:
     AliITSspdTestBeamTail(){};
@@ -160,8 +164,6 @@ ostream &operator<<(ostream &os,AliITSspdTestBeamTail &source);
 
 #include <Riostream.h>
 
-//class ostream;
-
 class AliITSspdTestBeamBurst : public AliITSTestBeamData{
   public:
     AliITSspdTestBeamBurst(){};

diff --git a/ITS/AliITStrackSA.cxx b/ITS/AliITStrackSA.cxx
index 19a95f9239d39fdaae6a7db4edced650d450418a..a0512e4422bef46c33b74c5f713154f837ccd0ca 100755 (executable)
--- a/ITS/AliITStrackSA.cxx
+++ b/ITS/AliITStrackSA.cxx
@@ -12,6 +12,9 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+
+/* $Id$ */
+
 ////////////////////////////////////////////////////
 //  Stand alone track class                       //
 //  Origin:  Elisabetta Crescio                   //

diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx
index 647ef97b81248989d0141e4b1923070c5d024857..0ff7333e95d5a1a68950342dba605c7d06f2b0c8 100644 (file)
--- a/ITS/AliITStrackerMI.cxx
+++ b/ITS/AliITStrackerMI.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 //-------------------------------------------------------------------------
 //               Implementation of the ITS tracker class
 //    It reads AliITSclusterV2 clusters and creates AliITStrackMI tracks
@@ -21,19 +23,18 @@
 //     dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
 //     
 //-------------------------------------------------------------------------
-#include "AliITSrecoV2.h"
+
+#include <TMatrixD.h>
 #include <TTree.h>
-#include "AliITSgeom.h"
+#include <TTreeStream.h>
+#include <TTree.h>
+
 #include "AliESD.h"
+#include "AliESDV0MI.h"
+#include "AliHelix.h"
 #include "AliITSclusterV2.h"
+#include "AliITSgeom.h"
 #include "AliITStrackerMI.h"
-#include "TMatrixD.h"
-#include "TFile.h"
-#include "TTree.h"
-#include "AliHelix.h"
-#include "AliESDV0MI.h"
-#include "AliLog.h"
-#include "TTreeStream.h"
 
 ClassImp(AliITStrackerMI)
 
@@ -3177,11 +3178,11 @@ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
   //Get nearest upper layer close to the point xr.
   // rough approximation 
   //
-  const Float_t radiuses[6]={4,6.5,15.03,24.,38.5,43.7};
+  const Float_t kRadiuses[6]={4,6.5,15.03,24.,38.5,43.7};
   Float_t radius = TMath::Sqrt(xr[0]*xr[0]+xr[1]*xr[1]);
   Int_t res =6;
   for (Int_t i=0;i<6;i++){
-    if (radius<radiuses[i]){
+    if (radius<kRadiuses[i]){
       res =i;
       break;
     }
@@ -3770,21 +3771,21 @@ void  AliITStrackerMI::FindV02(AliESD *event)
       Float_t    sigmap0   = 0.0001+0.001/(0.1+pvertex->GetRr()); 
       Float_t    sigmap    = 0.5*sigmap0*(0.6+0.4*p12);           // "resolution: of point angle - as a function of radius and momenta
 
-      Float_t CausalityA  = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
-      Float_t CausalityB  = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))*
+      Float_t causalityA  = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
+      Float_t causalityB  = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))*
                                        TMath::Min(pvertex->GetCausalityP()[3],Float_t(0.7)));
       //
-      Float_t Likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
+      Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
 
-      Float_t Likelihood1 = TMath::Exp(-(1.0001-pvertex->GetPointAngle())/sigmap)+
+      Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetPointAngle())/sigmap)+
        0.4*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/(4.*sigmap))+
        0.4*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/(8.*sigmap))+
        0.1*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/0.01);
       //
-      if (CausalityA<kCausality0Cut)                                          v0OK = kFALSE;
-      if (TMath::Sqrt(Likelihood0*Likelihood1)<kLikelihood01Cut)              v0OK = kFALSE;
-      if (Likelihood1<kLikelihood1Cut)                                        v0OK = kFALSE;
-      if (TMath::Power(Likelihood0*Likelihood1*CausalityB,0.33)<kCombinedCut) v0OK = kFALSE;
+      if (causalityA<kCausality0Cut)                                          v0OK = kFALSE;
+      if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut)              v0OK = kFALSE;
+      if (likelihood1<kLikelihood1Cut)                                        v0OK = kFALSE;
+      if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut) v0OK = kFALSE;
       
       //
       //

diff --git a/ITS/AliITStrackerMI.h b/ITS/AliITStrackerMI.h
index b6f3d9ad79034cdd53883419a59cbf3ef82f208a..657f2455d391ee49fc8b225b19cb3dda795d7376 100644 (file)
--- a/ITS/AliITStrackerMI.h
+++ b/ITS/AliITStrackerMI.h
@@ -3,30 +3,27 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
 //-------------------------------------------------------------------------
 //                          ITS tracker
 //     reads AliITSclusterMI clusters and creates AliITStrackMI tracks
 //           Origin: Marian Ivanov, CERN, Marian.Ivanov@cern.ch
 //-------------------------------------------------------------------------
 
+class TTree;
+class TTreeSRedirector;
 #include <TObjArray.h>
 
-#include "AliTracker.h"
-#include "AliITStrackMI.h"
-#include "AliITSclusterV2.h"
-#include "AliV0vertex.h"
-
 class AliESD;
-class AliITSgeom;
-class TTree;
+class AliESDV0MI;
 class AliHelix;
+class AliITSgeom;
 class AliV0vertex;
-class AliESDV0MI;
-
-class TTreeSRedirector;
-
-
-
+#include "AliITSclusterV2.h"
+#include "AliITStrackMI.h"
+#include "AliTracker.h"
+#include "AliV0vertex.h"
 
 //-------------------------------------------------------------------------
 class AliITStrackerMI : public AliTracker {
@@ -101,7 +98,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;} 
-    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;
@@ -114,7 +111,8 @@ public:
     void IncAccepted(){fAccepted++;}
     Int_t GetAccepted() const {return fAccepted;}    
   protected:
-    AliITSlayer(const AliITSlayer& /*layer*/){;}
+    AliITSlayer(const AliITSlayer& /*layer*/);
+    AliITSlayer & operator=(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
@@ -232,8 +230,9 @@ protected:
   Float_t * fCoeficients;                //! working array with errors and mean cluser shape
   AliESD  * fEsd;                        //! pointer to the ESD event
   TTreeSRedirector *fDebugStreamer;     //!debug streamer
- private:
-  AliITStrackerMI(const AliITStrackerMI * /*tracker*/){;}
+private:
+  AliITStrackerMI(const AliITStrackerMI &);
+  AliITStrackerMI & operator=(const AliITStrackerMI &);
   ClassDef(AliITStrackerMI,2)   //ITS tracker MI
 };
 

diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx
index b8fc3cdacedc91f84d53429bb75dbb52d95cb6d3..855c1edb8fc69a5c859c366b8a4dee2ad7fcf991 100644 (file)
--- a/ITS/AliITStrackerSA.cxx
+++ b/ITS/AliITStrackerSA.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 ////////////////////////////////////////////////////
 //  Stand alone tracker class                     //
 //  Origin:  Elisabetta Crescio                   //
@@ -21,22 +23,24 @@
 ////////////////////////////////////////////////////
 
 #include <stdlib.h>
-#include "TArrayI.h"
+
+#include <TArrayI.h>
 #include <TBranch.h>
 #include <TMath.h>
 #include <TObjArray.h>
 #include <TTree.h>
-#include "AliRun.h"
+
+#include "AliESD.h"
+#include "AliESDVertex.h"
+#include "AliESDtrack.h"
+#include "AliITSRiemannFit.h"
+#include "AliITSVertexer.h"
 #include "AliITSclusterTable.h"
 #include "AliITSclusterV2.h"
 #include "AliITSgeom.h"
-#include "AliITSRiemannFit.h"
-#include "AliITStrackerSA.h"
 #include "AliITStrackSA.h"
-#include "AliITSVertexer.h"
-#include "AliESDVertex.h"
-#include "AliESD.h"
-#include "AliESDtrack.h"
+#include "AliITStrackerSA.h"
+#include "AliRun.h"
 
 ClassImp(AliITStrackerSA)
 
@@ -66,23 +70,6 @@ AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliESDVertex *vert):AliITStra
  
 }
 
-//______________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA &trkr) : 
-                    AliITStrackerMI(trkr) {
-  // Copy constructor
-  // Copies are not allowed. The method is protected to avoid misuse.
-  Error("AliITStrackerSA","Copy constructor not allowed\n");
-}
-
-//______________________________________________________________________
-AliITStrackerSA& AliITStrackerSA::operator=(const 
-                    AliITStrackerSA& /* trkr */){
-  // Assignment operator
-  // Assignment is not allowed. The method is protected to avoid misuse.
-  Error("= operator","Assignment operator not allowed\n");
-  return *this;
-}
-
 //____________________________________________________________________________
 AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliITSVertexer *vertexer):AliITStrackerMI(geom) 
 {

diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h
index 654f93396c2fe4ebd5a4572b1feb1689ab9fb374..4ada0735c0d12971a7b595ce73716b297d89152d 100644 (file)
--- a/PHOS/AliPHOSGetter.h
+++ b/PHOS/AliPHOSGetter.h
@@ -197,7 +197,7 @@ public:
   virtual void PostSDigitizer (AliPHOSSDigitizer * sdigitizer) 
     const {PhosLoader()->PostSDigitizer(sdigitizer);}    
   virtual void PostDigitizer (AliPHOSDigitizer * digitizer)    
-    const {PhosLoader()->PostDigitizer(dynamic_cast<AliDigitizer *>(digitizer));}
+    const {PhosLoader()->PostDigitizer(digitizer);}
   
   virtual TString Version() const  { return PhosLoader()->GetTitle() ; } 
   virtual AliPHOSLoader * PhosLoader() const { return  fgPhosLoader ; }

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index 4418efb52ce646e78456df18b02300c02e829fd3..5646360646e1cec293dda6ff0014f1f35dead4ec 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -28,15 +28,8 @@
 
 //
 
-#include <Riostream.h>
-#include <TMath.h>
-#include <TObject.h>
-#include <TRandom.h>
 #include <AliTPCParam.h>
 
-
-
-
 ClassImp(AliTPCParam)
 
 
@@ -503,7 +496,7 @@ Bool_t AliTPCParam::Update()
 
 
 
-Bool_t AliTPCParam::GetStatus()
+Bool_t AliTPCParam::GetStatus() const
 {
   //get information about object consistency
   return fbStatus;

diff --git a/TPC/AliTPCParam.h b/TPC/AliTPCParam.h
index af0e22e7cdff2a6475f357d02402bfe5d6d82b0d..986cba6c50122a37662158016c98a3a44d84102c 100644 (file)
--- a/TPC/AliTPCParam.h
+++ b/TPC/AliTPCParam.h
@@ -12,8 +12,6 @@
 #include "AliDetectorParam.h"
 #include "TMath.h"
 
-
-
 class AliTPCParam : public AliDetectorParam {
   //////////////////////////////////////////////////////
   //////////////////////////////////////////////////////
@@ -97,7 +95,7 @@ public:
   //return number of valid response bin
   virtual void SetDefault();          //set defaut TPCparam 
   virtual Bool_t Update();            //recalculate and check geometric parameters 
-  Bool_t GetStatus();         //get information about object consistency  
+  Bool_t GetStatus() const;         //get information about object consistency  
   Int_t GetIndex(Int_t sector, Int_t row) const;  //give index of the given sector and pad row 
   Int_t GetNSegmentsTotal() const {return fNtRows;} 
   Double_t GetLowMaxY(Int_t irow) const {return irow*0.;}
@@ -227,7 +225,7 @@ public:
   Float_t  GetOuterWWPitch() const {return fOuterWWPitch;}  
   Int_t    GetOuterDummyWire() const {return fOuterDummyWire;}
   Float_t  GetOuterOffWire() const {return fOuterOffWire;}
-  Float_t  GetLastWireUp1()  {return fLastWireUp1;}
+  Float_t  GetLastWireUp1()  const {return fLastWireUp1;}
   Float_t  GetROuterFirstWire() const {return fROuterFirstWire;}
   Float_t  GetROuterLastWire() const {return fROuterLastWire;}  
   Float_t  GetWWPitch(Int_t isector = 0) const  {
@@ -250,18 +248,14 @@ public:
   Float_t  GetPadPitchWidth(Int_t isector = 0) const  {
     return ( (isector < fNInnerSector) ? fInnerPadPitchWidth :fOuterPadPitchWidth);}
   Float_t  GetPadPitchLength(Int_t isector = 0, Int_t padrow=0)  const
-  {
-    if (isector < fNInnerSector) {return fInnerPadPitchLength;} 
-    else { 
-     return ((padrow<fNRowUp1) ? fOuter1PadPitchLength:fOuter2PadPitchLength);
-    }
-  }
+  { if (isector < fNInnerSector) return fInnerPadPitchLength; 
+    else return ((padrow<fNRowUp1) ? fOuter1PadPitchLength:fOuter2PadPitchLength);}
   Int_t GetNRowLow() const;   //get the number of pad rows in low sector
   Int_t GetNRowUp() const;    //get the number of pad rows in up sector
   Int_t GetNRowUp1() const;  // number of short rows in up sector  
   Int_t GetNRowUp2() const;  // number of long rows in up sector
   Int_t GetNRow(Int_t isec) const {return  ((isec<fNInnerSector) ?  fNRowLow:fNRowUp);}
-  Int_t GetNRowsTotal(){return fNtRows;}  //get total nuber of rows
+  Int_t GetNRowsTotal() const {return fNtRows;}  //get total nuber of rows
   Float_t GetPadRowRadiiLow(Int_t irow) const; //get the pad row (irow) radii
   Float_t GetPadRowRadiiUp(Int_t irow) const;  //get the pad row (irow) radii
   Float_t GetPadRowRadii(Int_t isec,Int_t irow) const {
@@ -296,7 +290,7 @@ public:
   Float_t  GetZWidth() const {return fZWidth;}
   Float_t  GetTFWHM() const {return fTSigma*2.35;}
   Float_t  GetZSigma() const {return fTSigma*fDriftV;}  
-  virtual  Float_t  GetZOffset() {return 3*fTSigma*fDriftV;}
+  virtual  Float_t  GetZOffset() const {return 3*fTSigma*fDriftV;}
   Int_t    GetMaxTBin() const {return fMaxTBin;}
   Int_t    GetADCSat() const {return fADCSat;}
   Float_t  GetADCDynRange() const {return fADCDynRange;}
@@ -346,7 +340,7 @@ protected :
   Float_t fRInnerLastWire;    //position of the last wire                 -calculated
   Float_t fLastWireUp1;     //position of the last wire in outer1 sector
   Int_t   fNOuter1WiresPerPad; //Number of wires per pad
-  Int_t   fNOuter2WiresPerPad;  
+  Int_t   fNOuter2WiresPerPad; // Number of wires per pad
   Float_t fOuterWWPitch;      //pitch between wires in outer sector      -calculated
   Int_t   fOuterDummyWire;    //number of wires without pad readout
   Float_t fOuterOffWire;      //oofset of first wire to the begining of the sector
@@ -360,10 +354,10 @@ protected :
   Float_t   fInnerPadLength;         //Inner pad  length
   Float_t   fInnerPadWidth;          //Inner pad  width
   Float_t   fOuter1PadPitchLength;    //Outer pad pitch length
-  Float_t   fOuter2PadPitchLength;    
+  Float_t   fOuter2PadPitchLength;    //Outer pad pitch length
   Float_t   fOuterPadPitchWidth;     //Outer pad pitch width
   Float_t   fOuter1PadLength;         //Outer pad  length
-  Float_t   fOuter2PadLength;
+  Float_t   fOuter2PadLength;         //Outer pad length
   Float_t   fOuterPadWidth;          //Outer pad  width
   Bool_t    fBMWPCReadout;           //indicate wire readout - kTRUE or GEM readout -kFALSE
   Int_t     fNCrossRows;             //number of rows to crostalk calculation
@@ -407,8 +401,6 @@ protected :
   Float_t fTotalNormFac;    //full normalisation factor - calculated
   Float_t fNoiseNormFac;    //normalisation factor to transform noise in electron to ADC channel   
   
- 
-protected:
   //---------------------------------------------------------------------
   // ALICE TPC response data 
   //---------------------------------------------------------------------
@@ -418,6 +410,9 @@ protected:
   Int_t   *fResponseBin;    //!array with bins                     -calulated
   Float_t *fResponseWeight; //!array with response                 -calulated
 
+private:
+  AliTPCParam(const AliTPCParam &);
+  AliTPCParam & operator=(const AliTPCParam &);
   ClassDef(AliTPCParam,3)  //parameter  object for set:TPC
 };
 

diff --git a/TPC/AliTPCtrackerParam.h b/TPC/AliTPCtrackerParam.h
index a9650778f1c65e6269b5f9536f6caab5329eecba..b55aec9e13bd5fd01d7990a6070544f65d65d226 100644 (file)
--- a/TPC/AliTPCtrackerParam.h
+++ b/TPC/AliTPCtrackerParam.h
@@ -16,15 +16,12 @@
 //-----------------------------------------------------------------------------
 
 //----- Root headers ---------
+class TTree;
 #include <TMatrixD.h>
 //---- AliRoot headers -------
-//#include "alles.h"
-#include "AliRun.h"
-//#include "AliGausCorr.h"
-//#include "AliMagF.h"
+#include "AliConfig.h"
 #include "AliTPCkineGrid.h"
 #include "AliTPCtrack.h"
-//#include "AliTrackReference.h"
 //----------------------------
 
 class AliTPC;