Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
38
Issue boards
Milestones
Wiki
Code
Merge requests
34
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
detectors
athena
Merge requests
!188
Resolve "MRICH: Add carbon fiber frame for individual module"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "MRICH: Add carbon fiber frame for individual module"
85-mrich-add-carbon-fiber-frame-for-individual-module
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Wouter Deconinck
requested to merge
85-mrich-add-carbon-fiber-frame-for-individual-module
into
master
3 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Closes
#85 (closed)
Edited
3 years ago
by
Wouter Deconinck
👍
0
👎
0
Merge request reports
Compare
master
version 4
0a90b93f
3 years ago
version 3
9ca7866a
3 years ago
version 2
ae78e722
3 years ago
version 1
2d8622ea
3 years ago
master (base)
and
latest version
latest version
58c29a77
1 commit,
3 years ago
version 4
0a90b93f
1 commit,
3 years ago
version 3
9ca7866a
1 commit,
3 years ago
version 2
ae78e722
1 commit,
3 years ago
version 1
2d8622ea
1 commit,
3 years ago
1 file
+
8
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/MRich_geo.cpp
+
8
−
1
Options
@@ -84,7 +84,14 @@ static Ref_t createDetector(Detector& description, xml::Handle_t e, SensitiveDet
DetElement
mod_de
(
mod_name
+
std
::
string
(
"_mod_"
)
+
std
::
to_string
(
1
),
1
);
// todo module frame
double
frame_thickness
=
getAttrOrDefault
(
x_frame
,
_U
(
thickness
),
2.0
*
mm
);
double
frame_thickness
=
getAttrOrDefault
(
x_frame
,
_U
(
thickness
),
2.0
*
mm
);
Box
frame_inside
(
mod_width
/
2.0
-
frame_thickness
,
mod_height
/
2.0
-
frame_thickness
,
mod_length
/
2.0
-
frame_thickness
);
SubtractionSolid
frame_solid
(
m_solid
,
frame_inside
);
Material
frame_mat
=
description
.
material
(
x_frame
.
materialStr
());
Volume
frame_vol
(
mod_name
+
"_frame"
,
frame_solid
,
frame_mat
);
auto
frame_vis
=
getAttrOrDefault
<
std
::
string
>
(
x_frame
,
_U
(
vis
),
std
::
string
(
"GrayVis"
));
frame_vol
.
setVisAttributes
(
description
.
visAttributes
(
frame_vis
));
m_volume
.
placeVolume
(
frame_vol
);
// aerogel box
xml_comp_t
x_aerogel_frame
=
x_aerogel
.
child
(
_Unicode
(
frame
));
Loading