Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
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
Show more breadcrumbs
EIC
detectors
athena
Commits
817e2d40
Commit
817e2d40
authored
3 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
Modified dd4hep surface definitions.
parent
52241d83
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!224
Modified dd4hep surface definitions.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/BarrelTrackerWithFrame_geo.cpp
+3
-3
3 additions, 3 deletions
src/BarrelTrackerWithFrame_geo.cpp
src/TrapEndcapTracker_geo.cpp
+13
-14
13 additions, 14 deletions
src/TrapEndcapTracker_geo.cpp
with
16 additions
and
17 deletions
src/BarrelTrackerWithFrame_geo.cpp
+
3
−
3
View file @
817e2d40
...
@@ -195,9 +195,9 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
...
@@ -195,9 +195,9 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
module_thicknesses
[
m_nam
]
=
{
thickness_so_far
+
x_comp
.
thickness
()
/
2.0
,
total_thickness
-
thickness_so_far
-
x_comp
.
thickness
()
/
2.0
};
module_thicknesses
[
m_nam
]
=
{
thickness_so_far
+
x_comp
.
thickness
()
/
2.0
,
total_thickness
-
thickness_so_far
-
x_comp
.
thickness
()
/
2.0
};
// -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
// -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
Vector3D
u
(
0
.
,
1
.
,
0.
);
Vector3D
u
(
-
1
.
,
0
.
,
0.
);
Vector3D
v
(
0.
,
0
.
,
1
.
);
Vector3D
v
(
0.
,
-
1
.
,
0
.
);
Vector3D
n
(
1
.
,
0.
,
0
.
);
Vector3D
n
(
0
.
,
0.
,
1
.
);
// Vector3D o( 0. , 0. , 0. ) ;
// Vector3D o( 0. , 0. , 0. ) ;
// compute the inner and outer thicknesses that need to be assigned to the tracking surface
// compute the inner and outer thicknesses that need to be assigned to the tracking surface
...
...
This diff is collapsed.
Click to expand it.
src/TrapEndcapTracker_geo.cpp
+
13
−
14
View file @
817e2d40
...
@@ -182,9 +182,9 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -182,9 +182,9 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
sensitives
[
m_nam
].
push_back
(
pv
);
sensitives
[
m_nam
].
push_back
(
pv
);
++
n_sensor
;
++
n_sensor
;
// -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
// -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
Vector3D
u
(
1
.
,
0.
,
0
.
);
Vector3D
u
(
0
.
,
0.
,
-
1
.
);
Vector3D
v
(
0
.
,
1
.
,
0.
);
Vector3D
v
(
-
1
.
,
0
.
,
0.
);
Vector3D
n
(
0.
,
0
.
,
1
.
);
Vector3D
n
(
0.
,
1
.
,
0
.
);
// Vector3D o( 0. , 0. , 0. ) ;
// Vector3D o( 0. , 0. , 0. ) ;
// compute the inner and outer thicknesses that need to be assigned to the tracking surface
// compute the inner and outer thicknesses that need to be assigned to the tracking surface
...
@@ -245,18 +245,17 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
...
@@ -245,18 +245,17 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
}
DetElement
layer_element
(
sdet
,
layer_name
,
l_id
);
DetElement
layer_element
(
sdet
,
layer_name
,
l_id
);
layer_element
.
setPlacement
(
layer_pv
);
layer_element
.
setPlacement
(
layer_pv
);
// ACTS extension
{
Acts
::
ActsExtension
*
layerExtension
=
new
Acts
::
ActsExtension
();
Acts
::
ActsExtension
*
layerExtension
=
new
Acts
::
ActsExtension
();
layerExtension
->
addType
(
"sensitive disk"
,
"layer"
);
// layer is simple tube so no need to set envelope
//layerExtension->addType("axes", "definitions", "XZY");
layerExtension
->
addType
(
"layer"
,
"layer"
);
//layerExtension->addType("sensitive disk", "layer");
// Add the proto layer material
//layerExtension->addType("axes", "definitions", "XZY");
for
(
xml_coll_t
lmat
(
x_layer
,
_Unicode
(
layer_material
));
lmat
;
++
lmat
)
{
for
(
xml_coll_t
lmat
(
x_layer
,
_Unicode
(
layer_material
));
lmat
;
++
lmat
)
{
xml_comp_t
x_layer_material
=
lmat
;
xml_comp_t
x_layer_material
=
lmat
;
xmlToProtoSurfaceMaterial
(
x_layer_material
,
*
layerExtension
,
"layer_material"
);
xmlToProtoSurfaceMaterial
(
x_layer_material
,
*
layerExtension
,
"layer_material"
);
}
layer_element
.
addExtension
<
Acts
::
ActsExtension
>
(
layerExtension
);
}
}
layer_element
.
addExtension
<
Acts
::
ActsExtension
>
(
layerExtension
);
for
(
xml_coll_t
ri
(
x_layer
,
_U
(
ring
));
ri
;
++
ri
)
{
for
(
xml_coll_t
ri
(
x_layer
,
_U
(
ring
));
ri
;
++
ri
)
{
xml_comp_t
x_ring
=
ri
;
xml_comp_t
x_ring
=
ri
;
...
...
This diff is collapsed.
Click to expand it.
Whitney Armstrong
@whit
mentioned in commit
68d01d07
·
3 years ago
mentioned in commit
68d01d07
mentioned in commit 68d01d0778da4d3d0b01b3c53a61bc181e1f5738
Toggle commit list
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