Updated SPD and SSD geometries.
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 5 Nov 2008 16:09:36 +0000 (16:09 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 5 Nov 2008 16:09:36 +0000 (16:09 +0000)
In the SPD geometry, the two SPD service modules which were removed are back
in place, and the cooling tube radii are restored to their original values: in
this way all material budget is back in place.
The new SSD geometry fixes the long standing overlap between an SPD extender
and an SSD patch panel by moving the latter by 1 deg. clockwise (on two
copies for two identical overlaps).
The only remaining overlaps are the following:

=== Overlaps for Geometry ===
 = Overlap ov00000: ALIC/ITSV_1/ITSSPDConeModule_13/ITSSPDCoolingTubeCone_0 overlapping ALIC/F3MB_3/F3SU_2/FMD3_Cone_0 ovlp=0.517066
 = Overlap ov00001: ALIC/ITSV_1/ITSSPDConeModule_3/ITSSPDCoolingTubeCone_0 overlapping ALIC/F3MT_3/F3SU_1/FMD3_Cone_0 ovlp=0.517066
 = Overlap ov00002: ALIC/ITSV_1/ITSSPDConeModule_6/ITSSPDCoolingTubeCone_0 overlapping ALIC/F2MT_2/F2SF_2 ovlp=0.497731
 = Overlap ov00003: ALIC/ITSV_1/ITSSPDConeModule_16/ITSSPDCoolingTubeCone_0 overlapping ALIC/F2MB_2/F2SF_6 ovlp=0.497731
 = Overlap ov00004: ALIC/ITSV_1/ITSSPDConeModule_3/ITSSPDCoolingTubeCone_0 overlapping ALIC/F3MT_3/F3SU_1/FMD3_tension_box_0 ovlp=0.0479815
 = Overlap ov00005: ALIC/ITSV_1/ITSSPDConeModule_13/ITSSPDCoolingTubeCone_0 overlapping ALIC/F3MB_3/F3SU_2/FMD3_tension_box_0 ovlp=0.0479815

Mario Sitta

ITS/AliITSv11GeometrySPD.cxx
ITS/AliITSv11GeometrySSD.cxx

index 6870ef8..2db9daf 100644 (file)
@@ -3028,7 +3028,7 @@ TGeoVolumeAssembly* AliITSv11GeometrySPD::CreateConeModule(TGeoManager *mgr) con
     TGeoVolume *volCable = new TGeoVolume("ITSSPDExtender", shCable, medExt);
     volCable->SetLineColor(kGreen);
     
-    TGeoVolume *volTube = gGeoManager->MakeTube("ITSSPDCoolingTubeCone", medInox, 4.*fgkmm, 5.*fgkmm, 0.5*(x[5] - x[0]));
+    TGeoVolume *volTube = gGeoManager->MakeTube("ITSSPDCoolingTubeCone", medInox, 5.*fgkmm, 6.*fgkmm, 0.5*(x[5] - x[0]));
     volTube->SetLineColor(kGray);
     
     Double_t thickness = cableThickness + mcmThickness;
@@ -3085,7 +3085,6 @@ void AliITSv11GeometrySPD::CreateCones(TGeoVolume *moth) const
        angle2[i] -= 1.5;
         rot2->RotateZ(90.0 - angle2[i]);
         TGeoCombiTrans *tr2 = new TGeoCombiTrans(0.0, 0.0, -40.4, rot2);
-        if (i != 1 && i != 6)
         moth->AddNode(module, 2*i+1, tr2);
     }
 }
index bb7f2a5..bd6445d 100644 (file)
@@ -8093,10 +8093,10 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){
   ssdcablepatchpanel3RB26pcon->SetLineColor(9);
   TGeoRotation* ssdcablepatchpanel3B26rot[3];
   for(Int_t i=0; i<4; i++) ssdcablepatchpanel3B26rot[i] = new TGeoRotation();
-  ssdcablepatchpanel3B26rot[0]->SetAngles(0.0,0.0,0.0);
+  ssdcablepatchpanel3B26rot[0]->SetAngles(1.0,0.0,0.0);
   ssdcablepatchpanel3B26rot[1]->SetAngles(fgkSSDCablesPatchPanel2RB26Angle[0]
                                                                  +                       fgkSSDCablesPatchPanel2RB26Angle[1],0.0,0.0);
-  ssdcablepatchpanel3B26rot[2]->SetAngles(180.0,0.0,0.0);
+  ssdcablepatchpanel3B26rot[2]->SetAngles(181.0,0.0,0.0);
   ssdcablepatchpanel3B26rot[3]->SetAngles(180.0+fgkSSDCablesPatchPanel2RB26Angle[0]
                                                                  +                       fgkSSDCablesPatchPanel2RB26Angle[1],0.0,0.0);
   for(Int_t i=0; i<4; i++) ssdcablesmother->AddNode(ssdcablepatchpanel3RB26pcon,i+1,ssdcablepatchpanel3B26rot[i]);