]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STRUCT/AliABSOv0.cxx
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
QA check for TOF hits updated
[u/mrichter/AliRoot.git] / STRUCT / AliABSOv0.cxx
diff --git a/STRUCT/AliABSOv0.cxx b/STRUCT/AliABSOv0.cxx
index 39e90313e1685d4946d8421ea97a5366679ce1fe..35816cf8ea6650bb3dae0110c5d2bc31a3bc1a78 100644 (file)
--- a/STRUCT/AliABSOv0.cxx
+++ b/STRUCT/AliABSOv0.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.10  2001/10/25 08:50:57  morsch
+New beamshield geometry with increased tolerances and insulation thickness.
+
+Revision 1.9  2001/05/16 14:57:22  alibrary
+New files for folders and Stack
+
 Revision 1.8  2001/01/12 13:16:09  morsch
 Store absorber composition information in fMLayers and fZLayers
 Rear 25 cm Fe + 35 cm Cu
@@ -112,13 +118,14 @@ void AliABSOv0::CreateGeometry()
     //
 
     enum {kC=1605, kAl=1608, kFe=1609, kCu=1610, kW=1611, kPb=1612,
-                 kNiCuW=1620, kVacuum=1615, kAir=1614, kConcrete=1616,
-                 kPolyCH2=1617, kSteel=1609, kInsulation=1613, kPolyCc=1619};    
+         kNiCuW=1620, kVacuum=1615, kAir=1614, kConcrete=1616,
+         kPolyCH2=1617, kSteel=1609, kInsulation=1613, kPolyCc=1619};    
     
     Int_t *idtmed = fIdtmed->GetArray()-1599;
     
     Float_t par[24], cpar[5], cpar0[5], pcpar[12], tpar[3], tpar0[3]; 
     Float_t dz;
+    Int_t idrotm[1699];
 #include "ABSOSHILConst.h"
 #include "ABSOConst.h"
 //
@@ -131,7 +138,7 @@ void AliABSOv0::CreateGeometry()
     fMLayers[0][0]  = kAir;              fZLayers[0][0] = zAbsStart;
     fMLayers[0][1]  = kC;                fZLayers[0][1] = zAbsCc;             
     fMLayers[0][2]  = kConcrete;         fZLayers[0][2] = zRear-dRear-dzFe;
-    fMLayers[0][3]  = kFe;               fZLayers[0][3] = zRear-dRear;
+    fMLayers[0][3]  = kSteel;            fZLayers[0][3] = zRear-dRear;
     fMLayers[0][4]  = kCu;               fZLayers[0][4] = zRear;
 // 2 < theta < 3
     fNLayers[1] = 5; 
@@ -226,7 +233,7 @@ void AliABSOv0::CreateGeometry()
 //
 // Tungsten inner shield
 //
-  Float_t zW=zTwoDeg+.1;
+  Float_t zW = zTwoDeg+.1;
   Float_t dZ = zW+(zRear-dRear-zW)/2.;
   //
   pcpar[0]  = 0.;
@@ -246,7 +253,15 @@ void AliABSOv0::CreateGeometry()
   //
   dz=(zW+zRear-dRear)/2-(zAbsStart+zRear)/2.;
   gMC->Gspos("AWIN", 1, "ABSS", 0., 0., dz, 0, "ONLY");
-
+  cpar[0] = (200.-zW)/2.;
+  cpar[1] = rAbs;
+  cpar[2] = pcpar[5];
+  cpar[3] = rAbs;
+  cpar[4] = 200. * TMath::Tan(accMin);
+  gMC->Gsvolu("ACNO", "CONE", idtmed[kC], cpar, 5);
+  dz = zW-dZ+cpar[0];
+  
+  gMC->Gspos("ACNO", 1, "AWIN", 0., 0., dz, 0, "ONLY");
   //     Inner tracking region
   //
   //     mother volume: Cu
@@ -290,7 +305,7 @@ void AliABSOv0::CreateGeometry()
   cpar[0]  = dzFe/2.;
   cpar[1] = zr * TMath::Tan(accMin);
   cpar[2] = zr * TMath::Tan(accMax);
-  cpar[3] = cpar[1] + TMath::Tan(thetaR) * dzFe;
+  cpar[3] = cpar[1] + TMath::Tan(accMin) * dzFe;
   cpar[4] = cpar[2] + TMath::Tan(accMax) * dzFe;
   gMC->Gsvolu("ACFE", "CONE",idtmed[fMLayers[0][3]], cpar, 5);
 
@@ -375,7 +390,7 @@ void AliABSOv0::CreateGeometry()
 // cylindrical piece
   tpar0[2]=(zOpen-zAbsStart)/2;
   tpar0[0]=rVacu;
-  tpar0[1]=rAbs;
+  tpar0[1]=rVacu+dTube+dInsu+dEnve;
   gMC->Gsvolu("AV11", "TUBE", idtmed[kSteel+40], tpar0, 3);
 //
 // insulation
@@ -385,12 +400,6 @@ void AliABSOv0::CreateGeometry()
   tpar[1]=tpar[0]+dInsu;
   gMC->Gsvolu("AI11", "TUBE", idtmed[kInsulation+40], tpar, 3);
   gMC->Gspos("AI11", 1, "AV11", 0., 0., 0., 0, "ONLY"); 
-//
-// clearance 
-  tpar[0]=tpar[1]+dEnve;
-  tpar[1]=tpar[0]+dFree;
-  gMC->Gsvolu("AP11", "TUBE", idtmed[kAir+40], tpar, 3);
-  gMC->Gspos("AP11", 1, "AV11", 0., 0., 0., 0, "ONLY"); 
 //
   dz=-(zRear-zAbsStart)/2.+tpar0[2];
   gMC->Gspos("AV11", 1, "ABSM", 0., 0., dz, 0, "ONLY"); 
@@ -398,8 +407,8 @@ void AliABSOv0::CreateGeometry()
 // conical piece
 
   cpar0[0]=(zRear-dRear-zOpen)/2;
-  cpar0[1]=rVacu-0.05;
-  cpar0[2]=rAbs;
+  cpar0[1]= rVacu-0.05;
+  cpar0[2]= rVacu+dTube+dInsu+dEnve;
   Float_t dR=2.*cpar0[0]*TMath::Tan(thetaOpen1);
   cpar0[3]=cpar0[1]+dR;
   cpar0[4]=cpar0[2]+dR;
@@ -415,46 +424,57 @@ void AliABSOv0::CreateGeometry()
   cpar[4]=cpar0[3]+dTube+dInsu;
   gMC->Gsvolu("AI21", "CONE", idtmed[kInsulation+40], cpar, 5);
   gMC->Gspos("AI21", 1, "AV21", 0., 0., 0., 0, "ONLY"); 
-//
-// clearance
-  cpar[1]=cpar0[1]+dTube+dInsu+dEnve;
-  cpar[2]=rAbs;
-  cpar[3]=cpar0[1]+dTube+dInsu+dEnve+dR;
-  cpar[4]=rAbs+dR;
-
-  gMC->Gsvolu("AP21", "CONE", idtmed[kAir+40], cpar, 5);
-  gMC->Gspos("AP21", 1, "AV21", 0., 0., 0., 0, "ONLY"); 
   
   dz=(zRear-zAbsStart)/2.-cpar0[0]-dRear;
   gMC->Gspos("AV21", 1, "ABSM", 0., 0., dz, 0, "ONLY"); 
 //
 // Support cone 
 
-  par[0]  = 0.;
-  par[1]  = 360.;
-  par[2]  = 4.;
+  par[0]  =  22.5;
+  par[1]  = 360.0;
+  par[2]  =   8.0;
+  par[3]  =   4.0;
     
-  par[3]  = zRear;
-  par[4]  = 100.;
-  par[5]  = 170.;
+  par[4]  = zRear;
+  par[5]  = 100.;
+  par[6]  = 170.;
   
-  par[6]  = zRear+2.;
-  par[7]  = 100.;
-  par[8]  = 170.;
+  par[7]  = zRear+2.;
+  par[8]  = 100.;
+  par[9]  = 170.;
 
-  par[9]  = zRear+2.;
-  par[10] = 168.;
-  par[11] = 170.;
+  par[10] = zRear+2.;
+  par[11] = 168.;
+  par[12] = 170.;
 
-  par[12]  = 600.;
-  par[13] = 168.;
-  par[14] = 170.;
+  par[13] = 600.;
+  par[14] = 168.;
+  par[15] = 170.;
   
 
-  gMC->Gsvolu("ASSS", "PCON", idtmed[kSteel], par, 25);
+  gMC->Gsvolu("ASSS", "PGON", idtmed[kSteel], par, 16);
   gMC->Gspos("ASSS", 1, "ALIC", 0., 0., 0., 0, "ONLY");
 
-
+  Float_t trap[11];
+  trap[ 0] = (530.-170.)/2.;
+  trap[ 2] = 0.;
+  trap[ 3] = 2.; 
+  trap[ 4] = (600.-(zRear+2.))/2.;;
+  trap[ 5] = trap[4];
+  trap[ 6] = 0.;
+  trap[ 7] = 2.;
+  trap[ 8] = 5.;
+  trap[ 9] = 5.;
+  trap[10] = 0.;
+  trap[ 1] = -TMath::ATan((trap[4]-trap[8])/2./trap[0])*180./TMath::Pi();
+  AliMatrix(idrotm[1600], 180., 0., 90., 0., 90., 90.);
+  AliMatrix(idrotm[1601], 180., 0., 90., 0., 90., 270.);
+  gMC->Gsvolu("ASST", "TRAP", idtmed[kSteel], trap, 11);
+  dz = (600.+zRear+2.)/2.+(trap[4]-trap[8])/2.;
+  Float_t dy =  170.+trap[0];
+  
+  gMC->Gspos("ASST", 1, "ALIC", 0.,  dy, dz, idrotm[1600], "ONLY");
+  gMC->Gspos("ASST", 2, "ALIC", 0., -dy, dz, idrotm[1601], "ONLY");
 }
 
 //_____________________________________________________________________________