remove unneccessary EINCLUDE, lead to wrong include path also for normal JETAN libs

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

diff --git a/ITS/AliITSv11GeometrySPD.cxx b/ITS/AliITSv11GeometrySPD.cxx
index eb9eca8685d890704185536a7ccc1920c4628dc0..cfb2765f9d9cff79f64479b8c80aa14efdcade4e 100644 (file)
--- a/ITS/AliITSv11GeometrySPD.cxx
+++ b/ITS/AliITSv11GeometrySPD.cxx
@@ -2576,7 +2576,7 @@ TList* AliITSv11GeometrySPD::CreateConeModule(Bool_t sideC, const Double_t angro
     const Double_t kCollThickness   =  10.0  *fgkmm;
     const Double_t kCollTubeThick   =   1.0  *fgkmm;
     const Double_t kCollTubeRadius  =   7.0  *fgkmm;
-    const Double_t kCollTubeLength  = 190.0  *fgkmm;
+    const Double_t kCollTubeLength  = 205.0  *fgkmm;
 
     const Double_t kOptFibDiamet    =   4.5  *fgkmm;
 
@@ -2586,7 +2586,10 @@ TList* AliITSv11GeometrySPD::CreateConeModule(Bool_t sideC, const Double_t angro
     Int_t kPurple = 6; // Purple (Root does not define it)
 
     TGeoVolumeAssembly* container[5];
-    container[0] = new TGeoVolumeAssembly("ITSSPDConeModule");
+    if (sideC)
+    container[0] = new TGeoVolumeAssembly("ITSSPDConeModuleC");
+    else
+    container[0] = new TGeoVolumeAssembly("ITSSPDConeModuleA");
     container[1] = new TGeoVolumeAssembly("ITSSPDCoolingModuleSideA");
     container[2] = new TGeoVolumeAssembly("ITSSPDCoolingModuleSideC");
     container[3] = new TGeoVolumeAssembly("ITSSPDPatchPanelModule");
@@ -2661,7 +2664,7 @@ TList* AliITSv11GeometrySPD::CreateConeModule(Bool_t sideC, const Double_t angro
     volCollTube->SetLineColor(kAzure);
 
     // The cooling tube on the cone as a Ctub
-    Double_t tubeLength = shCable->GetX(5) - shCable->GetX(0) + kYtoHalfStave;
+    Double_t tubeLength = shCable->GetX(5) - shCable->GetX(0) + kYtoHalfStave -0.85;
     TGeoCtub *shTube = new TGeoCtub(0, kConeTubeRmax, 0.5*tubeLength, 0, 360,
                                    0, SinD(angrot/2), -CosD(angrot/2),
                                    0,              0,              1);
@@ -2716,7 +2719,7 @@ TList* AliITSv11GeometrySPD::CreateConeModule(Bool_t sideC, const Double_t angro
     volCylGasFr->SetLineColor(kPurple);
 
     // The optical fibers bundle on the cone as a Tube
-    Double_t optLength = shCable->GetX(5) - shCable->GetX(0) + kYtoHalfStave;
+    Double_t optLength = shCable->GetX(5) - shCable->GetX(0) + kYtoHalfStave -0.85;
     TGeoTube *shOptFibs = new TGeoTube(0., 0.5*kOptFibDiamet, 0.5*optLength);
 
     TGeoVolume *volOptFibs = new TGeoVolume("ITSSPDOpticalFibersOnCone",
@@ -2811,7 +2814,7 @@ TList* AliITSv11GeometrySPD::CreateConeModule(Bool_t sideC, const Double_t angro
       container[0]->AddNode(volCollTube, 1, trCollTube);
     }
         
-    Double_t dxPatch = 2.9;
+    Double_t dxPatch = 2.75;
     Double_t dzPatch = 2.8;
     TGeoCombiTrans *tr2 = new TGeoCombiTrans(1.7*ext2Length - dxPatch, 0.0, dzPatch, rot2);
     container[3]->AddNode(volPatch, 0, tr2);
@@ -2887,7 +2890,7 @@ void AliITSv11GeometrySPD::CreateCones(TGeoVolume *moth) const
     const Int_t kNumberOfModules    =  10;
 
     const Double_t kInnerRadius     =  80.775*fgkmm;
-    const Double_t kZTrans          = 452.000*fgkmm;
+    const Double_t kZTrans          = 451.800*fgkmm;
     const Double_t kAlphaRot        =  46.500*fgkDegree;
     const Double_t kAlphaSpaceCool  =   9.200*fgkDegree;