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
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
Merge requests
!47
Resolve geometry conflict
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve geometry conflict
cpeng/topside:rich_envelope
into
master
Overview
2
Commits
1
Pipelines
1
Changes
1
Merged
Chao Peng
requested to merge
cpeng/topside:rich_envelope
into
master
4 years ago
Overview
2
Commits
1
Pipelines
1
Changes
1
Expand
I used a union shape envelope for resolving the geometry conflict.
Edited
4 years ago
by
Chao Peng
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
a809fd03
1 commit,
4 years ago
1 file
+
12
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/ForwardRICH_geo.cpp
+
12
−
4
Options
@@ -143,18 +143,26 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
auto
mcpMat
=
desc
.
material
(
mcp
.
materialStr
());
// an envelope for the detector
// use a complicated shape to avoid conflict with the other parts
// cone for radiator and the first set of mirrors
double
halfLength
=
0.5
*
(
mirZ
+
5.0
*
cm
);
double
rmin
=
std
::
min
(
pRmin
,
tRmin
)
;
double
rmax
=
std
::
max
(
std
::
max
(
pRmax
,
tRmax2
),
tRmax1
)
;
double
rmin
=
tRmin
;
double
rmax
=
tRmax2
;
for
(
xml
::
Collection_t
sl
(
mir
,
_Unicode
(
slice
));
sl
;
++
sl
)
{
auto
mRmin
=
sl
.
attr
<
double
>
(
_Unicode
(
rmin
));
auto
mRmax
=
sl
.
attr
<
double
>
(
_Unicode
(
rmax
));
if
(
mRmin
<
rmin
)
{
rmin
=
mRmin
;
}
if
(
mRmax
>
rmax
)
{
rmax
=
mRmax
;
}
}
Tube
envShape
(
std
::
max
(
0.
,
rmin
-
0.1
*
cm
),
rmax
+
0.1
*
cm
,
halfLength
,
0.
,
2
*
M_PI
);
rmin
=
std
::
max
(
0.
,
rmin
-
0.1
*
cm
);
Cone
env1
(
halfLength
,
rmin
,
tRmax1
+
0.1
*
cm
,
rmin
,
rmax
+
0.1
*
cm
);
// disk for detection plane
Tube
env2
(
std
::
max
(
0.
,
pRmin
-
0.1
*
cm
),
pRmax
+
0.1
*
cm
,
pThick
+
0.1
*
cm
,
0.
,
2.
*
M_PI
);
UnionSolid
envShape
(
env1
,
env2
,
Position
(
0.
,
0.
,
pZ
+
pThick
/
2.
));
Volume
envVol
(
detName
+
"_envelope"
,
envShape
,
desc
.
material
(
"AirOptical"
));
envVol
.
setVisAttributes
(
desc
.
visAttributes
(
detElem
.
visStr
()));
//
envVol.setVisAttributes(desc.visAttributes(detElem.visStr()));
// ---------------
// Gas radiator container and spherical mirrors inside it
Loading