From d343aaaaf381b2525cf0d1caa5afd9f6a1c37058 Mon Sep 17 00:00:00 2001
From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Fri, 4 Aug 2017 17:51:58 +0200
Subject: [PATCH] v0.9.8

---
 mvd.C | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/mvd.C b/mvd.C
index 2a68b3e..aa567f5 100644
--- a/mvd.C
+++ b/mvd.C
@@ -1,7 +1,6 @@
 static const int numStations = 4;
 // all units are in cm
 Float_t quadrantBeamOffset[4] = {0.54, 0.54, 0.82, 1.04};
-Float_t carrierDimensions[4][3] = {{4.0, 4.15, 0.015}, {7.0, 7.0, 0.015}, {10.0, 8.9, 0.0300}, {13.0, 11.75, 0.0300}};
 //Float_t stationPosition[4] = {8.0, 12.0, 16.0, 20.0};
 Float_t stationPosition[4] = {5.0, 10.0, 15.0, 20.0};
 Float_t carrierClampOverlap = 0.0;
@@ -11,13 +10,25 @@ Float_t heatsinkThickness = 1.;
 Float_t fpcWidth = 1.9;
 Float_t fpcThickness = 0.0009;
 Float_t glueThickness = 0.0008;
+/* 3xFSBB : 30 x 13 mm2 (of which the lower 3mm inactive) */
+///*
 int sensorRows[4] = {2, 5, 7, 10};
 int sensorCols[4] = {1, 2, 3,  4};
-// 3xFSBB : 30 x 13 mm2 (of which the lower 3mm inactive)
 Float_t sensorDimensionsActive[3]  = {3., 1.0, 0.005};
 Float_t sensorDimensionsPassive[3] = {3., 0.3, 0.005};
+Float_t carrierDimensions[4][3] = {{4.0, 4.15, 0.015}, {7.0, 7.0, 0.015}, {10.0, 8.9, 0.0300}, {13.0, 11.75, 0.0300}};
+//*/
+/* MISTRAL https://indico.gsi.de/contributionDisplay.py?contribId=8&sessionId=6&confId=4759
+   30.97 x 16.55 mm2 (of which the lower 3mm inactive) */
+/*
+int sensorRows[4] = {2, 4, 5, 7};
+int sensorCols[4] = {1, 2, 3,  4};
+Float_t sensorDimensionsActive[3]  = {3.097, 1.355, 0.005};
+Float_t sensorDimensionsPassive[3] = {3.097, 0.300, 0.005};
+Float_t carrierDimensions[4][3] = {{4.10, 4.62, 0.015}, {7.19, 7.22, 0.015}, {10.29, 8.53, 0.0300}, {13.39, 11.14, 0.0300}};
+*/
 Float_t sensorPitch = sensorDimensionsActive[1] - 0.05;
-Float_t sensorSpacing = 0.01;
+Float_t sensorSpacing = 0.0; // realistically: 0.01 (100um)
 Float_t fpcDimensions[3] = {-1, 1.0, 0.004};
 Float_t explosion = .0; // set to 0. for no explosion, and 5. for a heavy explosion
 
@@ -70,7 +81,7 @@ void mvd()
    R.SetAngles(0.,0.,0.);
    Float_t x_offset = -sensorDimensionsActive[0]/2;
    Float_t y_offset = -(sensorDimensionsActive[1]+sensorDimensionsPassive[1])/2;
-   Float_t z_offset = -glueThickness/2;
+   Float_t z_offset = glueThickness/2;
    T.SetTranslation(x_offset, y_offset, -z_offset);
    M = new TGeoCombiTrans(T,R);
    sensor->AddNode(sensorGlue, 1, M);
@@ -230,8 +241,8 @@ void mvd()
       }
    top->AddNode(mvd, 1);
    manager->CloseGeometry();
-   manager->CheckOverlaps(ovlp=0.01);
-   top->CheckOverlaps(ovlp=0.01);
+   manager->CheckOverlaps(0.001, "s");
+   //top->CheckOverlaps(ovlp=0.01);
    //manager->CheckGeometryFull();
    top->Export("mvd.root");
    mvd->Draw("ogl");
-- 
2.43.0