Modified range of vertical displacement for alignment purposes (E. Cattaruzza)

diff --git a/ITS/AliITSv11GeometrySSD.cxx b/ITS/AliITSv11GeometrySSD.cxx
index 5d534b7712a71bb4b4207ddda9cf281a43f80dcf..1923649680ad82d58755f8e8c803e99e7657c6ec 100644 (file)
--- a/ITS/AliITSv11GeometrySSD.cxx
+++ b/ITS/AliITSv11GeometrySSD.cxx
@@ -39,14 +39,14 @@
 /////////////////////////////////////////////////////////////////////////////////
 // Names of the Sensitive Volumes of Layer 5 and Layer 6
 /////////////////////////////////////////////////////////////////////////////////
-const char* AliITSv11GeometrySSD::fgSDDsensitiveVolName5 = "ITSsddSensitivL5";
-const char* AliITSv11GeometrySSD::fgSDDsensitiveVolName6 = "ITSsddSensitivL6";
+const char* AliITSv11GeometrySSD::fgSSDsensitiveVolName5 = "ITSssdSensitivL5";
+const char* AliITSv11GeometrySSD::fgSSDsensitiveVolName6 = "ITSssdSensitivL6";
 /////////////////////////////////////////////////////////////////////////////////
 //Parameters for SSD Geometry
 /////////////////////////////////////////////////////////////////////////////////
 // Variable for Vertical Disalignement of Modules
 /////////////////////////////////////////////////////////////////////////////////
-const Double_t AliITSv11GeometrySSD::fgkSSDModuleVerticalDisalignment = 0.1*fgkmm;
+const Double_t AliITSv11GeometrySSD::fgkSSDModuleVerticalDisalignment = 0.2*fgkmm;
 /////////////////////////////////////////////////////////////////////////////////
 // Layer5 (lengths are in mm and angles in degrees)
 /////////////////////////////////////////////////////////////////////////////////
@@ -1517,7 +1517,7 @@ void AliITSv11GeometrySSD::CreateTransformationMatrices(){
                       -                0.5*(fgkCarbonFiberLowerSupportWidth+fgkSSDSensorCenterSupportLength
                       -       fgkSSDSensorCenterSupportThickness[0])+0.5*fgkSSDSensorLength,
                                                        0.5*fgkSSDSensorHeight-0.5*fgkCoolingTubeSupportHeight
-                                         -             fgkSSDModuleCoolingBlockToSensor-fgkSSDModuleVerticalDisalignment
+                                         -             fgkSSDModuleCoolingBlockToSensor-0.5*fgkSSDModuleVerticalDisalignment
                                          +    (fgkSSDSensorSideSupportHeight[1]
                                          -             fgkSSDSensorSideSupportHeight[0]));
   localssdsensortrans[1]->SetTranslation(0.5*fgkCarbonFiberTriangleLength,
@@ -1527,7 +1527,7 @@ void AliITSv11GeometrySSD::CreateTransformationMatrices(){
                       -                0.5*(fgkCarbonFiberLowerSupportWidth+fgkSSDSensorCenterSupportLength
                       -       fgkSSDSensorCenterSupportThickness[0])+0.5*fgkSSDSensorLength,
                                                    0.5*fgkSSDSensorHeight-0.5*fgkCoolingTubeSupportHeight
-                                                       -fgkSSDModuleCoolingBlockToSensor-fgkSSDModuleVerticalDisalignment);
+                                                       -fgkSSDModuleCoolingBlockToSensor-0.5*fgkSSDModuleVerticalDisalignment);
   for(Int_t i=0; i<2; i++) 
        localssdsensorcombitrans[i] = new TGeoCombiTrans(*localssdsensortrans[i],
                                                                                                         *localssdsensorrot);   
@@ -1873,9 +1873,9 @@ void AliITSv11GeometrySSD::SetSSDSensor(){
                                                 0.5*fgkSSDSensorHeight,
                                                 0.5*ssdsensitivelength);
   TGeoVolume* ssdsensorsensitiveLay5 = 
-       new TGeoVolume(fgSDDsensitiveVolName5,ssdsensorsensitiveshape,fSSDSensorMedium);
+       new TGeoVolume(fgSSDsensitiveVolName5,ssdsensorsensitiveshape,fSSDSensorMedium);
   TGeoVolume* ssdsensorsensitiveLay6 = 
-       new TGeoVolume(fgSDDsensitiveVolName6,ssdsensorsensitiveshape,fSSDSensorMedium);
+       new TGeoVolume(fgSSDsensitiveVolName6,ssdsensorsensitiveshape,fSSDSensorMedium);
   ssdsensorsensitiveLay5->SetLineColor(fColorSilicon);
   ssdsensorsensitiveLay6->SetLineColor(fColorSilicon);
   TGeoBBox* ssdsensorinsensitiveshape[2];
@@ -7445,4 +7445,3 @@ void AliITSv11GeometrySSD::CreateMaterials(){
   fCreateMaterials = kTRUE;
 }
 /////////////////////////////////////////////////////////////////////
-

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index 46f98035e33939c0088f409e2217fc91024b8e4b..ccae7817880bafbf5a0d31e9559ff2d909810c66 100644 (file)
--- a/ITS/AliITSv11GeometrySSD.h
+++ b/ITS/AliITSv11GeometrySSD.h
@@ -31,9 +31,9 @@ public:
   // Public methods
   /////////////////////////////////////////////////////////////////////////
   TGeoMedium* GetMedium(const char* mediumName);   // It returns the Medium
-  const char*   GetSenstiveVolumeName5() const {return fgSDDsensitiveVolName5;};
+  const char*   GetSenstiveVolumeName5() const {return fgSSDsensitiveVolName5;};
   // it returns the Sensitive Volume of Layer 5
-  const char*   GetSenstiveVolumeName6() const {return fgSDDsensitiveVolName6;};
+  const char*   GetSenstiveVolumeName6() const {return fgSSDsensitiveVolName6;};
   // it returns the Sensitive Volume of Layer 6
   TGeoVolumeAssembly* GetLadderSegment(Int_t i){return fladdersegment[i];}; // Get Ladder Segment
   TGeoVolumeAssembly* GetEndLadderSegment(Int_t i){return fendladdersegment[i];}; // Get End Ladder Segment 
@@ -55,8 +55,8 @@ private:
   /////////////////////////////////////////////////////////////////////////////////
   // Names of the Sensitive Volumes of Layer 5 and Layer 6
   /////////////////////////////////////////////////////////////////////////////////
-  static const char* fgSDDsensitiveVolName5;       // sens. vol. name for lay. 5
-  static const char* fgSDDsensitiveVolName6;       // sens. vol. name for lay. 6
+  static const char* fgSSDsensitiveVolName5;       // sens. vol. name for lay. 5
+  static const char* fgSSDsensitiveVolName6;       // sens. vol. name for lay. 6
   /////////////////////////////////////////////////////////////////////////////////
   // Variable for Vertical Disalignement of Modules
   /////////////////////////////////////////////////////////////////////////////////
@@ -606,4 +606,3 @@ private:
 ClassDef(AliITSv11GeometrySSD, 3)     // ITS v11 SSD geometry
 };
 #endif
-