Correct syntax accepted by g++ but not standard for static members, remove minor...

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index f17b0baaa23ee1e8640a8aedc0b3e0749e182d08..39dd1f54aa41119d37a02c8712ae1b5659a3e091 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -225,11 +225,11 @@ class AliITS : public AliDetector {
 
     inline void GetGeometryVersion(Int_t &a,Int_t &b)
       {a = fMajorVersion;b=fMinorVersion;return;}
-    inline virtual Int_t  IsVersion() {return 1;}
+           virtual Int_t  IsVersion() const {return 1;}
                    Int_t  DistancetoPrimitive(Int_t px, Int_t py);
            virtual void   Init();
            virtual void   MakeBranch(Option_t *opt=" ");
-    inline virtual void   SetEUCLID(Bool_t euclid=1){fEuclidOut = euclid;}
+           virtual void   SetEUCLID(Bool_t euclid=1) {fEuclidOut = euclid;}
            virtual void   StepManager()=0;
     //
     // ITS geometry functions

diff --git a/ITS/AliITSgeom.cxx b/ITS/AliITSgeom.cxx
index 322e82f3908760709a400f137cf57c610e330d3b..872e9b3c371d216a6e18eb1d40f0d6e1d19e6228 100644 (file)
--- a/ITS/AliITSgeom.cxx
+++ b/ITS/AliITSgeom.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:20  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////
@@ -87,7 +90,7 @@ AliITSgeom::AliITSgeom(const char *filename){
    ITS_geom *g;
    Int_t    l,a,d;
    Float_t  x,y,z,o,p,q,r,s,t;
-   Double_t or,pr,qr,rr,sr,tr; // Radians
+   Double_t oor,pr,qr,rr,sr,tr; // Radians
    Double_t lr[9];
    Double_t si; // sin(angle)
    Double_t PI = TMath::Pi(), byPI = PI/180.;
@@ -140,7 +143,7 @@ AliITSgeom::AliITSgeom(const char *filename){
       i = d + a*fNdet[l]; // position of this detector
       g = &(fg[l][i]);
 
-      or = byPI*o;
+      oor = byPI*o;
       pr = byPI*p;
       qr = byPI*q;
       rr = byPI*r;
@@ -150,12 +153,12 @@ AliITSgeom::AliITSgeom(const char *filename){
       g->fx0   = x;
       g->fy0   = y;
       g->fz0   = z;
-      si    = sin(or);if(o== 90.0) si = +1.0;
+      si    = sin(oor);if(o== 90.0) si = +1.0;
                       if(o==270.0) si = -1.0;
                       if(o==  0.0||o==180.) si = 0.0;
       lr[0] = si * cos(pr);
       lr[1] = si * sin(pr);
-      lr[2] = cos(or);if(o== 90.0||o==270.) lr[2] = 0.0;
+      lr[2] = cos(oor);if(o== 90.0||o==270.) lr[2] = 0.0;
                       if(o== 0.0)           lr[2] = +1.0;
                       if(o==180.0)          lr[2] = -1.0;
       si    =  sin(qr);if(q== 90.0) si = +1.0; 
@@ -182,10 +185,10 @@ AliITSgeom::AliITSgeom(const char *filename){
          for(d=0;d<3;d++) g->fr[3*a+d] = lr[3*a+d] = si*lr[3*a+d];
       } // end for a
       // get angles from matrix up to a phase of 180 degrees.
-      or     = atan2(lr[7],lr[8]);if(or<0.0) or += 2.0*PI;
+      oor     = atan2(lr[7],lr[8]);if(oor<0.0) oor += 2.0*PI;
       pr     = asin(lr[2]);       if(pr<0.0) pr += 2.0*PI;
       qr     = atan2(lr[3],lr[0]);if(qr<0.0) qr += 2.0*PI;
-      g->frx = or;
+      g->frx = oor;
       g->fry = pr;
       g->frz = qr;
       // l = layer-1 at this point.
@@ -306,7 +309,7 @@ void AliITSgeom::GtoL(const Int_t *id,const Float_t *g,Float_t *l){
    return;
 }
 //________________________________________________________________________
-void AliITSgeom::GtoL(Int_t index,const Float_t *g,Float_t *l){
+void AliITSgeom::GtoL(const Int_t index,const Float_t *g,Float_t *l){
 ////////////////////////////////////////////////////////////////////////
 //     The function that does the local active volume detector Cartesian
 // coordinate to global ALICE Cartesian coordinate transformation.
@@ -391,7 +394,7 @@ void AliITSgeom::LtoG(const Int_t *id,const Float_t *l,Float_t *g){
    return;
 }
 //________________________________________________________________________
-void AliITSgeom::LtoG(Int_t index,const Float_t *l,Float_t *g){
+void AliITSgeom::LtoG(const Int_t index,const Float_t *l,Float_t *g){
 ////////////////////////////////////////////////////////////////////////
 //     The function that does the local active volume detector Cartesian
 // coordinate to global ALICE Cartesian coordinate transformation.

diff --git a/ITS/AliITSmodule.cxx b/ITS/AliITSmodule.cxx
index c6959b4c616ecfe45982c82391dabf84f17e5b41..1c9a87b31c1cad341ef0c2ff4bb6e217b8fb1066 100644 (file)
--- a/ITS/AliITSmodule.cxx
+++ b/ITS/AliITSmodule.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:20  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 #include "AliITSmodule.h"
@@ -79,7 +82,7 @@ Int_t AliITSmodule::AddHit(AliITShit* hit ) {
 }
 
 //___________________________________________________________________________
-void AliITSmodule::Streamer(TBuffer &R__b){
+void AliITSmodule::Streamer(TBuffer & /*R__b*/){
    // Stream an object of class AliITSmodule.
 
     return;

diff --git a/ITS/AliITSmoduleSDD.cxx b/ITS/AliITSmoduleSDD.cxx
index d28fdcdf0947d6a81bc0db8128e4bc9dc7110cb9..773738e658ef066a166d97e202d976dddf4e8cfe 100644 (file)
--- a/ITS/AliITSmoduleSDD.cxx
+++ b/ITS/AliITSmoduleSDD.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:20  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
@@ -30,6 +33,6 @@ ClassImp(AliITSmoduleSDD)
 
 AliITSmoduleSDD::AliITSmoduleSDD() {};
 
-AliITSmoduleSDD::AliITSmoduleSDD(Int_t index) {};
+AliITSmoduleSDD::AliITSmoduleSDD(Int_t ) {};
 
 AliITSmoduleSDD::~AliITSmoduleSDD() {};

diff --git a/ITS/AliITSmoduleSPD.cxx b/ITS/AliITSmoduleSPD.cxx
index 790c79d656ddcecb00353cb505726590c1fc865d..3cf6b530977c8a11ab64423b2a6ca2805af7277e 100644 (file)
--- a/ITS/AliITSmoduleSPD.cxx
+++ b/ITS/AliITSmoduleSPD.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:20  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
@@ -30,7 +33,7 @@ ClassImp(AliITSmoduleSPD)
 
 AliITSmoduleSPD::AliITSmoduleSPD() {};
 
-AliITSmoduleSPD::AliITSmoduleSPD(Int_t index) {};
+AliITSmoduleSPD::AliITSmoduleSPD(Int_t ) {};
 
 AliITSmoduleSPD::~AliITSmoduleSPD() {};
 

diff --git a/ITS/AliITSmoduleSSD.cxx b/ITS/AliITSmoduleSSD.cxx
index c3cc2f0afb3df42de6a1171fbd64200518cf4f32..bcd22b621c84f1899495dcead79e38e6b339cb57 100644 (file)
--- a/ITS/AliITSmoduleSSD.cxx
+++ b/ITS/AliITSmoduleSSD.cxx
@@ -15,11 +15,37 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:20  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
 #include "AliITSmoduleSSD.h"
 
+    //Technical parameters of detector
+const Float_t   AliITSmoduleSSD::kStereo = 0.0175;  //Stereo Angle 17.5 mrad
+const Float_t   AliITSmoduleSSD::kTan = 0.0175;  
+const Int_t     AliITSmoduleSSD::kNStrips = 768;    //Number of strips on each side
+const Float_t   AliITSmoduleSSD::kPitch = 0.095;    //Distance strip - strip (mm)
+const Float_t   AliITSmoduleSSD::kX = 72.96;        //X size (mm)
+const Float_t   AliITSmoduleSSD::kY = 0.3;          //Y size (mm)
+const Float_t   AliITSmoduleSSD::kZ = 40;           //Thickness (mm)
+    
+    // <------------------------------
+  
+    //______________________________________________________________
+    //  
+    // Parameters for simulation
+    //______________________________________________________________
+      
+const Float_t   AliITSmoduleSSD::kSigmaP = 0.003;     //Gaussian sigm
+const Float_t   AliITSmoduleSSD::kSigmaN = 0.002;
+const Int_t     AliITSmoduleSSD::kSteps  = 10;        //Number of steps 
+const Int_t     AliITSmoduleSSD::kTresholdP = 1500;    
+const Int_t     AliITSmoduleSSD::kTresholdN = 2500; 
+   
+
 
 ClassImp(AliITSmoduleSSD)
 

diff --git a/ITS/AliITSmoduleSSD.h b/ITS/AliITSmoduleSSD.h
index 1cc50db3db5d99f289fc2c9bc520cda5160ccae7..44e888abad2127b11ec285cef711a14a9eaab036 100644 (file)
--- a/ITS/AliITSmoduleSSD.h
+++ b/ITS/AliITSmoduleSSD.h
@@ -126,13 +126,13 @@ protected:
     // Proceding part should be in SSDgeo ----->
     
     //Technical parameters of detector
-    static const Float_t   kStereo = 0.0175;  //Stereo Angle 17.5 mrad
-    static const Float_t   kTan = 0.0175;  
-    static const Int_t     kNStrips = 768;    //Number of strips on each side
-    static const Float_t   kPitch = 0.095;    //Distance strip - strip (mm)
-    static const Float_t   kX = 72.96;        //X size (mm)
-    static const Float_t   kY = 0.3;          //Y size (mm)
-    static const Float_t   kZ = 40;           //Thickness (mm)
+    static const Float_t   kStereo ;// = 0.0175;  //Stereo Angle 17.5 mrad
+    static const Float_t   kTan ;// = 0.0175;  
+    static const Int_t     kNStrips ;// = 768;    //Number of strips on each side
+    static const Float_t   kPitch ;// = 0.095;    //Distance strip - strip (mm)
+    static const Float_t   kX ;// = 72.96;        //X size (mm)
+    static const Float_t   kY ;// = 0.3;          //Y size (mm)
+    static const Float_t   kZ ;// = 40;           //Thickness (mm)
     
     // <------------------------------
   
@@ -141,11 +141,11 @@ protected:
     // Parameters for simulation
     //______________________________________________________________
       
-    static const Float_t   kSigmaP = 0.003;     //Gaussian sigm
-    static const Float_t   kSigmaN = 0.002;
-    static const Int_t     kSteps  = 10;        //Number of steps 
-    static const Int_t     kTresholdP = 1500;    
-    static const Int_t     kTresholdN = 2500; 
+    static const Float_t   kSigmaP ;// = 0.003;     //Gaussian sigm
+    static const Float_t   kSigmaN ;// = 0.002;
+    static const Int_t     kSteps  ;// = 10;        //Number of steps 
+    static const Int_t     kTresholdP ;// = 1500;    
+    static const Int_t     kTresholdN ;// = 2500; 
    
     //________________________________________________________________
     //