X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MFT%2FSetMFTGeometry.C;h=01902598110773bde8a06fcf9588181495d339c4;hb=17f8b959ecccf48d46ec150a053251be38955b70;hp=a86e6f9aa96306ba686703292bf415be8a354e82;hpb=aeb9584dd991990038a257333932a843a770aa6f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MFT/SetMFTGeometry.C b/MFT/SetMFTGeometry.C
index a86e6f9aa96..01902598110 100644
--- a/MFT/SetMFTGeometry.C
+++ b/MFT/SetMFTGeometry.C
@@ -12,21 +12,23 @@ void SetMFTGeometry() {
   
   const Float_t zCenter[nPlanes]          = {  -50.0,   -58.0,   -66.0,   -72.0,   -76.0 };   // expressed in cm
 				          
-  const Float_t rMin[nPlanes]             = {   2.20,    2.60,    3.00,    3.30,    3.60 };   // 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]       = { 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 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();