v0.9.1

diff --git a/mvd.C b/mvd.C
index 210f7b516ce271da6773d19462f94c8f6ef1f771..8d1da9f4025777c6610be39ede09636fda92e43f 100644 (file)
--- a/mvd.C
+++ b/mvd.C
@@ -2,7 +2,8 @@ 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] = {{5.0, 5.15, 0.015}, {8.0, 8.0, 0.015}, {11.0, 9.9, 0.0300}, {14.0, 12.75, 0.0300}};
-Float_t stationPosition[4] = {5.0, 10.0, 15.0, 20.0};
+Float_t stationPosition[4] = {35.0, 65.0, 110.0, 170.0};
+//Float_t stationPosition[4] = {5.0, 10.0, 15.0, 20.0};
 Float_t carrierClampOverlap = 1.0;
 Float_t heatsinkWidth[4] = {23.1, 31.1, 34.34, 37.7};
 Float_t heatsinkHeight = 37.7;
@@ -50,11 +51,11 @@ void mvd()
    TGeoVolume *sensorPassive = manager->MakeBox("sensorPassive", Al, sensorDimensionsPassive[0]/2, sensorDimensionsPassive[1]/2, sensorDimensionsPassive[2]/2);
    TGeoVolume *sensorGlue = manager->MakeBox("sensorGlue", glue, sensorDimensionsActive[0]/2, (sensorDimensionsActive[1] + sensorDimensionsPassive[1])/2, glueThickness/2);
    sensorActive->SetTransparency(0);
-   sensorActive->SetLineColor(24);
+   sensorActive->SetLineColor(kAzure+3);
    sensorPassive->SetTransparency(0);
-   sensorGlue->SetLineColor(34);
+   sensorPassive->SetLineColor(kCyan+1);
    sensorGlue->SetTransparency(0);
-   sensorPassive->SetLineColor(44);
+   sensorGlue->SetLineColor(kCyan-10);
 
    TGeoTranslation T;
    TGeoRotation R;
@@ -102,7 +103,9 @@ void mvd()
       Float_t cd[3] = {carrierDimensions[i][0], carrierDimensions[i][1], carrierDimensions[i][2]};
       TGeoVolume *carrier = manager->MakeBox(carrier_name, Al, cd[0]/2, cd[1]/2, cd[2]/2);
       carrier->SetTransparency(0);
-      carrier->SetLineColor(13);
+      if (TMath::Sqrt(TMath::Power(cd[0], 2) + TMath::Power(cd[1], 2)) <= 12.6) carrier->SetLineColor(kWhite);
+      else carrier->SetLineColor(kGray+3);
+      carrier->SetLineColor(kGray+3);
       T.SetTranslation(-cd[0]/2, -cd[1]/2, 0);
       R.SetAngles(0.,0.,0.);
       M = new TGeoCombiTrans(T,R);
@@ -115,8 +118,8 @@ void mvd()
       Float_t width_1  = heatsinkWidth[i]/2 + quadrantBeamOffset[i];
       Float_t thickness = (heatsinkThickness-cd[2])/2.;
       TGeoVolume* hs_part1 = manager->MakeBox(heatsinkpart_name, Al, width_1/2., height_1/2., thickness/2.);
-      hs_part1->SetTransparency(0);
-      hs_part1->SetLineColor(47);
+      hs_part1->SetTransparency(10);
+      hs_part1->SetLineColor(kGray);
       T.SetTranslation(-width_1/2, -height_1/2-cd[1]+carrierClampOverlap, +(thickness+cd[2])/2*(1.0+explosion/0.2));
       M = new TGeoCombiTrans(T,R);
       quadrant->AddNode(hs_part1, 1, M);
@@ -128,8 +131,8 @@ void mvd()
       Float_t height_2 = heatsinkWidth[i] - height_1 - width_1;
       Float_t width_2  = heatsinkWidth[i]/2 - cd[0] + carrierClampOverlap + quadrantBeamOffset[i];
       TGeoVolume* hs_part2 = manager->MakeBox(heatsinkpart_name, Al, width_2/2, height_2/2, thickness/2);
-      hs_part2->SetTransparency(0);
-      hs_part2->SetLineColor(47);
+      hs_part2->SetTransparency(10);
+      hs_part2->SetLineColor(kGray);
       T.SetTranslation(-width_2/2-cd[0]+carrierClampOverlap, -height_2/2, +(thickness+cd[2])/2);
       M = new TGeoCombiTrans(T,R);
       quadrant->AddNode(hs_part2, 1, M);
@@ -141,8 +144,8 @@ void mvd()
       Float_t height = (heatsinkHeight-heatsinkWidth[i])/2;
       if (height > 0.1) {
          TGeoVolume* hs_part3 = manager->MakeBox(heatsinkpart_name, Al, heatsinkWidth[i]/2, height/2, heatsinkThickness/2);
-         hs_part3->SetTransparency(0);
-         hs_part3->SetLineColor(47);
+         hs_part3->SetTransparency(10);
+         hs_part3->SetLineColor(kGray);
          T.SetTranslation(0, height/2+heatsinkWidth[i]/2, 0);
          M = new TGeoCombiTrans(T,R);
          heatsink->AddNode(hs_part3, 1, M);