Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ip6_tutorial_2
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
Show more breadcrumbs
EIC
tutorials
ip6_tutorial_2
Commits
e8ce105b
Commit
e8ce105b
authored
May 21, 2021
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
modified: src/TrapEndcapTracker_geo.cpp
parent
ecfced10
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/TrapEndcapTracker_geo.cpp
+104
-103
104 additions, 103 deletions
src/TrapEndcapTracker_geo.cpp
with
104 additions
and
103 deletions
src/TrapEndcapTracker_geo.cpp
+
104
−
103
View file @
e8ce105b
...
@@ -30,7 +30,6 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -30,7 +30,6 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
bool
reflect
=
x_det
.
reflect
(
false
);
bool
reflect
=
x_det
.
reflect
(
false
);
DetElement
sdet
(
det_name
,
det_id
);
DetElement
sdet
(
det_name
,
det_id
);
Assembly
assembly
(
det_name
);
Assembly
assembly
(
det_name
);
// Volume assembly (det_name,Box(10000,10000,10000),vacuum);
Volume
motherVol
=
description
.
pickMotherVolume
(
sdet
);
Volume
motherVol
=
description
.
pickMotherVolume
(
sdet
);
int
m_id
=
0
,
c_id
=
0
,
n_sensor
=
0
;
int
m_id
=
0
,
c_id
=
0
,
n_sensor
=
0
;
map
<
string
,
Volume
>
modules
;
map
<
string
,
Volume
>
modules
;
...
@@ -40,6 +39,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -40,6 +39,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
assembly
.
setVisAttributes
(
description
.
invisible
());
assembly
.
setVisAttributes
(
description
.
invisible
());
sens
.
setType
(
"tracker"
);
sens
.
setType
(
"tracker"
);
// Loop over and build modules
for
(
xml_coll_t
mi
(
x_det
,
_U
(
module
));
mi
;
++
mi
,
++
m_id
)
{
for
(
xml_coll_t
mi
(
x_det
,
_U
(
module
));
mi
;
++
mi
,
++
m_id
)
{
xml_comp_t
x_mod
=
mi
;
xml_comp_t
x_mod
=
mi
;
string
m_nam
=
x_mod
.
nameStr
();
string
m_nam
=
x_mod
.
nameStr
();
...
@@ -50,7 +50,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -50,7 +50,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
double
z
=
trd
.
z
();
double
z
=
trd
.
z
();
double
y1
,
y2
,
total_thickness
=
0.
;
double
y1
,
y2
,
total_thickness
=
0.
;
xml_coll_t
ci
(
x_mod
,
_U
(
module_component
));
xml_coll_t
ci
(
x_mod
,
_U
(
module_component
));
for
(
ci
.
reset
(),
total_thickness
=
0.0
;
ci
;
++
ci
)
total_thickness
+=
xml_comp_t
(
ci
).
thickness
();
for
(
ci
.
reset
(),
total_thickness
=
0.0
;
ci
;
++
ci
)
total_thickness
+=
xml_comp_t
(
ci
).
thickness
();
y1
=
y2
=
total_thickness
/
2
;
y1
=
y2
=
total_thickness
/
2
;
Volume
m_volume
(
m_nam
,
Trapezoid
(
x1
,
x2
,
y1
,
y2
,
z
),
vacuum
);
Volume
m_volume
(
m_nam
,
Trapezoid
(
x1
,
x2
,
y1
,
y2
,
z
),
vacuum
);
...
@@ -70,8 +71,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -70,8 +71,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
c_vol
.
setVisAttributes
(
description
.
visAttributes
(
c
.
visStr
()));
c_vol
.
setVisAttributes
(
description
.
visAttributes
(
c
.
visStr
()));
pv
=
m_volume
.
placeVolume
(
c_vol
,
Position
(
0
,
posY
+
c_thick
/
2
,
0
));
pv
=
m_volume
.
placeVolume
(
c_vol
,
Position
(
0
,
posY
+
c_thick
/
2
,
0
));
if
(
c
.
isSensitive
())
{
if
(
c
.
isSensitive
())
{
sdet
.
check
(
n_sensor
>
2
,
sdet
.
check
(
n_sensor
>
2
,
"SiTrackerEndcap2::fromCompact: "
+
c_name
+
" Max of 2 modules allowed!"
);
"SiTrackerEndcap2::fromCompact: "
+
c_name
+
" Max of 2 modules allowed!"
);
pv
.
addPhysVolID
(
"sensor"
,
n_sensor
);
pv
.
addPhysVolID
(
"sensor"
,
n_sensor
);
c_vol
.
setSensitiveDetector
(
sens
);
c_vol
.
setSensitiveDetector
(
sens
);
sensitives
[
m_nam
].
push_back
(
pv
);
sensitives
[
m_nam
].
push_back
(
pv
);
...
@@ -79,9 +79,11 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -79,9 +79,11 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
}
posY
+=
c_thick
;
posY
+=
c_thick
;
}
}
// Modules are stored here
modules
[
m_nam
]
=
m_volume
;
modules
[
m_nam
]
=
m_volume
;
}
}
// Construct each layer
for
(
xml_coll_t
li
(
x_det
,
_U
(
layer
));
li
;
++
li
)
{
for
(
xml_coll_t
li
(
x_det
,
_U
(
layer
));
li
;
++
li
)
{
xml_comp_t
x_layer
(
li
);
xml_comp_t
x_layer
(
li
);
int
l_id
=
x_layer
.
id
();
int
l_id
=
x_layer
.
id
();
...
@@ -104,8 +106,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -104,8 +106,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
double
x
=
-
r
*
std
::
cos
(
phi
);
double
x
=
-
r
*
std
::
cos
(
phi
);
double
y
=
-
r
*
std
::
sin
(
phi
);
double
y
=
-
r
*
std
::
sin
(
phi
);
DetElement
module
(
sdet
,
m_base
+
"_pos"
,
det_id
);
DetElement
module
(
sdet
,
m_base
+
"_pos"
,
det_id
);
pv
=
assembly
.
placeVolume
(
m_vol
,
Transform3D
(
RotationZYX
(
0
,
-
M_PI
/
2
-
phi
,
-
M_PI
/
2
),
pv
=
assembly
.
placeVolume
(
m_vol
,
Position
(
x
,
y
,
zstart
+
dz
)));
Transform3D
(
RotationZYX
(
0
,
-
M_PI
/
2
-
phi
,
-
M_PI
/
2
),
Position
(
x
,
y
,
zstart
+
dz
)));
pv
.
addPhysVolID
(
"barrel"
,
1
).
addPhysVolID
(
"layer"
,
l_id
).
addPhysVolID
(
"module"
,
mod_num
);
pv
.
addPhysVolID
(
"barrel"
,
1
).
addPhysVolID
(
"layer"
,
l_id
).
addPhysVolID
(
"module"
,
mod_num
);
module
.
setPlacement
(
pv
);
module
.
setPlacement
(
pv
);
for
(
size_t
ic
=
0
;
ic
<
sensVols
.
size
();
++
ic
)
{
for
(
size_t
ic
=
0
;
ic
<
sensVols
.
size
();
++
ic
)
{
...
@@ -115,9 +117,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -115,9 +117,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
}
if
(
reflect
)
{
if
(
reflect
)
{
pv
=
pv
=
assembly
.
placeVolume
(
assembly
.
placeVolume
(
m_vol
,
Transform3D
(
RotationZYX
(
M_PI
,
-
M_PI
/
2
-
phi
,
-
M_PI
/
2
),
m_vol
,
Transform3D
(
RotationZYX
(
M_PI
,
-
M_PI
/
2
-
phi
,
-
M_PI
/
2
),
Position
(
x
,
y
,
-
zstart
-
dz
)));
Position
(
x
,
y
,
-
zstart
-
dz
)));
pv
.
addPhysVolID
(
"barrel"
,
2
).
addPhysVolID
(
"layer"
,
l_id
).
addPhysVolID
(
"module"
,
mod_num
);
pv
.
addPhysVolID
(
"barrel"
,
2
).
addPhysVolID
(
"layer"
,
l_id
).
addPhysVolID
(
"module"
,
mod_num
);
DetElement
r_module
(
sdet
,
m_base
+
"_neg"
,
det_id
);
DetElement
r_module
(
sdet
,
m_base
+
"_neg"
,
det_id
);
r_module
.
setPlacement
(
pv
);
r_module
.
setPlacement
(
pv
);
...
...
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