Randomizing particle order in the pair for identical particles

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

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index db56b68c54e974ab031fbdccd4a50b60bd93c8ed..9e10f27985ffe31697d49d95e7cf67d4d3d6ccf3 100644 (file)
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -29,34 +29,36 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliSHILv0.h"
-#include "AliRun.h"
+#include <TVirtualMC.h>
+
 #include "AliConst.h"
+#include "AliRun.h"
+#include "AliSHILv0.h"
+#include "AliLog.h"
 
 ClassImp(AliSHILv0)
  
 //_____________________________________________________________________________
-AliSHILv0::AliSHILv0()
+AliSHILv0::AliSHILv0():
+    fPbCone(1)
 {
   //
   // Default constructor for muon shield
   //
+    
 }
  
 //_____________________________________________________________________________
 AliSHILv0::AliSHILv0(const char *name, const char *title)
-  : AliSHIL(name,title)
+    : AliSHIL(name,title), 
+      fPbCone(1)
 {
   //
   // 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
-  fPbCone=kTRUE;
-}
+ }
  
 //_____________________________________________________________________________
 void AliSHILv0::CreateGeometry()
@@ -900,24 +902,19 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712,
 //
 // Magnet element 
 //
-  tpar[0]=0.;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]= 0.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YAEM", "TUBE", idtmed[kAir], tpar, 3);
-  tpar[0]=kRAbs;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]=17.6/2.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YFEM", "TUBE", idtmed[kFe], tpar, 3);
   gMC->Gspos("YFEM", 1, "YAEM", 0., 0., 0., 0, "ONLY"); 
 
 //
-
-  if (gMC->VolId("HUP2")) {
-      gMC->Gspos("YAEM", 1, "HUP2", 0., 0., 0., 0, "ONLY");
-  } else {
-      dz=kZvac12+60.;
-      gMC->Gspos("YAEM", 1, "ALIC", 0., 0., dz, 0, "ONLY"); 
-  }
+  dz=1921.6 + tpar[2];
+  gMC->Gspos("YAEM", 1, "ALIC", 0., 0.,  dz, 0, "ONLY"); 
 
 // 
 //
@@ -1200,7 +1197,7 @@ void AliSHILv0::Init()
   Int_t i;
   //
   
-  if(fDebug) {
+  if(AliLog::GetGlobalDebugLevel()>0) {
       printf("\n%s: ",ClassName());
       for(i=0;i<35;i++) printf("*");
       printf(" SHILv0_INIT ");