Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Reference Detector
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
Terraform modules
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
Reference Detector
Commits
68706def
Commit
68706def
authored
Apr 13, 2021
by
Marshall Scott
Browse files
Options
Downloads
Patches
Plain Diff
SiDISCS changed overlap error
parent
5d6fee2a
No related branches found
No related tags found
1 merge request
!39
Draft: Resolve "Implement cb_SiDISCS"
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cb_SiDISCS.cpp
+5
-4
5 additions, 4 deletions
src/cb_SiDISCS.cpp
with
5 additions
and
4 deletions
src/cb_SiDISCS.cpp
+
5
−
4
View file @
68706def
...
@@ -16,6 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
...
@@ -16,6 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
double
ROut
=
dims
.
rmax
();
double
ROut
=
dims
.
rmax
();
double
SizeZ
=
dims
.
z_length
();
double
SizeZ
=
dims
.
z_length
();
double
PosZ
=
dims
.
z
();
double
PosZ
=
dims
.
z
();
double
lay_thickness
=
dims
.
dz
();
double
lay_RIn
=
dims
.
rmin1
();
double
lay_RIn
=
dims
.
rmin1
();
double
lay_ROut
=
dims
.
rmax1
();
double
lay_ROut
=
dims
.
rmax1
();
double
lay_phi0
=
dims
.
phi0
();
double
lay_phi0
=
dims
.
phi0
();
...
@@ -24,18 +25,18 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
...
@@ -24,18 +25,18 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
Material
Vacuum
=
desc
.
material
(
"Vacuum"
);
Material
Vacuum
=
desc
.
material
(
"Vacuum"
);
//Outer volume
//Outer volume
Tube
c
i
_SiDISCS_Solid
(
RIn
,
ROut
,
SizeZ
/
2.
,
0.
,
360
*
dd4hep
::
deg
);
Tube
c
b
_SiDISCS_Solid
(
RIn
,
ROut
,
SizeZ
/
2.
,
0.
,
360
*
dd4hep
::
deg
);
Volume
envelopeVol
(
"cb_SiDISCS_Logic"
,
c
i
_SiDISCS_Solid
,
Vacuum
);
Volume
envelopeVol
(
"cb_SiDISCS_Logic"
,
c
b
_SiDISCS_Solid
,
Vacuum
);
envelopeVol
.
setVisAttributes
(
detElem
.
visStr
());
envelopeVol
.
setVisAttributes
(
detElem
.
visStr
());
//Ar10CO2 tube for the layers
//Ar10CO2 tube for the layers
Tube
c
i
_SiDISCS_detSolid
(
lay_RIn
,
lay_ROut
,
PosZ
/
2.
,
lay_phi0
*
dd4hep
::
deg
,
lay_phi1
*
dd4hep
::
deg
);
Tube
c
b
_SiDISCS_detSolid
(
lay_RIn
,
lay_ROut
,
lay_thickness
/
2.
,
lay_phi0
*
dd4hep
::
deg
,
lay_phi1
*
dd4hep
::
deg
);
//Adding layers to placed detector volume
//Adding layers to placed detector volume
for
(
xml_coll_t
li
(
detElem
,
_U
(
layer
));
li
;
++
li
){
for
(
xml_coll_t
li
(
detElem
,
_U
(
layer
));
li
;
++
li
){
xml_comp_t
x_layer
=
li
;
xml_comp_t
x_layer
=
li
;
std
::
string
layer_name
=
detName
+
_toString
(
x_layer
.
id
(),
"_layer%d"
);
std
::
string
layer_name
=
detName
+
_toString
(
x_layer
.
id
(),
"_layer%d"
);
Volume
layer_vol
(
layer_name
,
c
i
_SiDISCS_detSolid
,
mat
);
Volume
layer_vol
(
layer_name
,
c
b
_SiDISCS_detSolid
,
mat
);
layer_vol
.
setVisAttributes
(
x_layer
.
visStr
());
layer_vol
.
setVisAttributes
(
x_layer
.
visStr
());
sens
.
setType
(
"tracker"
);
sens
.
setType
(
"tracker"
);
layer_vol
.
setSensitiveDetector
(
sens
);
layer_vol
.
setSensitiveDetector
(
sens
);
...
...
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