Coding violations

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index 11b1bc1f73ed9803abb5d823c1406a2a892c43b9..e39d73ccb6c72a5bad35f8a0eb6c2ac13fa65ecf 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -897,7 +897,7 @@ Bool_t AliTPC::Raw2SDigits(AliRawReader* rawReader){
   fTPCParam->SetZeroSup(0);
 
   // Loop over sectors
-  const Int_t maxTime = fTPCParam->GetMaxTBin();
+  const Int_t kmaxTime = fTPCParam->GetMaxTBin();
   const Int_t kNIS = fTPCParam->GetNInnerSector();
   const Int_t kNOS = fTPCParam->GetNOuterSector();
   const Int_t kNS = kNIS + kNOS;
@@ -926,7 +926,7 @@ Bool_t AliTPC::Raw2SDigits(AliRawReader* rawReader){
     allBins = new Short_t*[nRows];
     for (Int_t iRow = 0; iRow < nRows; iRow++) {
       Int_t maxPad = fTPCParam->GetNPads(iSector,iRow);
-      Int_t maxBin = maxTime*maxPad;
+      Int_t maxBin = kmaxTime*maxPad;
       allBins[iRow] = new Short_t[maxBin];
       memset(allBins[iRow],0,sizeof(Short_t)*maxBin);
     }
@@ -950,19 +950,19 @@ Bool_t AliTPC::Raw2SDigits(AliRawReader* rawReader){
                      iPad, 0, maxPad -1));
 
       Int_t iTimeBin = input.GetTime();
-      if ( iTimeBin < 0 || iTimeBin >= maxTime)
+      if ( iTimeBin < 0 || iTimeBin >= kmaxTime)
        AliFatal(Form("Timebin index (%d) outside the range (%d -> %d) !",
-                     iTimeBin, 0, maxTime -1));
+                     iTimeBin, 0, kmaxTime -1));
       
-      Int_t maxBin = maxTime*maxPad;
+      Int_t maxBin = kmaxTime*maxPad;
 
-      if (((iPad*maxTime+iTimeBin) >= maxBin) ||
-         ((iPad*maxTime+iTimeBin) < 0))
+      if (((iPad*kmaxTime+iTimeBin) >= maxBin) ||
+         ((iPad*kmaxTime+iTimeBin) < 0))
        AliFatal(Form("Index outside the allowed range"
                      " Sector=%d Row=%d Pad=%d Timebin=%d"
                      " (Max.index=%d)",iSector,iRow,iPad,iTimeBin,maxBin));
 
-      allBins[iRow][iPad*maxTime+iTimeBin] = input.GetSignal();
+      allBins[iRow][iPad*kmaxTime+iTimeBin] = input.GetSignal();
 
     } // End loop over altro data
     
@@ -976,8 +976,8 @@ Bool_t AliTPC::Raw2SDigits(AliRawReader* rawReader){
 
       Int_t maxPad = fTPCParam->GetNPads(iSector,iRow);
       for(Int_t iPad = 0; iPad < maxPad; iPad++) {
-       for(Int_t iTimeBin = 0; iTimeBin < maxTime; iTimeBin++) {
-         Short_t q = allBins[iRow][iPad*maxTime + iTimeBin];
+       for(Int_t iTimeBin = 0; iTimeBin < kmaxTime; iTimeBin++) {
+         Short_t q = allBins[iRow][iPad*kmaxTime + iTimeBin];
          if (q <= 0) continue;
          q *= 16;
          dig->SetDigitFast((Short_t)q,iTimeBin,iPad);

diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx
index 20d5fa2dc2486cbffe5fa730ac66fe4cba485e4f..686dd05a0d8a16584400bdc2b4d22b70848b6828 100644 (file)
--- a/TPC/AliTPCv0.cxx
+++ b/TPC/AliTPCv0.cxx
@@ -435,25 +435,25 @@ void AliTPCv0::CreateGeometry()
   // end caps - they are make as an assembly of single segments
   // containing both readout chambers
   //
-  Double_t OpeningAngle = 10.*TMath::DegToRad();
+  Double_t openingAngle = 10.*TMath::DegToRad();
   Double_t thick=1.5; // rib
-  Double_t shift = thick/TMath::Sin(OpeningAngle);
+  Double_t shift = thick/TMath::Sin(openingAngle);
   //
-  Double_t LowEdge = 86.3; // hole in the wheel
-  Double_t UpEdge = 240.4; // hole in the wheel
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
   //
   new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
   //
   TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
   //
-  hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift);
-  hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift);
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
   //
-  hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift);
-  hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift);
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
   //
-  Double_t ys = shift*TMath::Sin(OpeningAngle); 
-  Double_t xs = shift*TMath::Cos(OpeningAngle);
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
   TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
   tr->RegisterYourself();
   TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
@@ -679,11 +679,11 @@ void AliTPCv0::CreateGeometry()
    *rot=rot1*rot2;
    //
    Double_t x0,y0;
-   x0=110.2*TMath::Cos(OpeningAngle);
-   y0=110.2*TMath::Sin(OpeningAngle);
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
-   x0=188.45*TMath::Cos(OpeningAngle);
-   y0=188.45*TMath::Sin(OpeningAngle);
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
    //
    sect->AddNode(ch,1);
@@ -715,7 +715,7 @@ void AliTPCv0::CreateGeometry()
   TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
   thick=1.;
-  shift = thick/TMath::Sin(OpeningAngle);
+  shift = thick/TMath::Sin(openingAngle);
   TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
   sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
@@ -730,8 +730,8 @@ void AliTPCv0::CreateGeometry()
   shv->AddNode(elv,1);
   //
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
   // cover
   TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
@@ -740,14 +740,14 @@ void AliTPCv0::CreateGeometry()
   TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
   // hole in a cover
   TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
-  shift=4./TMath::Sin(OpeningAngle);
+  shift=4./TMath::Sin(openingAngle);
   coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
   coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
   //
   TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);  
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
   cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
   //
   // Sector as an Assembly

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index a62723e5c0df48fd7ebea2cc78a6e0b4fa021ac7..d016aead72b2e5b71dd8a3f295edf1423de73d8f 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -452,25 +452,25 @@ void AliTPCv1::CreateGeometry()
   // end caps - they are make as an assembly of single segments
   // containing both readout chambers
   //
-  Double_t OpeningAngle = 10.*TMath::DegToRad();
+  Double_t openingAngle = 10.*TMath::DegToRad();
   Double_t thick=1.5; // rib
-  Double_t shift = thick/TMath::Sin(OpeningAngle);
+  Double_t shift = thick/TMath::Sin(openingAngle);
   //
-  Double_t LowEdge = 86.3; // hole in the wheel
-  Double_t UpEdge = 240.4; // hole in the wheel
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
   //
   new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
   //
   TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
   //
-  hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift);
-  hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift);
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
   //
-  hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift);
-  hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift);
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
   //
-  Double_t ys = shift*TMath::Sin(OpeningAngle); 
-  Double_t xs = shift*TMath::Cos(OpeningAngle);
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
   TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
   tr->RegisterYourself();
   TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
@@ -696,11 +696,11 @@ void AliTPCv1::CreateGeometry()
    *rot=rot1*rot2;
    //
    Double_t x0,y0;
-   x0=110.2*TMath::Cos(OpeningAngle);
-   y0=110.2*TMath::Sin(OpeningAngle);
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
-   x0=188.45*TMath::Cos(OpeningAngle);
-   y0=188.45*TMath::Sin(OpeningAngle);
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
    //
    sect->AddNode(ch,1);
@@ -733,7 +733,7 @@ void AliTPCv1::CreateGeometry()
   TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
   thick=1.;
-  shift = thick/TMath::Sin(OpeningAngle);
+  shift = thick/TMath::Sin(openingAngle);
   TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
   sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
@@ -748,8 +748,8 @@ void AliTPCv1::CreateGeometry()
   shv->AddNode(elv,1);
   //
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
   // cover
   TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
@@ -758,14 +758,14 @@ void AliTPCv1::CreateGeometry()
   TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
   // hole in a cover
   TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
-  shift=4./TMath::Sin(OpeningAngle);
+  shift=4./TMath::Sin(openingAngle);
   coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
   coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
   //
   TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);  
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
   cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
   //
   // Sector as an Assembly

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index c45cc3e910e4087fe8c9ebd96dc84d32e27b1b1e..828fd3b44e7a4170a6c694cb52fb2ced29d52a53 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -29,25 +29,15 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <stdlib.h>
+//#include <stdlib.h>
 
 #include <TLorentzVector.h>
-#include <TMath.h>
 #include <TPDGCode.h>
-#include <TVirtualMC.h>
 #include <TString.h>
-#include <TSystem.h>
-
-#include "AliConst.h"
 #include "AliLog.h"
-#include "AliMC.h"
-#include "AliRun.h"
-#include "AliTPCDigitsArray.h"
 #include "AliTPCParam.h"
-#include "AliTPCParamSR.h"
 #include "AliTPCTrackHitsV2.h"
 #include "AliTPCv2.h"
-#include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TGeoPcon.h"
 #include "TGeoTube.h"
@@ -438,25 +428,25 @@ void AliTPCv2::CreateGeometry()
   // end caps - they are make as an assembly of single segments
   // containing both readout chambers
   //
-  Double_t OpeningAngle = 10.*TMath::DegToRad();
+  Double_t openingAngle = 10.*TMath::DegToRad();
   Double_t thick=1.5; // rib
-  Double_t shift = thick/TMath::Sin(OpeningAngle);
+  Double_t shift = thick/TMath::Sin(openingAngle);
   //
-  Double_t LowEdge = 86.3; // hole in the wheel
-  Double_t UpEdge = 240.4; // hole in the wheel
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
   //
   new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
   //
   TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
   //
-  hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift);
-  hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift);
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
   //
-  hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift);
-  hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift);
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
   //
-  Double_t ys = shift*TMath::Sin(OpeningAngle); 
-  Double_t xs = shift*TMath::Cos(OpeningAngle);
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
   TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
   tr->RegisterYourself();
   TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
@@ -682,11 +672,11 @@ void AliTPCv2::CreateGeometry()
    *rot=rot1*rot2;
    //
    Double_t x0,y0;
-   x0=110.2*TMath::Cos(OpeningAngle);
-   y0=110.2*TMath::Sin(OpeningAngle);
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
-   x0=188.45*TMath::Cos(OpeningAngle);
-   y0=188.45*TMath::Sin(OpeningAngle);
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
    //
    sect->AddNode(ch,1);
@@ -718,7 +708,7 @@ void AliTPCv2::CreateGeometry()
   TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
   thick=1.;
-  shift = thick/TMath::Sin(OpeningAngle);
+  shift = thick/TMath::Sin(openingAngle);
   TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
   sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
@@ -733,8 +723,8 @@ void AliTPCv2::CreateGeometry()
   shv->AddNode(elv,1);
   //
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
   // cover
   TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
@@ -743,14 +733,14 @@ void AliTPCv2::CreateGeometry()
   TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
   // hole in a cover
   TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
-  shift=4./TMath::Sin(OpeningAngle);
+  shift=4./TMath::Sin(openingAngle);
   coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
   coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
   //
   TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);  
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
   cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
   //
   // Sector as an Assembly
@@ -897,22 +887,22 @@ void AliTPCv2::SetInnerChambersAlignable() const
 {
   //
   Int_t modnum = 0;
-  TString vp_str1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
-  TString vp_str2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
-  TString vp_append = "/TPC_IROC_1";
-  TString sn_str1="TPC/EndcapA/Sector";
-  TString sn_str2="TPC/EndcapC/Sector";
-  TString sn_append="/InnerChamber";
+  TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
+  TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
+  TString vpappend = "/TPC_IROC_1";
+  TString snstr1="TPC/EndcapA/Sector";
+  TString snstr2="TPC/EndcapC/Sector";
+  TString snappend="/InnerChamber";
   TString volpath, symname;
   
   try{
     for(Int_t cnt=1; cnt<=18; cnt++){
-      volpath = vp_str1;
+      volpath = vpstr1;
       volpath += cnt;
-      volpath += vp_append;
-      symname = sn_str1;
+      volpath += vpappend;
+      symname = snstr1;
       symname += cnt;
-      symname += sn_append;
+      symname += snappend;
       gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data());
       modnum++;
     }
@@ -921,12 +911,12 @@ void AliTPCv2::SetInnerChambersAlignable() const
   }
 
   for(Int_t cnt=1; cnt<=18; cnt++){
-    volpath = vp_str2;
+    volpath = vpstr2;
     volpath += cnt;
-    volpath += vp_append;
-    symname = sn_str2;
+    volpath += vpappend;
+    symname = snstr2;
     symname += cnt;
-    symname += sn_append;
+    symname += snappend;
     gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data());
     modnum++;
   }
@@ -938,38 +928,38 @@ void AliTPCv2::SetOuterChambersAlignable() const
 {
   //
   Int_t modnum = 0;
-  TString vp_str1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
-  TString vp_str2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
-  TString vp_append = "/TPC_OROC_1";
-  TString sn_str1="TPC/EndcapA/Sector";
-  TString sn_str2="TPC/EndcapC/Sector";
-  TString sn_append="/OuterChamber";
+  TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
+  TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
+  TString vpappend = "/TPC_OROC_1";
+  TString snstr1="TPC/EndcapA/Sector";
+  TString snstr2="TPC/EndcapC/Sector";
+  TString snappend="/OuterChamber";
   TString volpath, symname;
   
   for(Int_t cnt=1; cnt<=18; cnt++){
-    volpath = vp_str1;
+    volpath = vpstr1;
     volpath += cnt;
-    volpath += vp_append;
-    symname = sn_str1;
+    volpath += vpappend;
+    symname = snstr1;
     symname += cnt;
-    symname += sn_append;
+    symname += snappend;
     gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data());
     modnum++;
   }
   for(Int_t cnt=1; cnt<=18; cnt++){
-    volpath = vp_str2;
+    volpath = vpstr2;
     volpath += cnt;
-    volpath += vp_append;
-    symname = sn_str2;
+    volpath += vpappend;
+    symname = snstr2;
     symname += cnt;
-    symname += sn_append;
+    symname += snappend;
     gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data());
     modnum++;
   }
 }
 
 //_____________________________________________________________________________
-void AliTPCv2::DrawDetector()
+void AliTPCv2::DrawDetector() const
 {
   //
   // Draw a shaded view of the Time Projection Chamber version 1

diff --git a/TPC/AliTPCv2.h b/TPC/AliTPCv2.h
index d3db56fa4e8405f532f3b71f4d68e9cc0e8a3ac9..2af9ae2ecacb0e9199722e2bdf4fcd3a8dd557fd 100644 (file)
--- a/TPC/AliTPCv2.h
+++ b/TPC/AliTPCv2.h
@@ -11,7 +11,16 @@
 
  
 #include "AliTPC.h"
-
+#include <stdlib.h>
+#include <TMath.h>
+#include "AliMC.h"
+#include "AliConst.h"
+#include <TVirtualMC.h>
+#include <TSystem.h>
+#include "AliTPCParamSR.h"
+#include "AliRun.h"
+#include "AliTPCDigitsArray.h"
+#include "TGeoManager.h"
 class AliTPCv2 : public AliTPC {
 
 public:
@@ -26,7 +35,7 @@ public:
   virtual void  Init();
   virtual Int_t IsVersion() const {return 2;}
   virtual void  StepManager();
-  virtual void  DrawDetector();
+  virtual void  DrawDetector() const;
 
 protected:
   Int_t fIdSens;    // sensitive strip

diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 8eaa4099b72bc189a1ed0c965e49fc2a2d5c25b1..a3deb7b2415ed9f2d2770749f8449220a6196b56 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -457,25 +457,25 @@ void AliTPCv3::CreateGeometry()
   // end caps - they are make as an assembly of single segments
   // containing both readout chambers
   //
-  Double_t OpeningAngle = 10.*TMath::DegToRad();
+  Double_t openingAngle = 10.*TMath::DegToRad();
   Double_t thick=1.5; // rib
-  Double_t shift = thick/TMath::Sin(OpeningAngle);
+  Double_t shift = thick/TMath::Sin(openingAngle);
   //
-  Double_t LowEdge = 86.3; // hole in the wheel
-  Double_t UpEdge = 240.4; // hole in the wheel
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
   //
   new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
   //
   TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
   //
-  hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift);
-  hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift);
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
   //
-  hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift);
-  hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift);
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
   //
-  Double_t ys = shift*TMath::Sin(OpeningAngle); 
-  Double_t xs = shift*TMath::Cos(OpeningAngle);
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
   TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
   tr->RegisterYourself();
   TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
@@ -701,11 +701,11 @@ void AliTPCv3::CreateGeometry()
    *rot=rot1*rot2;
    //
    Double_t x0,y0;
-   x0=110.2*TMath::Cos(OpeningAngle);
-   y0=110.2*TMath::Sin(OpeningAngle);
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
-   x0=188.45*TMath::Cos(OpeningAngle);
-   y0=188.45*TMath::Sin(OpeningAngle);
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
    TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
    //
    sect->AddNode(ch,1);
@@ -738,7 +738,7 @@ void AliTPCv3::CreateGeometry()
   TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
   thick=1.;
-  shift = thick/TMath::Sin(OpeningAngle);
+  shift = thick/TMath::Sin(openingAngle);
   TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
   sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
@@ -752,8 +752,8 @@ void AliTPCv3::CreateGeometry()
   //
   shv->AddNode(elv,1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
   // cover
   TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
@@ -762,14 +762,14 @@ void AliTPCv3::CreateGeometry()
   TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
   // hole in a cover
   TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
-  shift=4./TMath::Sin(OpeningAngle);
+  shift=4./TMath::Sin(openingAngle);
   coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
   coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
   //
   TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);  
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
   cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
   //
   // Sector as an Assembly