Fixed up some copy constructors, removed some unused variable warnings and

replace AliModule with AliITS.

diff --git a/ITS/AliITSBaseGeometry.cxx b/ITS/AliITSBaseGeometry.cxx
index 07e4bd9a7c75973e187c7011227bede8bee6571e..c983bba6adcbacc406d95a5c04007eb8345af751 100644 (file)
--- a/ITS/AliITSBaseGeometry.cxx
+++ b/ITS/AliITSBaseGeometry.cxx
@@ -77,7 +77,7 @@ AliITSBaseGeometry::AliITSBaseGeometry(){
     fNCreates++; // incrament this creation counter.
 }
 //______________________________________________________________________
-AliITSBaseGeometry::AliITSBaseGeometry(AliModule *its,Int_t iflag){
+AliITSBaseGeometry::AliITSBaseGeometry(AliITS *its,Int_t iflag){
     // Standard construtor for the ITS Base Geometry class.
     // Inputs:
     //    Int_t iflag  flag to indecate specific swiches in the geometry
@@ -86,6 +86,7 @@ AliITSBaseGeometry::AliITSBaseGeometry(AliModule *its,Int_t iflag){
     // Return:
     //    none.
 
+    fScale = iflag; // remove warning message for unused variable
     fScale = 1.0; // Default value.
     fits = its; // get a copy of the pointer to the ITS.
     if(fNCreates==0){ // only for very first init
@@ -283,6 +284,7 @@ void AliITSBaseGeometry::Box(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[3];
 
+    AddVolName(dis);
     param[0] = fScale*dx;
     param[1] = fScale*dy;
     param[2] = fScale*dz;
@@ -341,6 +343,7 @@ void AliITSBaseGeometry::Trapezoid1(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[4];
 
+    AddVolName(dis);
     param[0] = fScale*dxn;
     param[1] = fScale*dxp;
     param[2] = fScale*dy;
@@ -404,6 +407,7 @@ void AliITSBaseGeometry::Trapezoid2(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[5];
 
+    AddVolName(dis);
     param[0] = fScale*dxn;
     param[1] = fScale*dxp;
     param[2] = fScale*dyn;
@@ -492,6 +496,7 @@ void AliITSBaseGeometry::Trapezoid(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[11];
 
+    AddVolName(dis);
     param[0] = fScale*dz;
     param[1] = thet;
     param[2] = phi;
@@ -649,6 +654,7 @@ void AliITSBaseGeometry::TwistedTrapezoid(const char *gnam,
     char name[5];
     Float_t param[12];
 
+    AddVolName(dis);
     param[0] = fScale*dz;
     param[1] = thet;
     param[2] = phi;
@@ -775,6 +781,7 @@ void AliITSBaseGeometry::Tube(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[3];
 
+    AddVolName(dis);
     param[0] = fScale*rmin;
     param[1] = fScale*rmax;
     param[2] = fScale*dz;
@@ -833,6 +840,7 @@ void AliITSBaseGeometry::TubeSegment(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[5];
 
+    AddVolName(dis);
     param[0] = fScale*rmin;
     param[1] = fScale*rmax;
     param[2] = fScale*dz;
@@ -911,6 +919,7 @@ void AliITSBaseGeometry::CutTube(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[11];
 
+    AddVolName(dis);
     param[0] = fScale*rmin;
     param[1] = fScale*rmax;
     param[2] = fScale*dz;
@@ -984,6 +993,7 @@ void AliITSBaseGeometry::TubeElliptical(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[3];
 
+    AddVolName(dis);
     param[0] = fScale*p1;
     param[1] = fScale*p2;
     param[2] = fScale*dz;
@@ -1046,6 +1056,7 @@ void AliITSBaseGeometry::HyperbolicTube(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[4];
 
+    AddVolName(dis);
     param[0] = fScale*rmin;
     param[1] = fScale*rmax;
     param[2] = fScale*dz;
@@ -1109,6 +1120,7 @@ void AliITSBaseGeometry::Cone(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[5];
 
+    AddVolName(dis);
     param[0] = fScale*dz;
     param[1] = fScale*rmin1;
     param[2] = fScale*rmax1;
@@ -1175,6 +1187,7 @@ void AliITSBaseGeometry::ConeSegment(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[7];
 
+    AddVolName(dis);
     param[0] = fScale*dz;
     param[1] = fScale*rmin1;
     param[2] = fScale*rmax1;
@@ -1251,6 +1264,7 @@ void AliITSBaseGeometry::PolyCone(const char *gnam,const TString &dis,
     Float_t *param;
     Int_t n,i;
 
+    AddVolName(dis);
     n = 3+3*nz;
     param = new Float_t[n];
     param[0] = phi1;
@@ -1328,6 +1342,7 @@ void AliITSBaseGeometry::Sphere(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[6];
 
+    AddVolName(dis);
     param[0] = fScale*rmin;
     param[1] = fScale*rmax;
     param[2] = the1;
@@ -1397,6 +1412,7 @@ void AliITSBaseGeometry::Parallelepiped(const char *gnam,const TString &dis,
     char name[5];
     Float_t param[6];
 
+    AddVolName(dis);
     param[0] = fScale*dx;
     param[1] = fScale*dy;
     param[2] = fScale*dz;
@@ -1474,6 +1490,7 @@ void AliITSBaseGeometry::PolyGon(const char *gnam,const TString &dis,
     Float_t *param;
     Int_t n,i;
 
+    AddVolName(dis);
     n = 4+3*nz;
     param = new Float_t[n];
     param[0] = phi1;

diff --git a/ITS/AliITSBaseGeometry.h b/ITS/AliITSBaseGeometry.h
index 210875bdd8691ecae1d6691a70cca91d50bf8ab3..980f4e82cae56f9dec8feda6ed64bef91558c823 100644 (file)
--- a/ITS/AliITSBaseGeometry.h
+++ b/ITS/AliITSBaseGeometry.h
@@ -533,7 +533,7 @@ class AliITSPConeData : public AliITSBaseVolParams {
     AliITSPConeData(Int_t n) : AliITSBaseVolParams() // Standard constructor
        {fNz=n;fPhi0=0.0;fDphi=360.0;fZ=new Double_t[n];
        fRmin=new Double_t[n];fRmax=new Double_t[n];}
-    AliITSPConeData(AliITSPConeData &source) // Copy constructor
+    AliITSPConeData(AliITSPConeData &source) : AliITSBaseVolParams(source) // Copy constructor
        { *this = source;}
     virtual ~AliITSPConeData() // Standard destructor
        {delete[] fZ;delete[] fRmin;delete[] fRmax;fNz=0;}
@@ -695,7 +695,7 @@ class AliITSPGonData : public AliITSBaseVolParams {
     AliITSPGonData(Int_t n) : AliITSBaseVolParams() // Standard constructor
        {fNz=n;fNphi=0;fPhi0=0.0;fDphi=360.0;fZ=new Double_t[n];
        fRmin=new Double_t[n];fRmax=new Double_t[n];}
-    AliITSPGonData(AliITSPGonData &source) // Copy constructor
+    AliITSPGonData(AliITSPGonData &source) : AliITSBaseVolParams(source) // Copy constructor
        { *this = source;}
     virtual ~AliITSPGonData() // Standard destructor
        {delete[] fZ;delete[] fRmin;delete[] fRmax;fNz=0;}
@@ -768,15 +768,15 @@ istream &operator>>(istream &os,AliITSPGonData &source);
 //  A basic geometry class for the ITS simulation geometry stucture
 /////////////////////////////////////////////////////////////////////////
 #include <TObject.h>
+#include "AliITS.h"
 
-#include "AliModule.h"
 class TString;
 class TVector3;
 
 class AliITSBaseGeometry : public TObject {
  public:
     AliITSBaseGeometry(); // Default constructor
-    AliITSBaseGeometry(AliModule *its,Int_t iflag); // Standard Constructor
+    AliITSBaseGeometry(AliITS *its,Int_t iflag); // Standard Constructor
     virtual ~AliITSBaseGeometry(); // Destructor
     virtual void BuildDisplayGeometry(){}; // Calls ROOT geometry interface
                                       // to AliRoot display
@@ -955,7 +955,7 @@ class AliITSBaseGeometry : public TObject {
     static Int_t fVolNameSize; // Size of Array fVolName
     static Int_t fVolNameLast; // Last filled element of fVolName
     Double_t fScale; // Scale factor (=1=>[cm]).
-    AliModule *fits; // local pointer to ITS module needed for AliMixture...
+    AliITS *fits; // local pointer to ITS module needed for AliMixture...
 
     ClassDef(AliITSBaseGeometry,1) // Basic ITS Geometry class
 };