Skip to content
Snippets Groups Projects
Commit 39508097 authored by Peilian Li's avatar Peilian Li
Browse files

new layout for lumi447 eta 4.8 inner radius 7.2 and require 6 hits

parent ba5d6e66
Branches peilian_newlayout_lumi447_eta48_inR72_nhits6
No related tags found
No related merge requests found
Pipeline #6824887 failed with stages
in 2 minutes and 46 seconds
......@@ -126,9 +126,9 @@ static long test_load_devp( dd4hep::Detector& description, int argc, char** argv
const std::array<double, VP::NModules> moduleZPositions{
-287.5, -275.0, -262.5, -250.0, -237.5, -225.0, -212.5, -200.0, -137.5, -125.0, -62.5, -50.0, -37.5,
-25.0, -12.5, 0.0, 12.5, 25.0, 37.5, 50.0, 62.5, 75.0, 87.5, 100.0, 120.4,
137.5, 150.0, 162.5, 175.0, 187.5, 200.0, 212.5, 225.0, 237.5, 278.5, 287.5, 312.4,
325.0, 387.5, 400.0, 487.5, 500.0, 587.5, 600.0, 637.5, 650.0, 687.5, 700.0, 737.5, 750.0};
-25.0, -12.5, 0.0, 12.5, 15, 20, 25.0, 30, 37.5, 45, 50.0, 55, 62.5, 67, 75.0, 80, 87.5, 100.0, 110, 120.4, 125, 130,
137.5, 150.0, 155, 162.5, 170, 175.0, 180, 187.5, 192, 200.0, 212.5, 225.0, 237.5, 278.5, 287.5, 312.4, 320,
325.0, 340, 387.5, 400.0, 487.5, 500.0, 587.5, 600.0, 637.5, 650.0, 687.5, 700.0, 737.5, 750.0};
const std::array<double, VP::NSensorsPerModule> sensorXPositions{-12.7173, 26.1347, 9.8394, 49.6636};
......
......@@ -12,7 +12,7 @@
namespace VP {
static const unsigned int NModules = 50;
static const unsigned int NModules = 66;
static const unsigned int NSensorsPerModule = 4;
static const unsigned int NSensors = NModules * NSensorsPerModule;
static const unsigned int NChipsPerSensor = 3;
......
......@@ -90,8 +90,15 @@ LHCb::Detector::detail::DeVPSideObject::DeVPSideObject( const dd4hep::DetElement
{de.child( isLeft ? "Module43" : "Module42" ), ctxt, isLeft},
{de.child( isLeft ? "Module45" : "Module44" ), ctxt, isLeft},
{de.child( isLeft ? "Module47" : "Module46" ), ctxt, isLeft},
{de.child( isLeft ? "Module49" : "Module48" ), ctxt, isLeft}}}{
//{de.child( isLeft ? "Module51" : "Module50" ), ctxt, isLeft}}} {
{de.child( isLeft ? "Module49" : "Module48" ), ctxt, isLeft},
{de.child( isLeft ? "Module51" : "Module50" ), ctxt, isLeft},
{de.child( isLeft ? "Module53" : "Module52" ), ctxt, isLeft},
{de.child( isLeft ? "Module55" : "Module54" ), ctxt, isLeft},
{de.child( isLeft ? "Module57" : "Module56" ), ctxt, isLeft},
{de.child( isLeft ? "Module59" : "Module58" ), ctxt, isLeft},
{de.child( isLeft ? "Module61" : "Module60" ), ctxt, isLeft},
{de.child( isLeft ? "Module63" : "Module62" ), ctxt, isLeft},
{de.child( isLeft ? "Module65" : "Module64" ), ctxt, isLeft}}} {
// Finding the detector parent
auto parent = detector().parent();
......
......@@ -25,7 +25,7 @@
<constant name="VP:VeloDSEndDeltaZ" value="135*mm"/>
<constant name="VP:VeloEWFlangeZExcess" value="5*mm"/>
<constant name="VP:NoOfStations" value="25"/>
<constant name="VP:NoOfStations" value="33"/>
<constant name="VP:Rotation" value="45*degree"/>
......@@ -41,25 +41,33 @@
<constant name="VP:Station03Z" value="-20.625*cm"/>
<constant name="VP:Station04Z" value="-13.125*cm"/>
<constant name="VP:Station05Z" value="-6.33*cm"/>
<constant name="VP:Station06Z" value="-3.78*cm"/>
<constant name="VP:Station07Z" value="-1.24*cm"/>
<constant name="VP:Station08Z" value="1.30*cm"/>
<constant name="VP:Station09Z" value="3.84*cm"/>
<constant name="VP:Station10Z" value="6.39*cm"/>
<constant name="VP:Station11Z" value="8.93*cm"/>
<constant name="VP:Station12Z" value="11.47*cm"/>
<constant name="VP:Station13Z" value="14.02*cm"/>
<constant name="VP:Station14Z" value="16.56*cm"/>
<constant name="VP:Station15Z" value="19.10*cm"/>
<constant name="VP:Station16Z" value="21.65*cm"/>
<constant name="VP:Station17Z" value="26.66*cm"/>
<constant name="VP:Station18Z" value="31.29*cm"/>
<constant name="VP:Station19Z" value="42.64*cm"/>
<constant name="VP:Station20Z" value="53.78*cm"/>
<constant name="VP:Station21Z" value="64.91*cm"/>
<constant name="VP:Station22Z" value="67.41*cm"/>
<constant name="VP:Station23Z" value="69.91*cm"/>
<constant name="VP:Station24Z" value="72.41*cm"/>
<constant name="VP:Station06Z" value="-4.63*cm"/>
<constant name="VP:Station07Z" value="-2.94*cm"/>
<constant name="VP:Station08Z" value="-1.24*cm"/>
<constant name="VP:Station09Z" value="0.45*cm"/>
<constant name="VP:Station10Z" value="2.15*cm"/>
<constant name="VP:Station11Z" value="3.84*cm"/>
<constant name="VP:Station12Z" value="5.54*cm"/>
<constant name="VP:Station13Z" value="7.24*cm"/>
<constant name="VP:Station14Z" value="8.93*cm"/>
<constant name="VP:Station15Z" value="10.63*cm"/>
<constant name="VP:Station16Z" value="12.32*cm"/>
<constant name="VP:Station17Z" value="14.02*cm"/>
<constant name="VP:Station18Z" value="15.71*cm"/>
<constant name="VP:Station19Z" value="17.41*cm"/>
<constant name="VP:Station20Z" value="19.13*cm"/>
<constant name="VP:Station21Z" value="20.83*cm"/>
<constant name="VP:Station22Z" value="24.19*cm"/>
<constant name="VP:Station23Z" value="29.78*cm"/>
<constant name="VP:Station24Z" value="37.98*cm"/>
<constant name="VP:Station25Z" value="40.52*cm"/>
<constant name="VP:Station26Z" value="46.19*cm"/>
<constant name="VP:Station27Z" value="51.92*cm"/>
<constant name="VP:Station28Z" value="56.00*cm"/>
<constant name="VP:Station29Z" value="70.80*cm"/>
<constant name="VP:Station30Z" value="72.00*cm"/>
<constant name="VP:Station31Z" value="73.20*cm"/>
<constant name="VP:Station32Z" value="74.40*cm"/>
<!--==========================================================================-->
<!--============LADDERS=======================================================-->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment