Adding anti-Lambda and anti-Xi

[u/mrichter/AliRoot.git] / PHOS / AliPHOSCPVGeometry.cxx

diff --git a/PHOS/AliPHOSCPVGeometry.cxx b/PHOS/AliPHOSCPVGeometry.cxx
index e8dd40abb41213020808b9d141e362d84455f11b..34d326ceafa662247a45b4fdacddc2404e91d5cc 100644 (file)
--- a/PHOS/AliPHOSCPVGeometry.cxx
+++ b/PHOS/AliPHOSCPVGeometry.cxx
@@ -13,12 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-  $Log$
-  Revision 1.1  2000/11/03 16:28:21  schutz
-  CPV geometry class to correct previous name-convetion rule violation
-
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 // Geometry class  for PHOS : CPV (Charged particle veto, IHEP version)
@@ -31,38 +26,30 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
-
 // --- AliRoot header files ---
 
 #include "AliPHOSCPVGeometry.h"
 
-ClassImp(AliPHOSCPVGeometry) ;
+ClassImp(AliPHOSCPVGeometry)
 
 //____________________________________________________________________________
 AliPHOSCPVGeometry::AliPHOSCPVGeometry()
+  : fNumberOfCPVLayers(1),
+    fNumberOfCPVPadsPhi(128),
+    fNumberOfCPVPadsZ(56),
+    fCPVPadSizePhi(1.13),
+    fCPVPadSizeZ(2.26),
+    fNumberOfCPVChipsPhi(8),
+    fNumberOfCPVChipsZ(8),
+    fCPVGasThickness(1.3),
+    fCPVTextoliteThickness(0.1),
+    fCPVCuNiFoilThickness(56e-04)
 {
 
   // Initializes the CPV parameters
-  fNumberOfCPVLayers     = 1;
-  fLeadConverterExists   = kFALSE;
-  fNumberOfCPVPadsPhi    = 128;
-  fNumberOfCPVPadsZ      = 64;
-  fCPVPadSizePhi         = 1.13;
-  fCPVPadSizeZ           = 2.26;
-  fNumberOfCPVChipsPhi   = 8;
-  fNumberOfCPVChipsZ     = 8;
-  fCPVGasThickness       = 1.3;
-  fCPVTextoliteThickness = 0.1;
-  fCPVCuNiFoilThickness  = 56e-04;;
   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;
@@ -70,6 +57,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];
+
+}
 //____________________________________________________________________________