Changes in the header-files by FCA

[u/mrichter/AliRoot.git] / ITS / AliITSgeomSPD300.cxx

diff --git a/ITS/AliITSgeomSPD300.cxx b/ITS/AliITSgeomSPD300.cxx
index 19fc1f53d3842c414cd69531e0f5339e3bde4918..34e902f6b4060f7f031d78f5b675479d376b1c9c 100644 (file)
--- a/ITS/AliITSgeomSPD300.cxx
+++ b/ITS/AliITSgeomSPD300.cxx
@@ -15,11 +15,11 @@
 
 /*
 $Log$
-Revision 1.1.2.6  2000/06/12 18:10:03  barbera
-fixed posible compilation errors on HP unix
+Revision 1.1.2.8  2000/10/02 15:52:05  barbera
+Forward declaration added
 
-Revision 1.1.2.5  2000/06/11 20:30:36  barbera
-Minore changes.
+Revision 1.6  2000/07/10 16:07:18  fca
+Release version of ITS code
 
 Revision 1.4  2000/06/10 20:34:37  nilsen
 Fixed compilation warning with HP unix.
@@ -30,6 +30,7 @@ Fixed bug in copy and operator =.
 
 */
 
+#include "TBRIK.h"
 #include "AliITSgeomSPD300.h"
 
 ClassImp(AliITSgeomSPD300)
@@ -48,9 +49,9 @@ const Float_t kbinz0 = 0.0300; // cm; Standard pixel size in z direction.
 const Int_t   knbinz = 279;    // number of pixels along z direction.
     Int_t i;
 
-    fdx = kdx;  // default value.
-    fdy = kdy;  // default value.
-    fdz = kdz;  // default value.
+    fDx = kdx;  // default value.
+    fDy = kdy;  // default value.
+    fDz = kdz;  // default value.
     fNbinx = knbinx; // default number of bins in x.
     fNbinz = knbinz; // default number of bins in z.
 
@@ -60,15 +61,15 @@ const Int_t   knbinz = 279;    // number of pixels along z direction.
     for(i=0;i<fNbinz;i++) fBinSizeZ[i] = kbinz0; // default z bin size.
 
     // correct detector size for bin size.
-    fdx = 0.0;
-    for(i=0;i<fNbinx;i++) fdx +=fBinSizeX[i];
-    fdx *= 0.5;
-    fdz = 0.0;
-    for(i=0;i<fNbinz;i++) fdz +=fBinSizeZ[i];
-    fdz *= 0.5;
+    fDx = 0.0;
+    for(i=0;i<fNbinx;i++) fDx +=fBinSizeX[i];
+    fDx *= 0.5;
+    fDz = 0.0;
+    for(i=0;i<fNbinz;i++) fDz +=fBinSizeZ[i];
+    fDz *= 0.5;
 
     fShapeSPD = new TBRIK("ActiveSPD","Active volume of SPD","SPD SI DET",
-                         fdx,fdy,fdz);
+                         fDx,fDy,fDz);
 }
 //______________________________________________________________________
 AliITSgeomSPD300::AliITSgeomSPD300(Float_t dy,Int_t nx,Float_t *bx,
@@ -77,9 +78,9 @@ AliITSgeomSPD300::AliITSgeomSPD300(Float_t dy,Int_t nx,Float_t *bx,
 //    default constructor, for a User modified TDR based geometry.
 ////////////////////////////////////////////////////////////////////////
     Int_t i;
-    fdx = 0.0;
-    fdy =  dy;
-    fdz = 0.0;
+    fDx = 0.0;
+    fDy =  dy;
+    fDz = 0.0;
     fNbinx = nx; // new number of bins in x.
     fNbinz = nz; // new number of bins in z.
 
@@ -89,13 +90,13 @@ AliITSgeomSPD300::AliITSgeomSPD300(Float_t dy,Int_t nx,Float_t *bx,
     for(i=0;i<fNbinz;i++) fBinSizeZ[i] = bz[i]; // new z bin size.
 
     // correct detector size for bin size.
-    for(i=0;i<fNbinx;i++) fdx +=fBinSizeX[i];
-    fdx *= 0.5;
-    for(i=0;i<fNbinz;i++) fdz +=fBinSizeZ[i];
-    fdz *= 0.5;
+    for(i=0;i<fNbinx;i++) fDx +=fBinSizeX[i];
+    fDx *= 0.5;
+    for(i=0;i<fNbinz;i++) fDz +=fBinSizeZ[i];
+    fDz *= 0.5;
 
     fShapeSPD = new TBRIK("ActiveSPD","Active volume of SPD","SPD SI DET",
-                         fdx,fdy,fdz);
+                         fDx,fDy,fDz);
 }
 //______________________________________________________________________
 AliITSgeomSPD300::AliITSgeomSPD300(AliITSgeomSPD300 &source){
@@ -103,9 +104,9 @@ AliITSgeomSPD300::AliITSgeomSPD300(AliITSgeomSPD300 &source){
     Int_t i;
     if(&source == this) return;
     this->fShapeSPD = new TBRIK(*(source.fShapeSPD));
-    this->fdx = source.fdx;
-    this->fdy = source.fdy;
-    this->fdz = source.fdz;
+    this->fDx = source.fDx;
+    this->fDy = source.fDy;
+    this->fDz = source.fDz;
     if(this->fBinSizeX) delete[] this->fBinSizeX; 
     if(this->fBinSizeX) delete[] this->fBinSizeZ;
     this->fNbinx = source.fNbinx;
@@ -121,9 +122,9 @@ AliITSgeomSPD300& AliITSgeomSPD300::operator=(AliITSgeomSPD300 &source){
     Int_t i;
     if(&source == this) return *this;
     this->fShapeSPD = new TBRIK(*(source.fShapeSPD));
-    this->fdx = source.fdx;
-    this->fdy = source.fdy;
-    this->fdz = source.fdz;
+    this->fDx = source.fDx;
+    this->fDy = source.fDy;
+    this->fDz = source.fDz;
     if(this->fBinSizeX) delete[] this->fBinSizeX; 
     if(this->fBinSizeX) delete[] this->fBinSizeZ;
     this->fNbinx = source.fNbinx;
@@ -148,9 +149,9 @@ void AliITSgeomSPD300::ReSetBins(Float_t dy,Int_t nx,Float_t *bx,
 //    default constructor, for a User modified TDR based geometry.
 ////////////////////////////////////////////////////////////////////////
     Int_t i;
-    fdx = 0.0;
-    fdy =  dy;
-    fdz = 0.0;
+    fDx = 0.0;
+    fDy =  dy;
+    fDz = 0.0;
     fNbinx = nx; // new number of bins in x.
     fNbinz = nz; // new number of bins in z.
 
@@ -162,14 +163,15 @@ void AliITSgeomSPD300::ReSetBins(Float_t dy,Int_t nx,Float_t *bx,
     for(i=0;i<fNbinz;i++) fBinSizeZ[i] = bz[i]; // new z bin size.
 
     // correct detector size for bin size.
-    for(i=0;i<fNbinx;i++) fdx +=fBinSizeX[i];
-    fdx *= 0.5;
-    for(i=0;i<fNbinz;i++) fdz +=fBinSizeZ[i];
-    fdz *= 0.5;
+    for(i=0;i<fNbinx;i++) fDx +=fBinSizeX[i];
+    fDx *= 0.5;
+    for(i=0;i<fNbinz;i++) fDz +=fBinSizeZ[i];
+    fDz *= 0.5;
 
     fShapeSPD = new TBRIK("ActiveSPD","Active volume of SPD","SPD SI DET",
-                         fdx,fdy,fdz);
+                         fDx,fDy,fDz);
 }
+/*
 //----------------------------------------------------------------------
 void AliITSgeomSPD300::Streamer(TBuffer &R__b){
     // Streamer function for the class AliItSgeomSPD300.
@@ -181,15 +183,15 @@ void AliITSgeomSPD300::Streamer(TBuffer &R__b){
        if(R__v==1){
            TObject::Streamer(R__b);
            fShapeSPD->Streamer(R__b);
-           R__b >> fdx;
-           R__b >> fdy;
-           R__b >> fdz;
+           R__b >> fDx;
+           R__b >> fDy;
+           R__b >> fDz;
        }else if (R__v==2){
            AliITSgeomSPD::Streamer(R__b);
            fShapeSPD->Streamer(R__b);
-           R__b >> fdx;
-           R__b >> fdy;
-           R__b >> fdz;
+           R__b >> fDx;
+           R__b >> fDy;
+           R__b >> fDz;
            R__b >> fNbinx;
            if(fBinSizeX!=0) delete[] fBinSizeX;
            fBinSizeX = new Float_t[fNbinx];
@@ -204,9 +206,9 @@ void AliITSgeomSPD300::Streamer(TBuffer &R__b){
        R__c = R__b.WriteVersion(AliITSgeomSPD300::IsA(), kTRUE);
        AliITSgeomSPD::Streamer(R__b);
        fShapeSPD->Streamer(R__b);
-       R__b << fdx;
-       R__b << fdy;
-       R__b << fdz;
+       R__b << fDx;
+       R__b << fDy;
+       R__b << fDz;
        R__b << fNbinx;
        for(i=0;i<fNbinx;i++) R__b << fBinSizeX[i];
        R__b << fNbinz;
@@ -215,3 +217,4 @@ void AliITSgeomSPD300::Streamer(TBuffer &R__b){
     } // end if R__b.IsReading()
 }
 //----------------------------------------------------------------------
+*/