git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0fc4164)
Removed overlaps between SDD and SSD cables (M. Sitta)
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 16 May 2008 15:30:31 +0000 (15:30 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 16 May 2008 15:30:31 +0000 (15:30 +0000)
ITS/AliITSv11GeometrySDD.cxx patch | blob | blame | history
ITS/AliITSv11GeometrySupport.cxx patch | blob | blame | history

diff --git a/ITS/AliITSv11GeometrySDD.cxx b/ITS/AliITSv11GeometrySDD.cxx
index aa6d7b4edd054372dffa405ea50f702ccc12740c..e64faa64055c01847c8d90072f18f6e6055234a1 100755 (executable)
--- a/ITS/AliITSv11GeometrySDD.cxx
+++ b/ITS/AliITSv11GeometrySDD.cxx
@@ -5534,6 +5534,7 @@ void AliITSv11GeometrySDD::SDDCables(TGeoVolume *moth)
 // Created:         ???       Ludovic Gaudichet
 // Updated:      15 Mar 2008  Mario Sitta
 // Updated:      14 Apr 2008  Mario Sitta            Overlap fixes
 // Created:         ???       Ludovic Gaudichet
 // Updated:      15 Mar 2008  Mario Sitta
 // Updated:      14 Apr 2008  Mario Sitta            Overlap fixes
+// Updated:      09 May 2008  Mario Sitta            SSD overlap fixes
 //
 
   TGeoMedium *copper       = GetMedium("COPPER$");
 //
 
   TGeoMedium *copper       = GetMedium("COPPER$");
@@ -5815,15 +5816,16 @@ void AliITSv11GeometrySDD::SDDCables(TGeoVolume *moth)
   //==================================
 
   Double_t fgkSDDCableR6 = fgkSDDCableR5+9;
   //==================================
 
   Double_t fgkSDDCableR6 = fgkSDDCableR5+9;
-  Double_t fgkSDDCableZ6 = fgkSDDCableZ5+9;
+  Double_t fgkSDDCableZ6 = fgkSDDCableZ5+8.8;
 
   TGeoVolumeAssembly *endConeSDDCable = new TGeoVolumeAssembly("endConeSDDCable");
 
 
   TGeoVolumeAssembly *endConeSDDCable = new TGeoVolumeAssembly("endConeSDDCable");
 
+  // Add some hardcoded shifts to avoid overlaps with SSD pathc panels
   CreateAndInsetConeCablePart(endConeSDDCable, 40, 1*3,2*4, fgkSDDCableR5,
   CreateAndInsetConeCablePart(endConeSDDCable, 40, 1*3,2*4, fgkSDDCableR5,
-                             fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
+                             fgkSDDCableZ5,fgkSDDCableR6+0.7,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 60, 1*3,1*4, fgkSDDCableR5,
 
   CreateAndInsetConeCablePart(endConeSDDCable, 60, 1*3,1*4, fgkSDDCableR5,
-                             fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
+                             fgkSDDCableZ5,fgkSDDCableR6+0.6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 85, 2*3,1*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 85, 2*3,1*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
@@ -5832,10 +5834,10 @@ void AliITSv11GeometrySDD::SDDCables(TGeoVolume *moth)
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 110, 2*3,3*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 110, 2*3,3*4, fgkSDDCableR5,
-                             fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
+                             fgkSDDCableZ5,fgkSDDCableR6+0.9,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 146, 0*3,3*4, fgkSDDCableR5,
 
   CreateAndInsetConeCablePart(endConeSDDCable, 146, 0*3,3*4, fgkSDDCableR5,
-                             fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
+                             fgkSDDCableZ5,fgkSDDCableR6+0.7,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 176.1, 0*3,1*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 176.1, 0*3,1*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
@@ -5853,9 +5855,9 @@ void AliITSv11GeometrySDD::SDDCables(TGeoVolume *moth)
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 315, 1*3,1*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   CreateAndInsetConeCablePart(endConeSDDCable, 315, 1*3,1*4, fgkSDDCableR5,
-                             fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
+                             fgkSDDCableZ5,fgkSDDCableR6+0.6,fgkSDDCableZ6);
 
 
-  CreateAndInsetConeCablePart(endConeSDDCable, 350.1, 1*3,3*4, fgkSDDCableR5,
+  CreateAndInsetConeCablePart(endConeSDDCable, 353, 1*3,3*4, fgkSDDCableR5,
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   moth->AddNode(endConeSDDCable, 1, 0);
                              fgkSDDCableZ5,fgkSDDCableR6,fgkSDDCableZ6);
 
   moth->AddNode(endConeSDDCable, 1, 0);
diff --git a/ITS/AliITSv11GeometrySupport.cxx b/ITS/AliITSv11GeometrySupport.cxx
index affdb3513599174f93b647eb10a207e5562b88e9..fb0a913018ec0f7c2615fe6fd0a0c987f8bc3091 100644 (file)
--- a/ITS/AliITSv11GeometrySupport.cxx
+++ b/ITS/AliITSv11GeometrySupport.cxx
@@ -65,7 +65,7 @@ void AliITSv11GeometrySupport::SPDCone(TGeoVolume *moth,TGeoManager *mgr)
 
 
   // Dimensions of the Central shield
 
 
   // Dimensions of the Central shield
-  const Double_t kHalfLengthCentral  = 400.*fgkmm;
+  const Double_t kHalfLengthCentral  = 405.*fgkmm;
   const Double_t kThicknessCentral   = 0.4*fgkmm;
   const Double_t kInnerRadiusCentral = 8.1475*fgkcm;
   const Double_t kOuterRadiusCentral = 9.9255*fgkcm;
   const Double_t kThicknessCentral   = 0.4*fgkmm;
   const Double_t kInnerRadiusCentral = 8.1475*fgkcm;
   const Double_t kOuterRadiusCentral = 9.9255*fgkcm;
@@ -1320,8 +1320,8 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth,TGeoManager *mgr)
                                       (kCylinderHalfLength-kFoamHalfLength)/2.;
   const Double_t kFlangeInnerRadius    = ( 563.0/2) *fgkmm;
   // Dimensions of the Cone
                                       (kCylinderHalfLength-kFoamHalfLength)/2.;
   const Double_t kFlangeInnerRadius    = ( 563.0/2) *fgkmm;
   // Dimensions of the Cone
-  const Double_t kConeROuterMin        = ( 945.0/2) *fgkmm;
-  const Double_t kConeROuterMax        = ( 985.0/2) *fgkmm;
+  const Double_t kConeROuterMin        = ( 957.0/2) *fgkmm;
+  const Double_t kConeROuterMax        = ( 997.0/2) *fgkmm;
   const Double_t kConeRInnerMin        = ( 564.0/2) *fgkmm;
   const Double_t kConeRCurv1           =       10.0 *fgkmm;
   const Double_t kConeRCurv2           =       25.0 *fgkmm;
   const Double_t kConeRInnerMin        = ( 564.0/2) *fgkmm;
   const Double_t kConeRCurv1           =       10.0 *fgkmm;
   const Double_t kConeRCurv2           =       25.0 *fgkmm;