Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Projects
Groups
Snippets
Sign up now
Login
Sign in / Register
Toggle navigation
Menu
Open sidebar
EIC
detectors
topside
Commits
02d8368d
Commit
02d8368d
authored
Feb 27, 2021
by
Whitney Armstrong
Browse files
Fixing overlaps in tracker
parent
020e754e
Pipeline
#6809
passed with stages
in 2 minutes and 54 seconds
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
src/SiTrackerBarrel_geo.cpp
View file @
02d8368d
...
...
@@ -51,25 +51,30 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
string
c_nam
=
_toString
(
ncomponents
,
"component%d"
);
Box
c_box
(
x_comp
.
thickness
()
/
2
,
x_comp
.
width
()
/
2
,
x_comp
.
length
()
/
2
);
Volume
c_vol
(
c_nam
,
c_box
,
description
.
material
(
x_comp
.
materialStr
()));
PlacedVolume
c_pv
;
//if (x_pos) {
//std::cout << x_pos.x(0) << "\n";
//}
if
(
x_pos
&&
x_rot
)
{
Position
c_pos
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
));
RotationZYX
c_rot
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
));
pv
=
m_vol
.
placeVolume
(
c_vol
,
Transform3D
(
c_rot
,
c_pos
));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
Transform3D
(
c_rot
,
c_pos
));
}
else
if
(
x_rot
)
{
pv
=
m_vol
.
placeVolume
(
c_vol
,
RotationZYX
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
)));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
RotationZYX
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
)));
}
else
if
(
x_pos
)
{
pv
=
m_vol
.
placeVolume
(
c_vol
,
Position
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
)));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
Position
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
)));
}
else
{
pv
=
m_vol
.
placeVolume
(
c_vol
);
c_
pv
=
m_vol
.
placeVolume
(
c_vol
);
}
c_vol
.
setRegion
(
description
,
x_comp
.
regionStr
());
c_vol
.
setLimitSet
(
description
,
x_comp
.
limitsStr
());
c_vol
.
setVisAttributes
(
description
,
x_comp
.
visStr
());
if
(
x_comp
.
isSensitive
())
{
pv
.
addPhysVolID
(
_U
(
sensor
),
sensor_number
++
);
c_
pv
.
addPhysVolID
(
_U
(
sensor
),
sensor_number
++
);
c_vol
.
setSensitiveDetector
(
sens
);
sensitives
[
m_nam
].
push_back
(
pv
);
sensitives
[
m_nam
].
push_back
(
c_
pv
);
}
}
}
...
...
topside/silicon_tracker.xml
View file @
02d8368d
This diff is collapsed.
Click to expand it.
topside/topside_defs.xml
View file @
02d8368d
...
...
@@ -11,6 +11,7 @@
<constant
name=
"world_y"
value=
"world_side"
/>
<constant
name=
"world_z"
value=
"100*m"
/>
<constant
name=
"mil"
value=
"0.0254*mm"
/>
<comment>
------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment