Coding conventions (M. Sitta)
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 9 Mar 2011 22:21:44 +0000 (22:21 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 9 Mar 2011 22:21:44 +0000 (22:21 +0000)
ITS/AliITSv11GeometrySDD.cxx
ITS/AliITSv11GeometrySDD.h
ITS/AliITSv11GeometrySPD.cxx
ITS/AliITSv11GeometrySPD.h
ITS/AliITSv11GeometrySupport.cxx
ITS/AliITSv11GeometrySupport.h

index 162e4b5..8c79f63 100755 (executable)
@@ -5593,7 +5593,7 @@ TGeoPcon* AliITSv11GeometrySDD::CreateConeConstSection(Double_t r1max, Double_t
 
 //________________________________________________________________________
 Double_t AliITSv11GeometrySDD::GetConeZ(Double_t r, Double_t refR1, Double_t refR2, 
-                                       Double_t refZ1, Double_t refZ2) {
+                                       Double_t refZ1, Double_t refZ2) const {
   // just a helping function
   return refZ1+(refZ2-refZ1)*(r-refR1)/(refR2-refR1);
 }
index 8cce5fb..a70a604 100755 (executable)
@@ -99,7 +99,7 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
 
   void                         CreateBasicObjects();
   Double_t                     GetConeZ(Double_t r, Double_t refR1, Double_t refR2,
-                                       Double_t refZ1, Double_t refZ2);
+                                       Double_t refZ1, Double_t refZ2) const;
   TGeoPcon*                    CreateConeConstSection(Double_t r1max, Double_t z1,
                                                      Double_t r2max, Double_t z2,
                                                      Double_t section, Int_t nDiv=1);
index 1f37c6f..266a872 100644 (file)
@@ -213,7 +213,7 @@ AliITSv11GeometrySPD& AliITSv11GeometrySPD::operator=(const
 }
 //______________________________________________________________________
 TGeoMedium* AliITSv11GeometrySPD::GetMedium(const char* mediumName,
-                                            TGeoManager *mgr) const
+                                            const TGeoManager *mgr) const
 {
     //
     // This function is used to recovery any medium
@@ -3692,9 +3692,9 @@ void AliITSv11GeometrySPD::ReadAscii(istream* is)
     //   none.
     //
     Int_t i,j,k,n;
-    Double_t gapLadder,GapHalfStave;
+    Double_t gapLadder,gapHalfStave;
     const Int_t kLimits = 100;
-    *is>>gapLadder>>GapHalfStave>>n;
+    *is>>gapLadder>>gapHalfStave>>n;
     if(n!=6){
       AliError(Form("fAddStave Array !=6 n=%d",n));
         return;
index 888631b..c7f0244 100644 (file)
@@ -54,7 +54,7 @@ class AliITSv11GeometrySPD : public AliITSv11Geometry
         {return (lay==1) ? GetSenstiveVolumeName1():GetSenstiveVolumeName2();}
     // get medium
     virtual TGeoMedium* GetMedium(const char* mediumName,
-                                  TGeoManager *mgr = gGeoManager) const;
+                                  const TGeoManager *mgr = gGeoManager) const;
     // retrieve the mounting location and rotation needed to mount an SPD stave
     virtual Int_t GetSPDsectorX0Size() const
         {return fSPDsectorX0.GetSize();}
index cbfc0be..0318b52 100644 (file)
@@ -42,7 +42,7 @@ ClassImp(AliITSv11GeometrySupport)
 #define SQ(A) (A)*(A)
 
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SPDCone(TGeoVolume *moth,TGeoManager *mgr)
+void AliITSv11GeometrySupport::SPDCone(TGeoVolume *moth,const TGeoManager *mgr)
 {
 //
 // Creates the SPD thermal shield as a volume assembly
@@ -503,7 +503,7 @@ void AliITSv11GeometrySupport::SPDCone(TGeoVolume *moth,TGeoManager *mgr)
 void AliITSv11GeometrySupport::CreateSPDThermalShape(
      Double_t ina, Double_t inb, Double_t inr,
      Double_t oua, Double_t oub, Double_t our,
-     Double_t   t, Double_t *x , Double_t *y )
+     Double_t   t, Double_t *x , Double_t *y ) const
 {
 //
 // Creates the proper sequence of X and Y coordinates to determine
@@ -773,7 +773,7 @@ void AliITSv11GeometrySupport::ReflectPoint(Double_t x1, Double_t y1,
 }
 
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth,TGeoManager *mgr)
+void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth,const TGeoManager *mgr)
 {
 //
 // Creates the SDD support cone and cylinder geometry as a
@@ -1724,7 +1724,7 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth,TGeoManager *mgr)
 }
 
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth,TGeoManager *mgr)
+void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth,const TGeoManager *mgr)
 {
 //
 // Creates the SSD support cone and cylinder geometry. as a
@@ -2517,7 +2517,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::TraySupportsSideA(TGeoVolume *moth,
-                                                TGeoManager *mgr){
+                                          const TGeoManager *mgr){
 //
 // Creates the structure supporting the ITS cable trays on Side A
 //
@@ -3329,7 +3329,7 @@ void AliITSv11GeometrySupport::ServicesCableSupportSSD(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::SPDCableTraysSideA(TGeoVolume *moth,
-                                                 TGeoManager *mgr){
+                                           const TGeoManager *mgr){
 //
 // Creates the SPD cable trays which are outside the ITS support cones
 // but still inside the TPC on Side A
@@ -4287,7 +4287,7 @@ void AliITSv11GeometrySupport::SPDCableTraysSideA(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::SPDCableTraysSideC(TGeoVolume *moth,
-                                                 TGeoManager *mgr){
+                                           const TGeoManager *mgr){
 //
 // Creates the SPD cable trays which are outside the ITS support cones
 // but still inside the TPC on Side C
@@ -5826,7 +5826,7 @@ void AliITSv11GeometrySupport::SDDCableTraysSideA(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::SDDCableTraysSideC(TGeoVolume *moth,
-                                                 TGeoManager *mgr){
+                                           const TGeoManager *mgr){
 //
 // Creates the SDD cable trays which are outside the ITS support cones
 // but still inside the TPC on Side C
@@ -6561,7 +6561,7 @@ void AliITSv11GeometrySupport::SDDCableTraysSideC(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::SSDCableTraysSideA(TGeoVolume *moth,
-                                                 TGeoManager *mgr){
+                                           const TGeoManager *mgr){
 //
 // Creates the SSD cable trays which are outside the ITS support cones
 // but still inside the TPC on Side A
@@ -7101,7 +7101,7 @@ void AliITSv11GeometrySupport::SSDCableTraysSideA(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::SSDCableTraysSideC(TGeoVolume *moth,
-                                                 TGeoManager *mgr){
+                                           const TGeoManager *mgr){
 //
 // Creates the SSD cable trays which are outside the ITS support cones
 // but still inside the TPC on Side C
@@ -7301,7 +7301,7 @@ void AliITSv11GeometrySupport::SSDCableTraysSideC(TGeoVolume *moth,
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::CreateSDDForwardTraySideA(TGeoVolumeAssembly *tray,
-                                                        TGeoManager *mgr){
+                                                  const TGeoManager *mgr){
 //
 // Creates the forward SDD tray on Side A (0872/G/D/01)
 //
@@ -7908,8 +7908,8 @@ TGeoXtru* AliITSv11GeometrySupport::CreateSDDSSDTraysSideA(
 
 //______________________________________________________________________
 TGeoVolumeAssembly* AliITSv11GeometrySupport::CreateSDDSSDTraysSideC(
-                                                       const char *trayName,
-                                                       TGeoManager *mgr){
+                                                      const char *trayName,
+                                                      const TGeoManager *mgr){
 
 //
 // Creates the SDD and SSD Trays on Side C which are supposedly identical
@@ -8314,7 +8314,7 @@ TGeoVolumeAssembly* AliITSv11GeometrySupport::CreateSDDSSDTraysSideC(
 
 //______________________________________________________________________
 void AliITSv11GeometrySupport::ITSTPCSupports(TGeoVolume *moth,
-                                             TGeoManager *mgr){
+                                       const TGeoManager *mgr){
 //
 // Creates the elements suspending the ITS to the TPC and other fixed
 // elements used to hook the rails (0872/C and its daughters)
index 3aace25..04889e9 100644 (file)
@@ -29,9 +29,9 @@ class AliITSv11GeometrySupport : public AliITSv11Geometry {
     AliITSv11GeometrySupport(Int_t debug):AliITSv11Geometry(debug){};
     virtual ~AliITSv11GeometrySupport(){};
     //
-    virtual void SPDCone(TGeoVolume *moth,TGeoManager *mgr=gGeoManager);
-    virtual void SDDCone(TGeoVolume *moth,TGeoManager *mgr=gGeoManager);
-    virtual void SSDCone(TGeoVolume *moth,TGeoManager *mgr=gGeoManager);
+    virtual void SPDCone(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    virtual void SDDCone(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    virtual void SSDCone(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
     virtual void ServicesCableSupport(TGeoVolume *moth,
                                       TGeoManager *mgr=gGeoManager);
     virtual void ServicesCableSupportSPD(TGeoVolume *moth,
@@ -41,13 +41,13 @@ class AliITSv11GeometrySupport : public AliITSv11Geometry {
     virtual void ServicesCableSupportSSD(TGeoVolume *moth,
                                         TGeoManager *mgr=gGeoManager);
     virtual void ITSTPCSupports(TGeoVolume *moth,
-                               TGeoManager *mgr=gGeoManager);
+                               const TGeoManager *mgr=gGeoManager);
 
 
   private:
     void CreateSPDThermalShape(Double_t ina, Double_t inb, Double_t inr,
                               Double_t oua, Double_t oub, Double_t our,
-                              Double_t   t, Double_t *x , Double_t *y );
+                              Double_t   t, Double_t *x , Double_t *y ) const;
     void CreateSPDOmegaShape(const Double_t *xin, const Double_t *yin, Double_t  d,
                             Double_t   *x, Double_t *y);
     void FillSPDXtruShape(Double_t a, Double_t  b, Double_t  r,
@@ -59,15 +59,16 @@ class AliITSv11GeometrySupport : public AliITSv11Geometry {
     void ReflectPoint(Double_t x1, Double_t y1, Double_t x2, Double_t y2,
                      Double_t x3, Double_t y3, Double_t &x, Double_t &y) const;
 
-    void  TraySupportsSideA(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
-    void SPDCableTraysSideA(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
-    void SPDCableTraysSideC(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
+    void  TraySupportsSideA(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    void SPDCableTraysSideA(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    void SPDCableTraysSideC(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
     void SDDCableTraysSideA(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
-    void SDDCableTraysSideC(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
-    void SSDCableTraysSideA(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
-    void SSDCableTraysSideC(TGeoVolume *moth, TGeoManager *mgr=gGeoManager);
+    void SDDCableTraysSideC(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    void SSDCableTraysSideA(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
+    void SSDCableTraysSideC(TGeoVolume *moth,const TGeoManager *mgr=gGeoManager);
 
-    void CreateSDDForwardTraySideA(TGeoVolumeAssembly *tray, TGeoManager *mgr);
+    void CreateSDDForwardTraySideA(TGeoVolumeAssembly *tray,
+                                  const TGeoManager *mgr);
 
     TGeoCompositeShape* CreateTrayAForwardCover(const Double_t coverLen);
     TGeoCompositeShape* CreateTrayAExternalCover(const Double_t coverLen);
@@ -79,7 +80,7 @@ class AliITSv11GeometrySupport : public AliITSv11Geometry {
                                     const Double_t trayHi);
 
     TGeoVolumeAssembly* CreateSDDSSDTraysSideC(const char *trayName,
-                                              TGeoManager *mgr=gGeoManager);
+                                        const TGeoManager *mgr=gGeoManager);
 
     ClassDef(AliITSv11GeometrySupport,1) // ITS v11 Support geometry
 };