Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
topside
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
EIC
detectors
topside
Commits
41df9daa
Commit
41df9daa
authored
Oct 29, 2020
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
modified: src/TopsideIRBeamPipe_geo.cpp
parent
211e39f3
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/TopsideIRBeamPipe_geo.cpp
+7
-8
7 additions, 8 deletions
src/TopsideIRBeamPipe_geo.cpp
with
7 additions
and
8 deletions
src/TopsideIRBeamPipe_geo.cpp
+
7
−
8
View file @
41df9daa
...
...
@@ -84,16 +84,15 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
Tube
upstream_IP_tube
(
IP_beampipe_ID
/
2.0
,
IP_beampipe_OD
/
2.0
,
upstream_straight_length
/
2.0
);
Tube
upstream_IP_vacuum
(
0.0
,
IP_beampipe_OD
/
2.0
,
upstream_straight_length
/
2.0
);
Volume
v_upstream_IP_tube
(
"v_upstream_IP_tube"
,
upstream_IP_tube
,
m_
Al
);
Volume
v_downstream_IP_tube
(
"v_downstream_IP_tube"
,
downstream_IP_tube
,
m_
Al
);
Volume
v_upstream_IP_tube
(
"v_upstream_IP_tube"
,
upstream_IP_tube
,
m_
Be
);
Volume
v_downstream_IP_tube
(
"v_downstream_IP_tube"
,
downstream_IP_tube
,
m_
Be
);
//v_upstream_IP_tube.setVisAttributes(det,"GrayVis");
//v_downstream_IP_tube.setVisAttributes(det,"RedVis");
sdet
.
setAttributes
(
det
,
v_upstream_IP_tube
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
sdet
.
setAttributes
(
det
,
v_downstream_IP_tube
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
auto
pv_upstream_IP_tube
=
assembly
.
placeVolume
(
v_upstream_IP_tube
,
Position
(
0
,
0
,
-
upstream_straight_length
/
2.0
));
auto
pv_upstream_IP_tube
=
assembly
.
placeVolume
(
v_upstream_IP_tube
,
Position
(
0
,
0
,
-
upstream_straight_length
/
2.0
));
auto
pv_downstream_IP_tube
=
assembly
.
placeVolume
(
v_downstream_IP_tube
,
Position
(
0
,
0
,
downstream_straight_length
/
2.0
));
...
...
@@ -110,8 +109,8 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
Cone
upstream_conic_section_vacuum
(
upstream_conic_length
/
2.0
,
0.0
,
IP_beampipe_ID
/
2.0
,
0.0
,
IP_beampipe_ID
/
2.0
+
upstream_delta_r
);
Volume
v_upstream_conic_section
(
"v_upstream_conic_section"
,
upstream_conic_section
,
m_
Al
);
Volume
v_upstream_electron_tube
(
"v_upstream_electron_tube"
,
upstream_electron_tube
,
m_
Al
);
Volume
v_upstream_conic_section
(
"v_upstream_conic_section"
,
upstream_conic_section
,
m_
Be
);
Volume
v_upstream_electron_tube
(
"v_upstream_electron_tube"
,
upstream_electron_tube
,
m_
Be
);
sdet
.
setAttributes
(
det
,
v_upstream_conic_section
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
sdet
.
setAttributes
(
det
,
v_upstream_electron_tube
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
//Volume v_upstream_conic_section_vacuum("v_upstream_conic_section_vacuum", upstream_electron_tube, m_Al);
...
...
@@ -153,13 +152,13 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
RotationY
(
crossing_angle
));
SubtractionSolid
downstream_pipe_split1
(
downstream_pipe_split0
,
downstream_pipe_vacuum_split0
);
Volume
v_downstream_pipe_split1
(
"v_downstream_pipe_split1"
,
downstream_pipe_split1
,
m_
Al
);
Volume
v_downstream_pipe_split1
(
"v_downstream_pipe_split1"
,
downstream_pipe_split1
,
m_
Be
);
sdet
.
setAttributes
(
det
,
v_downstream_pipe_split1
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
auto
pv_downstream_pipe_split1
=
assembly
.
placeVolume
(
v_downstream_pipe_split1
,
Position
(
0
,
0
,
downstream_straight_length
+
downstream_conic_length
/
2.0
));
Volume
v_downstream_taper_section
(
"v_downstream_taper_section"
,
downstream_taper_section
,
m_
Al
);
Volume
v_downstream_taper_section
(
"v_downstream_taper_section"
,
downstream_taper_section
,
m_
Be
);
sdet
.
setAttributes
(
det
,
v_downstream_taper_section
,
x_det
.
regionStr
(),
x_det
.
limitsStr
(),
vis_name
);
auto
pv_downstream_taper_section
=
assembly
.
placeVolume
(
v_downstream_taper_section
,
Position
(
0
,
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