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
Commits
02d8368d
Commit
02d8368d
authored
4 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
Fixing overlaps in tracker
parent
020e754e
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!75
Fixing overlaps in tracker
Pipeline
#6809
passed
4 years ago
Stage: build
Stage: docs
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/SiTrackerBarrel_geo.cpp
+11
-6
11 additions, 6 deletions
src/SiTrackerBarrel_geo.cpp
topside/silicon_tracker.xml
+114
-81
114 additions, 81 deletions
topside/silicon_tracker.xml
topside/topside_defs.xml
+1
-0
1 addition, 0 deletions
topside/topside_defs.xml
with
126 additions
and
87 deletions
src/SiTrackerBarrel_geo.cpp
+
11
−
6
View file @
02d8368d
...
...
@@ -51,25 +51,30 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
string
c_nam
=
_toString
(
ncomponents
,
"component%d"
);
Box
c_box
(
x_comp
.
thickness
()
/
2
,
x_comp
.
width
()
/
2
,
x_comp
.
length
()
/
2
);
Volume
c_vol
(
c_nam
,
c_box
,
description
.
material
(
x_comp
.
materialStr
()));
PlacedVolume
c_pv
;
//if (x_pos) {
//std::cout << x_pos.x(0) << "\n";
//}
if
(
x_pos
&&
x_rot
)
{
Position
c_pos
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
));
RotationZYX
c_rot
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
));
pv
=
m_vol
.
placeVolume
(
c_vol
,
Transform3D
(
c_rot
,
c_pos
));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
Transform3D
(
c_rot
,
c_pos
));
}
else
if
(
x_rot
)
{
pv
=
m_vol
.
placeVolume
(
c_vol
,
RotationZYX
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
)));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
RotationZYX
(
x_rot
.
z
(
0
),
x_rot
.
y
(
0
),
x_rot
.
x
(
0
)));
}
else
if
(
x_pos
)
{
pv
=
m_vol
.
placeVolume
(
c_vol
,
Position
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
)));
c_
pv
=
m_vol
.
placeVolume
(
c_vol
,
Position
(
x_pos
.
x
(
0
),
x_pos
.
y
(
0
),
x_pos
.
z
(
0
)));
}
else
{
pv
=
m_vol
.
placeVolume
(
c_vol
);
c_
pv
=
m_vol
.
placeVolume
(
c_vol
);
}
c_vol
.
setRegion
(
description
,
x_comp
.
regionStr
());
c_vol
.
setLimitSet
(
description
,
x_comp
.
limitsStr
());
c_vol
.
setVisAttributes
(
description
,
x_comp
.
visStr
());
if
(
x_comp
.
isSensitive
())
{
pv
.
addPhysVolID
(
_U
(
sensor
),
sensor_number
++
);
c_
pv
.
addPhysVolID
(
_U
(
sensor
),
sensor_number
++
);
c_vol
.
setSensitiveDetector
(
sens
);
sensitives
[
m_nam
].
push_back
(
pv
);
sensitives
[
m_nam
].
push_back
(
c_
pv
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
topside/silicon_tracker.xml
+
114
−
81
View file @
02d8368d
This diff is collapsed.
Click to expand it.
topside/topside_defs.xml
+
1
−
0
View file @
02d8368d
...
...
@@ -11,6 +11,7 @@
<constant
name=
"world_y"
value=
"world_side"
/>
<constant
name=
"world_z"
value=
"100*m"
/>
<constant
name=
"mil"
value=
"0.0254*mm"
/>
<comment>
------------
...
...
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