Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Commits
291bfcae
Commit
291bfcae
authored
3 years ago
by
Wouter Deconinck
Committed by
Sylvester Joosten
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Frame behind MRICH, 2 mm Carbon Fiber all across
(cherry picked from commit
55e89e0f
)
parent
07baf523
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compact/mrich.xml
+1
-0
1 addition, 0 deletions
compact/mrich.xml
src/MRich_geo.cpp
+8
-0
8 additions, 0 deletions
src/MRich_geo.cpp
with
9 additions
and
0 deletions
compact/mrich.xml
+
1
−
0
View file @
291bfcae
...
@@ -151,6 +151,7 @@
...
@@ -151,6 +151,7 @@
<!--position x="782.7750000006" y="316.0250000001"/-->
<!--position x="782.7750000006" y="316.0250000001"/-->
<!--position x="782.7750000006" y="453.3750000002"/-->
<!--position x="782.7750000006" y="453.3750000002"/-->
</positions>
</positions>
<layer
thickness=
"MRICHCarbonFrame_thickness"
material=
"CarbonFiber"
/>
</detector>
</detector>
</detectors>
</detectors>
...
...
This diff is collapsed.
Click to expand it.
src/MRich_geo.cpp
+
8
−
0
View file @
291bfcae
...
@@ -355,6 +355,14 @@ static Ref_t createDetector(Detector& description, xml::Handle_t e, SensitiveDet
...
@@ -355,6 +355,14 @@ static Ref_t createDetector(Detector& description, xml::Handle_t e, SensitiveDet
}
}
}
}
// place frame
xml_comp_t
x_layer
=
x_det
.
child
(
_Unicode
(
layer
));
double
layer_thickness
=
x_layer
.
thickness
();
Material
layer_mat
=
description
.
material
(
x_layer
.
materialStr
());
Tube
frameShape
(
rmin
,
rmax
,
layer_thickness
/
2.
,
0.
,
2
*
M_PI
);
Volume
frameVol
(
"MRICH_Frame"
,
frameShape
,
layer_mat
);
pv
=
envVol
.
placeVolume
(
frameVol
,
Position
(
0
,
0
,
(
length
-
layer_thickness
)
/
2.0
));
// place envelope
// place envelope
Volume
motherVol
=
description
.
pickMotherVolume
(
sdet
);
Volume
motherVol
=
description
.
pickMotherVolume
(
sdet
);
if
(
reflect
)
{
if
(
reflect
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment