correcting placement of 'using' statements (Thorsten), minor coverity defect corrected

[u/mrichter/AliRoot.git] / MFT / SetMFTGeometry.C

diff --git a/MFT/SetMFTGeometry.C b/MFT/SetMFTGeometry.C
index 4a3528ae1841b1a95286db15b539b2ca0c44a415..01902598110773bde8a06fcf9588181495d339c4 100644 (file)
--- a/MFT/SetMFTGeometry.C
+++ b/MFT/SetMFTGeometry.C
@@ -10,23 +10,25 @@ void SetMFTGeometry() {
 
   const Int_t nPlanes = 5;
   
-  const Float_t zCenter[nPlanes]          = {  -50.0,   -58.0,   -66.0,   -74.0,   -82.0 };   // expressed in cm
+  const Float_t zCenter[nPlanes]          = {  -50.0,   -58.0,   -66.0,   -72.0,   -76.0 };   // expressed in cm
                                          
-  const Float_t rMin[nPlanes]             = {   2.00,    2.31,    2.66,    3.01,    3.36 };   // expressed in cm  
-  const Float_t rMax[nPlanes]             = {   9.70,   11.11,   12.52,   13.93,   15.34 };   // expressed in cm
-                                         
-  const Float_t pixelSizeX[nPlanes]       = { 20.e-4,  20.e-4,  20.e-4,  20.e-4,  20.e-4 };   // expressed in cm
-  const Float_t pixelSizeY[nPlanes]       = { 20.e-4,  20.e-4,  20.e-4,  20.e-4,  20.e-4 };   // expressed in cm
+  const Float_t rMin[nPlanes]             = {   2.50,    2.50,    3.00,    3.50,    3.50 };   // expressed in cm  
+  const Float_t rMax[nPlanes]             = {   9.70,   11.00,   12.40,   13.40,   14.00 };   // expressed in cm
+
+  const Float_t pixelSizeX[nPlanes]       = { 25.e-4,  25.e-4,  25.e-4,  25.e-4,  25.e-4 };   // expressed in cm
+  const Float_t pixelSizeY[nPlanes]       = { 25.e-4,  25.e-4,  25.e-4,  25.e-4,  25.e-4 };   // expressed in cm
 
   const Float_t thicknessActive[nPlanes]  = {  50.e-4,   50.e-4,   50.e-4,   50.e-4,   50.e-4 };   // expressed in cm
   const Float_t thicknessSupport[nPlanes] = {2000.e-4, 2000.e-4, 2000.e-4, 2000.e-4, 2000.e-4 };   // expressed in cm
   const Float_t thicknessReadout[nPlanes] = {  50.e-4,   50.e-4,   50.e-4,   50.e-4,   50.e-4 };   // expressed in cm
 
-  const Float_t equivalentSilicon[nPlanes]            = { 300.e-4, 300.e-4, 300.e-4, 300.e-4, 300.e-4};    // expressed in cm
-  const Float_t equivalentSiliconBeforeFront[nPlanes] = {   0.e-4,   0.e-4,   0.e-4,   0.e-4,   0.e-4};    // expressed in cm
-  const Float_t equivalentSiliconBeforeBack[nPlanes]  = { 250.e-4, 250.e-4, 250.e-4, 250.e-4, 250.e-4};    // expressed in cm
+  const Float_t equivalentSilicon[nPlanes]            = { 400.e-4, 400.e-4, 400.e-4, 400.e-4, 400.e-4 };    // expressed in cm
+  const Float_t equivalentSiliconBeforeFront[nPlanes] = {   0.e-4,   0.e-4,   0.e-4,   0.e-4,   0.e-4 };    // expressed in cm
+  const Float_t equivalentSiliconBeforeBack[nPlanes]  = { 350.e-4, 350.e-4, 350.e-4, 350.e-4, 350.e-4 };    // expressed in cm
 
-  TNtuple *geomMFT = new TNtuple("AliMFTGeometry", "ALICE MFT Geometry", "zCenter:rMin:rMax:pixelSizeX:pixelSizeY:thicknessActive:thicknessSupport:thicknessReadout:equivalentSilicon:equivalentSiliconBeforeFront:equivalentSiliconBeforeBack");
+  const Float_t hasPixelRectangularPatternAlongY[nPlanes] = {0., 0., 0., 0., 0.};
+                                        
+  TNtuple *geomMFT = new TNtuple("AliMFTGeometry", "ALICE MFT Geometry", "zCenter:rMin:rMax:pixelSizeX:pixelSizeY:thicknessActive:thicknessSupport:thicknessReadout:equivalentSilicon:equivalentSiliconBeforeFront:equivalentSiliconBeforeBack:hasPixelRectangularPatternAlongY");
 
   for (Int_t iPlane=0; iPlane<nPlanes; iPlane++) geomMFT -> Fill(zCenter[iPlane],
                                                                 rMin[iPlane],
@@ -38,7 +40,8 @@ void SetMFTGeometry() {
                                                                 thicknessReadout[iPlane],
                                                                 equivalentSilicon[iPlane],
                                                                 equivalentSiliconBeforeFront[iPlane],
-                                                                equivalentSiliconBeforeBack[iPlane]);
+                                                                equivalentSiliconBeforeBack[iPlane],
+                                                                hasPixelRectangularPatternAlongY[iPlane]);
 
   TFile *fileGeomMFT = new TFile("AliMFTGeometry.root", "recreate");
   geomMFT -> Write();