X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliSHILv2.cxx;h=f4975f89f501fe25bd5d9aec497d648dc142959b;hb=a009d4971141f152f2610a23ee792b5c88ceb106;hp=ab67e7404eec7bdedd743f8243e9335d3f722dac;hpb=35a1fda7372a401c4336a6dc45fad459a7070a95;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx
index ab67e7404ee..f4975f89f50 100644
--- 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();
 }
  
 //_____________________________________________________________________________
@@ -240,7 +241,7 @@ void AliSHILv2::CreateGeometry()
   dZ=-dl;
 
 //
-// Dimuon arm mother volumes (YOUT1, YOUT3)
+// Dimuon arm mother volumes (YOUT1, YOUT2)
 //
 
   // Dipole parameters
@@ -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
@@ -422,8 +423,8 @@ void AliSHILv2::CreateGeometry()
   par0[43] = kR43 + delta;
   par0[44] = rst7;
 
-  gMC->Gsvolu("YOUT3", "PCON", idtmed[kAirMuon], par0, 45);
-  gMC->Gspos("YOUT3", 1, "ALIC", 0., 0., 0., 0, "ONLY");  
+  gMC->Gsvolu("YOUT2", "PCON", idtmed[kAirMuon], par0, 45);
+  gMC->Gspos("YOUT2", 1, "ALIC", 0., 0., 0., 0, "ONLY");  
 
 //
 // First section: bellows below and behind front absorber 
@@ -1256,7 +1257,7 @@ void AliSHILv2::CreateGeometry()
   voMuonFilterM->AddNode(voMuonFilterI, 1, new TGeoTranslation(0., 0., 0.));
   
   dz = (kZFilterIn + kZFilterOut) / 2.;
-  gMC->Gspos("YMuonFilterM", 1, "YOUT3", 0., 0., - dz, 0, "ONLY");
+  gMC->Gspos("YMuonFilterM", 1, "YOUT2", 0., 0., - dz, 0, "ONLY");
 
 //
 // Outer Pb Cone
@@ -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));