Some cleanup in the makefiles

[u/mrichter/AliRoot.git] / STRUCT / AliSHILv2.cxx

diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx
index b400e3ae797b708f1648e55b394d4c63f9fe109f..f4975f89f501fe25bd5d9aec497d648dc142959b 100644 (file)
--- a/STRUCT/AliSHILv2.cxx
+++ b/STRUCT/AliSHILv2.cxx
@@ -37,9 +37,13 @@
 #include "AliLog.h"
 
 ClassImp(AliSHILv2)
+
  
 //_____________________________________________________________________________
-AliSHILv2::AliSHILv2()
+
+AliSHILv2::AliSHILv2():
+    fPbCone(kTRUE),
+    fWriteGeometry(kFALSE)
 {
   //
   // Default constructor for muon shield
@@ -48,18 +52,15 @@ AliSHILv2::AliSHILv2()
  
 //_____________________________________________________________________________
 AliSHILv2::AliSHILv2(const char *name, const char *title)
-  : AliSHIL(name,title)
+    : AliSHIL(name,title),
+      fPbCone(kTRUE),
+      fWriteGeometry(kFALSE)
 {
   //
   // Standard constructor for muon shield
   //
-  SetMarkerColor(7);
-  SetMarkerStyle(2);
-  SetMarkerSize(0.4);
   // Pb  cone not yet compatible with muon chamber inner radii
   // Switched off by default
-  SetWriteGeometry();
-  SetPbCone();
 }
  
 //_____________________________________________________________________________
@@ -349,9 +350,9 @@ void AliSHILv2::CreateGeometry()
 
   // z = -1235.55
   par0[3] = z05;
-  par0[4] = nextRout - (z05 - nextZ) * TMath::Tan(kThetaOpenPbO) + delta ;
+  par0[4] = nextRin - (z05 - nextZ) * TMath::Tan(kThetaOpenPbO) + delta ;
   par0[5] = rst4;
-
+    
 // recess station 4
   // z = -1259.90
   par0[6] = zpos - ( -dz+kZch41 + delta );
@@ -399,7 +400,7 @@ void AliSHILv2::CreateGeometry()
 
   // z = -1466.00
   par0[30] = zpos - ( -dz+kZvac10 - delta );
-  par0[31] = par0[70];
+  par0[31] = par0[28];
   par0[32] = rst7;
 
   // z = -1466.00
@@ -1587,7 +1588,6 @@ void AliSHILv2::CreateGeometry()
       
       TGeoRotation* rotxz = new TGeoRotation("rotxz",  90., 0., 90., 90., 180., 0.);
       TGeoVolume* yout1 =  gGeoManager->GetVolume("YOUT1");
-      cout << zstart << "..." << dz << endl;
       yout1->AddNode(extraShield1, 1, new TGeoCombiTrans(0., 0., -zstart - ( 49.7 + dzKeep), rotxz));
       yout1->AddNode(extraShield2, 1, new TGeoCombiTrans(0., 0., -zstart - (kZch21 - zstart + dz ), rotxz));