Fixes to coding conventions violations

diff --git a/ITS/AliCascadeVertexer.cxx b/ITS/AliCascadeVertexer.cxx
index 377d6cd..2eede11 100644 (file)
--- a/ITS/AliCascadeVertexer.cxx
+++ b/ITS/AliCascadeVertexer.cxx
@@ -222,14 +222,14 @@ V0sTracks2CascadeVertices(TTree *vTree,TTree *tTree, TTree *xTree) {
 
    for (i=0; i<nV0; i++) {
 
-       AliV0vertex *V0ver=(AliV0vertex *)vtxV0.UncheckedAt(i);
+       AliV0vertex *lV0ver=(AliV0vertex *)vtxV0.UncheckedAt(i);
 
-       V0ver->ChangeMassHypothesis(kLambda0); //I.B.
+       lV0ver->ChangeMassHypothesis(kLambda0); //I.B.
 
-       if (V0ver->GetEffMass()<massLambda-fMassWin ||       // condition of the V0 mass window (cut fMassWin)
-           V0ver->GetEffMass()>massLambda+fMassWin) continue; 
+       if (lV0ver->GetEffMass()<massLambda-fMassWin ||       // condition of the V0 mass window (cut fMassWin)
+           lV0ver->GetEffMass()>massLambda+fMassWin) continue; 
 
-       if (V0ver->GetD(0,0,0)<fDV0min) continue;          // condition of minimum impact parameter of the V0 (cut fDV0min) 
+       if (lV0ver->GetD(0,0,0)<fDV0min) continue;          // condition of minimum impact parameter of the V0 (cut fDV0min) 
                                                           // here why not cuting on pointing angle ???
 
    // for each vertex in the good mass range, loop on all tracks (= bachelor candidates)
@@ -240,10 +240,10 @@ V0sTracks2CascadeVertices(TTree *vTree,TTree *tTree, TTree *xTree) {
 
           if (TMath::Abs(bachtrk->GetD())<fDBachMin) continue;        // eliminate to small impact parameters
 
-          if (V0ver->GetPdgCode()==kLambda0 && bachtrk->Get1Pt()<0.) continue;     // condition on V0 label 
-          if (V0ver->GetPdgCode()==kLambda0Bar && bachtrk->Get1Pt()>0.) continue;  // + good sign for bachelor
+          if (lV0ver->GetPdgCode()==kLambda0 && bachtrk->Get1Pt()<0.) continue;     // condition on V0 label 
+          if (lV0ver->GetPdgCode()==kLambda0Bar && bachtrk->Get1Pt()>0.) continue;  // + good sign for bachelor
           
-         AliV0vertex V0(*V0ver), *pV0=&V0;
+         AliV0vertex lV0(*lV0ver), *pV0=&lV0;
           AliITStrackV2 bt(*bachtrk), *pbt=&bt;
 
    // calculation of the distance of closest approach between the V0 and the bachelor
@@ -265,7 +265,7 @@ V0sTracks2CascadeVertices(TTree *vTree,TTree *tTree, TTree *xTree) {
 
          {
    //I.B.
-         Double_t x1,y1,z1; V0ver->GetXYZ(x1,y1,z1);
+         Double_t x1,y1,z1; lV0ver->GetXYZ(x1,y1,z1);
          if (r2 > (x1*x1+y1*y1)) continue;
          if (z*z > z1*z1) continue;
          }

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 3d29a55..c68fe67 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -307,7 +307,7 @@ AliITS& AliITS::operator=(AliITS &source){
     return *this; //fake return
 }
 //______________________________________________________________________
-Int_t AliITS::DistancetoPrimitive(Int_t,Int_t){
+Int_t AliITS::DistancetoPrimitive(Int_t,Int_t) const{
     // Distance from mouse to ITS on the screen. Dummy routine
     //     A dummy routine used by the ROOT macro display.C to allow for the
     // use of the mouse (pointing device) in the macro. In general this should
@@ -1362,8 +1362,8 @@ void AliITS::MakeBranchC()
     Error("MakeTreeC","fLoader == 0x0");
     return;
    }
-  TTree * TC = pITSLoader->TreeC();
-  if (TC == 0x0)
+  TTree * lTC = pITSLoader->TreeC();
+  if (lTC == 0x0)
    {
      Error("MakeTreeC","Can not get TreeC from Loader");
      return;
@@ -1389,18 +1389,18 @@ void AliITS::MakeBranchC()
          }
         if (kNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
         else  sprintf(branchname,"%sClusters%d",GetName(),i+1);
-        if (fCtype  && TC) 
+        if (fCtype  && lTC) 
          {
-           if (TC->GetBranch(branchname))
+           if (lTC->GetBranch(branchname))
             {
               Warning("MakeBranchC","Branch %s alread exists in TreeC",branchname);
             }
            else
             {
               Info("MakeBranchC","Creating branch %s in TreeC",branchname);
-              TC->Branch(branchname,&((*fCtype)[i]), buffersize);
+              lTC->Branch(branchname,&((*fCtype)[i]), buffersize);
             }
-         } // end if fCtype && TC
+         } // end if fCtype && lTC
   } // end for i
 }
 
@@ -1417,17 +1417,17 @@ void AliITS::GetTreeC(Int_t event){
   const char *det[3] = {"SPD","SDD","SSD"};
 
   AliITSLoader *pITSLoader = (AliITSLoader*)fLoader;
-  TTree * TC = pITSLoader->TreeC();
+  TTree * lTC = pITSLoader->TreeC();
 
   ResetClusters();
-  if (TC) {
+  if (lTC) {
     pITSLoader->CleanRawClusters();
   } // end if TreeC()
 
 
   TBranch *branch;
 
-  if (TC) {
+  if (lTC) {
     Int_t i;
         char digclass[40];
         char clclass[40];
@@ -1440,13 +1440,13 @@ void AliITS::GetTreeC(Int_t event){
       if(kNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
       else  sprintf(branchname,"%sClusters%d",GetName(),i+1);
       if (fCtype) {
-                branch = TC->GetBranch(branchname);
+                branch = lTC->GetBranch(branchname);
         if (branch) branch->SetAddress(&((*fCtype)[i]));
       } // end if fCtype
         } // end for i
   } else {
         Error("GetTreeC","cannot find Clusters Tree for event:%d",event);
-  } // end if TC
+  } // end if lTC
 }
 //______________________________________________________________________
 void AliITS::AddCluster(Int_t id, AliITSRawCluster *c){
@@ -1625,8 +1625,8 @@ void AliITS::HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size,
         sim->CreateFastRecPoints(mod,module,gRandom);
         cout<<module<<"\r";fflush(0);
         //gAlice->TreeR()->Fill();
-       TTree *TR = pITSloader->TreeR();
-        TBranch *br=TR->GetBranch("ITSRecPointsF");
+       TTree *lTR = pITSloader->TreeR();
+        TBranch *br=lTR->GetBranch("ITSRecPointsF");
         br->Fill();
         ResetRecPoints();
     } // end for module
@@ -1695,11 +1695,11 @@ void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt){
          exit(1);
       } // end if !rec
       this->ResetDigits();
-      TTree *TD = pITSloader->TreeD();
+      TTree *lTD = pITSloader->TreeD();
       if (all) {
-         TD->GetEvent(lastentry+module);
+         lTD->GetEvent(lastentry+module);
       }else {
-         TD->GetEvent(lastentry+(module-first));
+         lTD->GetEvent(lastentry+(module-first));
       }
       Int_t ndigits = itsDigits->GetEntriesFast();
       if (ndigits) rec->FindRawClusters(module);

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index a21cfe6..4c60bbc 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -47,12 +47,12 @@ class AliITS : public AliDetector {
     AliITS(const AliITS &source); // copy constructor. Not to be used!
     AliITS& operator=(AliITS &source); // = operator. Not to be used!
     virtual Int_t IsVersion() const {return 1;}
-    virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
+    virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) const;
 
     //===================== Simulation Geometry ========================
     // get geometry version - detailed (major) or coarse (minor)
-    virtual Int_t GetMajorVersion(){return -1;}
-    virtual Int_t GetMinorVersion(){return -1;}
+    virtual Int_t GetMajorVersion() const {return -1;}
+    virtual Int_t GetMinorVersion() const {return -1;}
     virtual void  GetGeometryVersion(Int_t &a,Int_t &b) 
                           {a = GetMajorVersion();b=GetMinorVersion();return;}
     virtual void  SetEUCLID(Bool_t euclid=1) {fEuclidOut = euclid;}
@@ -75,8 +75,8 @@ class AliITS : public AliDetector {
     virtual void SetDefaultClusterFinders();
     virtual void MakeBranch(Option_t *opt=" ");
     virtual void SetTreeAddress();
-    // For a give branch from the treeH sets the TClonesArray address.
-    virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
+    // For a given branch from the treeH sets the TClonesArray address.
+    virtual void SetHitsAddressBranch(TBranch *b) {b->SetAddress(&fHits);}
     // Return pointer to DetType #id
     AliITSDetType *DetType(Int_t id);
     //Int_t           NDetTypes() {return fNDetTypes;}

diff --git a/ITS/AliITSClusterFinder.h b/ITS/AliITSClusterFinder.h
index 5e4ac22..6c9cfa9 100644 (file)
--- a/ITS/AliITSClusterFinder.h
+++ b/ITS/AliITSClusterFinder.h
@@ -49,17 +49,17 @@ class AliITSClusterFinder :public TObject{
        return fResponse;}
     virtual AliITSsegmentation * GetSeg(){// Returns fSegmentation
        return fSegmentation;}
-    virtual Int_t GetNRawClusters(){ // returns fNRawClusters
+    virtual Int_t GetNRawClusters() const { // returns fNRawClusters
        return fNRawClusters;}
     AliITSMap   *Map() {// map
        return fMap;}
-    virtual Int_t GetNperMax(){ // returns fNperMax
+    virtual Int_t GetNperMax() const { // returns fNperMax
        return fNperMax;}
-    virtual Int_t GetDeclusterFlag(){ // returns fDeclusterFlag
+    virtual Int_t GetDeclusterFlag() const { // returns fDeclusterFlag
        return fDeclusterFlag;}
-    virtual Int_t GetClusterSize(){ // returns fClusterSize
+    virtual Int_t GetClusterSize() const { // returns fClusterSize
        return fClusterSize;}
-    virtual Int_t GetNPeaks(){ // returns fNPeaks
+    virtual Int_t GetNPeaks() const { // returns fNPeaks
        return fNPeaks;}
     //
     virtual void AddCluster(Int_t branch, AliITSRawCluster *c);
@@ -102,10 +102,10 @@ class AliITSClusterFinder :public TObject{
     // set the fitting methods in the derived classes
     // data members
 
+protected:
     TClonesArray       *fDigits;       //! digits
     Int_t              fNdigits;       //! num of digits
 
- protected:
     AliITSresponse     *fResponse;     //! response
     AliITSsegmentation *fSegmentation; //!segmentation
     Int_t              fNRawClusters;  //! in case we split the cluster