New classes added

[u/mrichter/AliRoot.git] / ITS / AliITSvPPRcoarsesymm.cxx

diff --git a/ITS/AliITSvPPRcoarsesymm.cxx b/ITS/AliITSvPPRcoarsesymm.cxx
index 09e85de39e005e85ab2d8c1f214ae6f7448b9c6e..0b635be83a7d43552d6721fcc75bbec847208aaf 100644 (file)
--- a/ITS/AliITSvPPRcoarsesymm.cxx
+++ b/ITS/AliITSvPPRcoarsesymm.cxx
@@ -1,4 +1,4 @@
-/**************************************************************************
+ /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -15,6 +15,18 @@
 
 /*
 $Log$
+Revision 1.26  2002/10/22 14:46:01  alibrary
+Introducing Riostream.h
+
+Revision 1.25  2001/10/18 12:26:38  barbera
+Six cylinders definition in BuildGeometry() improved by comparison with CreateGeometry()
+
+Revision 1.24  2001/05/25 15:59:59  morsch
+Overlaps corrected. (R. Barbera)
+
+Revision 1.23  2001/05/03 08:40:15  barbera
+Volume ITSD slightly modified to be consistent with v5. Some improvement in the printouts. The last commit did not complete successfully.
+
 Revision 1.21  2001/04/04 07:02:16  barbera
 Position of the cylinders holding rails corrected
 
@@ -129,7 +141,7 @@ Introduction of the Copyright and cvs Log
 // strongly encouraged to uses AliITSv5.
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
-#include <iostream.h> 
+#include <Riostream.h> 
 #include <TMath.h>
 #include <TRandom.h>
 #include <TVector.h>
@@ -142,7 +154,6 @@ Introduction of the Copyright and cvs Log
 #include <TClonesArray.h>
 
 
-#include "AliMC.h"
 #include "AliMagF.h"
 #include "AliConst.h"
 
@@ -215,45 +226,45 @@ void AliITSvPPRcoarsesymm::BuildGeometry(){
 //    Geometry builder for the ITS version 7.
 ////////////////////////////////////////////////////////////////////////
     TNode *node, *top;
-    const int kColorITS=kYellow;
+    const Int_t kColorITS=kYellow;
     //
     top = gAlice->GetGeometry()->GetNode("alice");
-
-    new TTUBE("S_layer1","Layer1 of ITS","void",3.95,3.95+0.05475,12.25);
+    new TTUBE("S_layer1","Layer1 of ITS","void",3.8095,3.8095+1.03*9.36/100.,14.35);
     top->cd();
     node = new TNode("Layer1","Layer1","S_layer1",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
 
-    new TTUBE("S_layer2","Layer2 of ITS","void",7.,7.+0.05475,16.3);
+    new TTUBE("S_layer2","Layer2 of ITS","void",7.,7.+1.03*9.36/100.,14.35);
     top->cd();
     node = new TNode("Layer2","Layer2","S_layer2",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
 
-    new TTUBE("S_layer3","Layer3 of ITS","void",15.,15.+0.05288,21.1);
+    new TTUBE("S_layer3","Layer3 of ITS","void",15.,15.+0.94*9.36/100.,25.1);
     top->cd();
     node = new TNode("Layer3","Layer3","S_layer3",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
 
-    new TTUBE("S_layer4","Layer4 of ITS","void",24,24+0.05288,29.6);
+    new TTUBE("S_layer4","Layer4 of ITS","void",24.1,24.1+0.95*9.36/100.,32.1);
     top->cd();
     node = new TNode("Layer4","Layer4","S_layer4",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
 
-    new TTUBE("S_layer5","Layer5 of ITS","void",40,40+0.05382,45.1);
+    new TTUBE("S_layer5","Layer5 of ITS","void",38.5,38.5+0.91*9.36/100.,49.405);
     top->cd();
     node = new TNode("Layer5","Layer5","S_layer5",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
 
-    new TTUBE("S_layer6","Layer6 of ITS","void",45,45+0.05382,50.4);
+    new TTUBE("S_layer6","Layer6 of ITS","void",43.5765,43.5765+0.87*9.36/100.,55.27);
     top->cd();
     node = new TNode("Layer6","Layer6","S_layer6",0,0,0,"");
     node->SetLineColor(kColorITS);
     fNodes->Add(node);
+
 }
 //_____________________________________________________________________________
 void AliITSvPPRcoarsesymm::CreateGeometry(){
@@ -262,7 +273,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
 ////////////////////////////////////////////////////////////////////////
   
   //INNER RADII OF THE SILICON LAYERS 
-  Float_t rl[6]    = { 3.8095,7.,15.,24.,38.1,43.5765 };   
+  Float_t rl[6]    = { 3.8095,7.,15.,24.,38.5,43.5765 };   
   //THICKNESSES OF LAYERS (in % radiation length)
   Float_t drl[6]   = { 1.03,1.03,0.94,0.95,0.91,0.87 };   
   //HALF LENGTHS OF LAYERS  
@@ -803,14 +814,14 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[1] = 3.;         
   dgh[2] = 5.;  // 5. comes from the fact that the volume has to be 567.6/2 cm^3       
   gMC->Gsvolu("ISR1", "TUBE", idtmed[286], dgh, 3);   
-  gMC->Gspos("ISR1", 1, "ALIC", 54.9, 11., 79.5, 0, "ONLY");   
-  gMC->Gspos("ISR1", 2, "ALIC", 54.9, -11., 79.5, 0, "ONLY");   
-  gMC->Gspos("ISR1", 3, "ALIC", -54.9, 11., 79.5, 0, "ONLY"); 
-  gMC->Gspos("ISR1", 4, "ALIC", -54.9, -11., 79.5, 0, "ONLY");  
-  gMC->Gspos("ISR1", 5, "ALIC", 54.9, 11., -79.5, 0, "ONLY");   
-  gMC->Gspos("ISR1", 6, "ALIC", 54.9, -11., -79.5, 0, "ONLY");   
-  gMC->Gspos("ISR1", 7, "ALIC", -54.9, 11., -79.5, 0, "ONLY"); 
-  gMC->Gspos("ISR1", 8, "ALIC", -54.9, -11., -79.5, 0, "ONLY");         
+  gMC->Gspos("ISR1", 1, "ITSV", 53.4292, 10.7053, 79.75, 0, "ONLY");    
+  gMC->Gspos("ISR1", 2, "ITSV", 53.4292, -10.7053, 79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 3, "ITSV", -53.4292, 10.7053, 79.75, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 4, "ITSV", -53.4292, -10.7053, 79.75, 0, "ONLY");  
+  gMC->Gspos("ISR1", 5, "ITSV", 53.4292, 10.7053, -79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 6, "ITSV", 53.4292, -10.7053, -79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 7, "ITSV", -53.4292, 10.7053, -79.75, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 8, "ITSV", -53.4292, -10.7053, -79.75, 0, "ONLY");          
   
   // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE ABSORBER