Fixing the (main part of) coding conventions.
authorbelikov <belikov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 3 Jun 2013 09:44:36 +0000 (09:44 +0000)
committerbelikov <belikov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 3 Jun 2013 09:44:36 +0000 (09:44 +0000)
ITS/UPGRADE/AliITSUv0.h
ITS/UPGRADE/AliITSUv0Layer.cxx
ITS/UPGRADE/AliITSUv0Layer.h

index 6a7ee05..cb1cede 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ALIITSVUV0_H
-#define ALIITSVUV0_H
+#ifndef ALIITSUV0_H
+#define ALIITSUV0_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
index 8347090..de20a75 100644 (file)
@@ -485,7 +485,7 @@ TGeoVolume* AliITSUv0Layer::CreateStaveStruct(const Double_t xlad,
 //________________________________________________________________________\r
 TGeoVolume* AliITSUv0Layer::CreateStaveModelDummy(const Double_t ,\r
                                              const Double_t ,\r
-                                             const TGeoManager *){\r
+                                             const TGeoManager *) const {\r
 //\r
 // Create dummy stave\r
 //\r
@@ -1018,11 +1018,11 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel21(const Double_t xlad,
 \r
      //Amec Thermasol red-2 cover tube FGS300\r
     TGeoConeSeg *cons1 = new TGeoConeSeg(kStaveLength-0.50,kConeOutRadius,kConeOutRadius+kLay1,kConeOutRadius,kConeOutRadius+kLay1,0,180);\r
-    TGeoVolume *Cone11 = new TGeoVolume("ThermasolPipeCover",cons1,medFGS003);\r
-    Cone11->SetFillColor(2);\r
-    Cone11->SetLineColor(2);\r
-    mechLaddVol->AddNode(Cone11,1,new TGeoCombiTrans(x+0.25,y,z,new TGeoRotation("Cone11",0,0,0)));\r
-    mechLaddVol->AddNode(Cone11,2,new TGeoCombiTrans(x-0.25,y,z,new TGeoRotation("Cone11",0,0,0)));\r
+    TGeoVolume *cone11 = new TGeoVolume("ThermasolPipeCover",cons1,medFGS003);\r
+    cone11->SetFillColor(2);\r
+    cone11->SetLineColor(2);\r
+    mechLaddVol->AddNode(cone11,1,new TGeoCombiTrans(x+0.25,y,z,new TGeoRotation("Cone11",0,0,0)));\r
+    mechLaddVol->AddNode(cone11,2,new TGeoCombiTrans(x-0.25,y,z,new TGeoRotation("Cone11",0,0,0)));\r
 \r
     TGeoBBox *box2 = new TGeoBBox((0.50-(2*kConeOutRadius))/2,kLay1/2,kStaveLength-0.50);\r
     TGeoVolume *plate2 = new TGeoVolume("ThermasolMiddle",box2,medFGS003);\r
@@ -1048,11 +1048,11 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel21(const Double_t xlad,
 \r
     //C Fleece\r
     TGeoConeSeg *cons2 = new TGeoConeSeg(kStaveLength-0.50,kConeOutRadius+kLay1,kConeOutRadius+kLay1+kLay2,kConeOutRadius+kLay1,kConeOutRadius+kLay1+kLay2,0,180); \r
-    TGeoVolume *Cone12 = new TGeoVolume("CFleecePipeCover",cons2,medCarbonFleece);\r
-    Cone12->SetFillColor(28);\r
-    Cone12->SetLineColor(28);\r
-    mechLaddVol->AddNode(Cone12,1,new TGeoCombiTrans(x+0.25,y,z,new TGeoRotation("Cone12",0,0,0)));\r
-    mechLaddVol->AddNode(Cone12,2,new TGeoCombiTrans(x-0.25,y,z,new TGeoRotation("Cone12",0,0,0)));\r
+    TGeoVolume *cone12 = new TGeoVolume("CFleecePipeCover",cons2,medCarbonFleece);\r
+    cone12->SetFillColor(28);\r
+    cone12->SetLineColor(28);\r
+    mechLaddVol->AddNode(cone12,1,new TGeoCombiTrans(x+0.25,y,z,new TGeoRotation("Cone12",0,0,0)));\r
+    mechLaddVol->AddNode(cone12,2,new TGeoCombiTrans(x-0.25,y,z,new TGeoRotation("Cone12",0,0,0)));\r
 \r
     TGeoBBox *box3 = new TGeoBBox((0.50-(2*(kConeOutRadius+kLay1)))/2,kLay2/2,kStaveLength-0.50);\r
     TGeoVolume *plate3 = new TGeoVolume("CFleeceMiddle",box3,medCarbonFleece);\r
@@ -1398,19 +1398,19 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel3(const Double_t xlad,
     Double_t kConeOutRadius = 0.15/2;\r
     Double_t kStaveLength = zlad*2;\r
     Double_t kStaveWidth = xlad*2;\r
-    Double_t W = kStaveWidth/4;//1/2 of W\r
-    Double_t stave_height = 0.3;\r
-    Double_t H = stave_height/2;\r
+    Double_t w = kStaveWidth/4;//1/2 of W\r
+    Double_t staveHeight = 0.3;\r
+    Double_t h = staveHeight/2;\r
     Double_t alpha = 90-33.;//90-30;\r
     Double_t the1 = alpha*TMath::DegToRad();\r
-    Double_t s1 = W/TMath::Sin(the1);\r
-    Double_t L = W/TMath::Tan(the1);\r
-    Double_t s2 = TMath::Sqrt(H*H + s1*s1);//TMath::Sin(the2);\r
-    Double_t the2 = TMath::ATan(H/s1);\r
+    Double_t s1 = w/TMath::Sin(the1);\r
+    Double_t l = w/TMath::Tan(the1);\r
+    Double_t s2 = TMath::Sqrt(h*h + s1*s1);//TMath::Sin(the2);\r
+    Double_t the2 = TMath::ATan(h/s1);\r
     Double_t beta = the2*TMath::RadToDeg();\r
     Double_t klay4 = 0.007; //Glue\r
     Double_t klay5 = 0.01; //Flexcable\r
-    Int_t  loop = (kStaveLength/(2*L))/2;\r
+    Int_t  loop = (kStaveLength/(2*l))/2;\r
     Double_t hh = 0.01;\r
        Double_t ang1 = 0*TMath::DegToRad();\r
        Double_t ang2 = 0*TMath::DegToRad();\r
@@ -1436,7 +1436,7 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel3(const Double_t xlad,
     Double_t z=0, y=0-0.007, x=0;\r
 \r
     // Polimide micro channels numbers\r
-    Double_t yMC = y-H+0.01;\r
+    Double_t yMC = y-h+0.01;\r
     Int_t nb = (Int_t)(kStaveWidth/0.1)+1;\r
     Double_t xladMC = (nb*0.1-0.08)/2;\r
 \r
@@ -1446,7 +1446,7 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel3(const Double_t xlad,
       // world (trapezoid)\r
       TGeoXtru *mechStruct = new TGeoXtru(2); //z sections\r
       Double_t xv[5] = {kStaveWidth/2+0.1,kStaveWidth/2+0.1,0,-kStaveWidth/2-0.1,-kStaveWidth/2-0.1};\r
-      Double_t yv[5] = {-kConeOutRadius*2-0.07,0,stave_height,0,-kConeOutRadius*2-0.07};    \r
+      Double_t yv[5] = {-kConeOutRadius*2-0.07,0,staveHeight,0,-kConeOutRadius*2-0.07};    \r
       mechStruct->DefinePolygon(5,xv,yv);\r
       mechStruct->DefineSection(0,-kStaveLength-0.1,0,0,1.);\r
       mechStruct->DefineSection(1,kStaveLength+0.1,0,0,1.);\r
@@ -1662,16 +1662,16 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel3(const Double_t xlad,
       volT1->SetFillColor(12); \r
       for(int i=0;i<loop;i++){//i<30;i++){\r
                mechLaddVol->AddNode(volT1,4*i+0,\r
-                                   new TGeoCombiTrans(x+W,y-H+0.04+filHeight/2,z-kStaveLength/2+(4*L*i)+s1/2, \r
+                                   new TGeoCombiTrans(x+w,y-h+0.04+filHeight/2,z-kStaveLength/2+(4*l*i)+s1/2, \r
                                                       new TGeoRotation("volT1",-90,alpha,0)));\r
        mechLaddVol->AddNode(volT1,4*i+1,\r
-                                   new TGeoCombiTrans(x-W,y-H+0.04+filHeight/2,z-kStaveLength/2+(4*L*i)+s1/2, \r
+                                   new TGeoCombiTrans(x-w,y-h+0.04+filHeight/2,z-kStaveLength/2+(4*l*i)+s1/2, \r
                                                       new TGeoRotation("volT1",90,alpha,0)));\r
        mechLaddVol->AddNode(volT1,4*i+2,\r
-                                   new TGeoCombiTrans(x+W,y-H+0.04+filHeight/2,z-kStaveLength/2+2*L+(i*4*L)+s1/2, \r
+                                   new TGeoCombiTrans(x+w,y-h+0.04+filHeight/2,z-kStaveLength/2+2*l+(i*4*l)+s1/2, \r
                                                       new TGeoRotation("volT1",-90,-alpha,0)));\r
        mechLaddVol->AddNode(volT1,4*i+3,\r
-                                   new TGeoCombiTrans(x-W,y-H+0.04+filHeight/2,z-kStaveLength/2+2*L+(i*4*L)+s1/2, \r
+                                   new TGeoCombiTrans(x-w,y-h+0.04+filHeight/2,z-kStaveLength/2+2*l+(i*4*l)+s1/2, \r
                                                       new TGeoRotation("volT1",-90,+alpha,0)));\r
        }\r
  \r
@@ -1683,16 +1683,16 @@ TGeoVolume* AliITSUv0Layer::CreateStaveModel3(const Double_t xlad,
       volT2->SetFillColor(12); \r
       for(int i=0;i<loop;i++){ //i<30;i++){\r
                mechLaddVol->AddNode(volT2,4*i+0,\r
-                                   new TGeoCombiTrans(x+W,y+0.04+filHeight/2,z-kStaveLength/2+(i*4*L)+s1/2,\r
+                                   new TGeoCombiTrans(x+w,y+0.04+filHeight/2,z-kStaveLength/2+(i*4*l)+s1/2,\r
                                                       new TGeoRotation("volT2",90,90-alpha,90-beta)));\r
        mechLaddVol->AddNode(volT2,4*i+1,\r
-                                   new TGeoCombiTrans(x-W,y+0.04+filHeight/2,z-kStaveLength/2+(i*4*L)+s1/2,\r
+                                   new TGeoCombiTrans(x-w,y+0.04+filHeight/2,z-kStaveLength/2+(i*4*l)+s1/2,\r
                                                       new TGeoRotation("volT2",90,-90+alpha,-90+beta)));\r
        mechLaddVol->AddNode(volT2,4*i+2,\r
-                                   new TGeoCombiTrans(x+W,y+0.04+filHeight/2,z-kStaveLength/2+2*L+(i*4*L)+s1/2,\r
+                                   new TGeoCombiTrans(x+w,y+0.04+filHeight/2,z-kStaveLength/2+2*l+(i*4*l)+s1/2,\r
                                                       new TGeoRotation("volT2",90,-90+alpha,90-beta)));\r
        mechLaddVol->AddNode(volT2,4*i+3,\r
-                                   new TGeoCombiTrans(x-W,y+0.04+filHeight/2,z-kStaveLength/2+2*L+(i*4*L)+s1/2, \r
+                                   new TGeoCombiTrans(x-w,y+0.04+filHeight/2,z-kStaveLength/2+2*l+(i*4*l)+s1/2, \r
                                                       new TGeoRotation("volT2",90,90-alpha,-90+beta)));\r
        }\r
     }\r
index af6b1bf..3213274 100644 (file)
@@ -36,7 +36,7 @@ class AliITSUv0Layer : public AliITSv11Geometry {
     AliITSUv0Layer& operator=(const AliITSUv0Layer &source);
     virtual ~AliITSUv0Layer();
     //
-    Bool_t    IsTurbo() {return fIsTurbo;};
+    Bool_t    IsTurbo() const {return fIsTurbo;};
 
     Double_t  GetLadderThick() const {return fLadderThick;};
     Double_t  GetLadderTilt()  const {return fLadderTilt;};
@@ -75,7 +75,7 @@ class AliITSUv0Layer : public AliITSv11Geometry {
 
 
     TGeoVolume* CreateStaveStruct(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);
-    TGeoVolume* CreateStaveModelDummy(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);
+    TGeoVolume* CreateStaveModelDummy(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager) const;
     TGeoVolume* CreateStaveModel0(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);
     TGeoVolume* CreateStaveModel1(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);
     TGeoVolume* CreateStaveModel21(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);