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
Commits
71cd9cf0
Commit
71cd9cf0
authored
3 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Fix pfRICH service material
parent
e5958bea
No related branches found
No related tags found
1 merge request
!295
Fix pfRICH service material
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compact/erich.xml
+2
-2
2 additions, 2 deletions
compact/erich.xml
src/ERich_geo.cpp
+1
-1
1 addition, 1 deletion
src/ERich_geo.cpp
with
3 additions
and
3 deletions
compact/erich.xml
+
2
−
2
View file @
71cd9cf0
...
@@ -158,9 +158,9 @@
...
@@ -158,9 +158,9 @@
<services>
<services>
<comment>
SJJ: random standin for readout + electronics + cooling @FIXME
</comment>
<comment>
SJJ: random standin for readout + electronics + cooling @FIXME
</comment>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
<component
name=
"air"
thickness=
"
3
0*mm"
material=
"A
luminum
"
/>
<component
name=
"air"
thickness=
"
2
0*mm"
material=
"A
ir
"
/>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
<component
name=
"air"
thickness=
"
3
0*mm"
material=
"A
luminum
"
/>
<component
name=
"air"
thickness=
"
2
0*mm"
material=
"A
ir
"
/>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
<component
name=
"aluminum"
thickness=
"5*mm"
vis=
"RICHServiceVis"
material=
"Aluminum"
/>
</services>
</services>
...
...
This diff is collapsed.
Click to expand it.
src/ERich_geo.cpp
+
1
−
1
View file @
71cd9cf0
...
@@ -283,7 +283,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
...
@@ -283,7 +283,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
for
(
xml_coll_t
ci
(
x_service
,
_Unicode
(
component
));
ci
;
++
ci
,
ncomponents
++
)
{
for
(
xml_coll_t
ci
(
x_service
,
_Unicode
(
component
));
ci
;
++
ci
,
ncomponents
++
)
{
xml_comp_t
x_comp
=
ci
;
xml_comp_t
x_comp
=
ci
;
double
thickness
=
x_comp
.
thickness
();
double
thickness
=
x_comp
.
thickness
();
Tube
c_tube
{
sensorPlaneRmin
,
sensorPlaneRmax
,
thickness
};
Tube
c_tube
{
sensorPlaneRmin
,
sensorPlaneRmax
,
thickness
/
2
};
Volume
c_vol
{
_toString
(
ncomponents
,
"component%d"
),
c_tube
,
desc
.
material
(
x_comp
.
materialStr
())};
Volume
c_vol
{
_toString
(
ncomponents
,
"component%d"
),
c_tube
,
desc
.
material
(
x_comp
.
materialStr
())};
c_vol
.
setVisAttributes
(
desc
,
x_comp
.
visStr
());
c_vol
.
setVisAttributes
(
desc
,
x_comp
.
visStr
());
service_vol
.
placeVolume
(
c_vol
,
Position
(
0
,
0
,
thickness_sum
+
thickness
/
2.0
));
service_vol
.
placeVolume
(
c_vol
,
Position
(
0
,
0
,
thickness_sum
+
thickness
/
2.0
));
...
...
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