X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=PHOS%2FAliPHOSCPVGeometry.cxx;h=d966004924a7709ec9364461a57d61d8094fd8e3;hp=018502ee081a2fd2de2d10775d5ce4d4b23c9105;hb=15dfd8929cc449f4c0d849259583856bdec09007;hpb=fd61896f1b4699dbbe8a11512f3e8b1012a142a8

diff --git a/PHOS/AliPHOSCPVGeometry.cxx b/PHOS/AliPHOSCPVGeometry.cxx
index 018502ee081..d966004924a 100644
--- a/PHOS/AliPHOSCPVGeometry.cxx
+++ b/PHOS/AliPHOSCPVGeometry.cxx
@@ -15,19 +15,28 @@
 
 /*
   $Log$
+  Revision 1.3  2001/09/26 12:09:36  schutz
+  A new (final?) geometry developed
+
+  Revision 1.2  2000/11/09 15:49:04  martinez
+  Coding convention rules obeyed
+
+  Revision 1.1  2000/11/03 16:28:21  schutz
+  CPV geometry class to correct previous name-convetion rule violation
+
 */
 
 //_________________________________________________________________________
 // Geometry class  for PHOS : CPV (Charged particle veto, IHEP version)
-//                  
-//*-- Author   : Yuri Kharlov (IHEP, Protvino) 15 September 2000
+// Its data members provide geometry parametrization of CPV
+// which can be changed in the constructor only.
+// Author: Yuri Kharlov (IHEP, Protvino)
+// 15 September 2000
 //
 // --- ROOT system ---
 
 // --- Standard library ---
 
-#include <iostream.h>
-
 // --- AliRoot header files ---
 
 #include "AliPHOSCPVGeometry.h"
@@ -40,7 +49,6 @@ AliPHOSCPVGeometry::AliPHOSCPVGeometry()
 
   // Initializes the CPV parameters
   fNumberOfCPVLayers     = 1;
-  fLeadConverterExists   = kFALSE;
   fNumberOfCPVPadsPhi    = 128;
   fNumberOfCPVPadsZ      = 64;
   fCPVPadSizePhi         = 1.13;
@@ -53,11 +61,6 @@ AliPHOSCPVGeometry::AliPHOSCPVGeometry()
   fCPVFrameSize[0]       = 2.5;
   fCPVFrameSize[1]       = 5.1;
   fCPVFrameSize[2]       = 2.5;
-  fCPVActiveSize[0]      = fNumberOfCPVPadsPhi * fCPVPadSizePhi;
-  fCPVActiveSize[1]      = fNumberOfCPVPadsZ   * fCPVPadSizeZ;
-  fCPVBoxSize[0]         = fCPVActiveSize[0] + 2 * fCPVFrameSize[0];
-  fCPVBoxSize[1]         = fCPVFrameSize[1] * fNumberOfCPVLayers + 0.1;
-  fCPVBoxSize[2]         = fCPVActiveSize[1] + 2 * fCPVFrameSize[2];
   fGassiplexChipSize[0]  = 4.2;
   fGassiplexChipSize[1]  = 0.1;
   fGassiplexChipSize[2]  = 6.0;
@@ -65,6 +68,12 @@ AliPHOSCPVGeometry::AliPHOSCPVGeometry()
   fFTPosition[1]         = 2.2;
   fFTPosition[2]         = 3.6;
   fFTPosition[3]         = 5.1;
-}
 
+  fCPVActiveSize[0]      = fNumberOfCPVPadsPhi * fCPVPadSizePhi;
+  fCPVActiveSize[1]      = fNumberOfCPVPadsZ   * fCPVPadSizeZ;
+  fCPVBoxSize[0]         = fCPVActiveSize[0] + 2 * fCPVFrameSize[0];
+  fCPVBoxSize[1]         = fCPVFrameSize[1] * fNumberOfCPVLayers + 0.1;
+  fCPVBoxSize[2]         = fCPVActiveSize[1] + 2 * fCPVFrameSize[2];
+
+}
 //____________________________________________________________________________