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
18fe6d99
Commit
18fe6d99
authored
Apr 6, 2021
by
Jihee Kim
Browse files
Options
Downloads
Patches
Plain Diff
Added layers
parent
63318e18
Branches
Branches containing commit
No related tags found
1 merge request
!32
Resolve "Implement ce_GEM"
Pipeline
#7960
passed
Apr 6, 2021
Stage: config
Stage: build
Stage: docs
Stage: test
Stage: finalize
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
compact/ce_GEM.xml
+1
-1
1 addition, 1 deletion
compact/ce_GEM.xml
compact/definitions.xml
+8
-7
8 additions, 7 deletions
compact/definitions.xml
compact/display.xml
+1
-0
1 addition, 0 deletions
compact/display.xml
src/ce_GEM.cpp
+21
-18
21 additions, 18 deletions
src/ce_GEM.cpp
with
31 additions
and
26 deletions
compact/ce_GEM.xml
+
1
−
1
View file @
18fe6d99
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<dimensions
rmin=
"ce_GEM_rmin"
rmax=
"ce_GEM_rmax"
length=
"ce_GEM_length"
/>
<dimensions
rmin=
"ce_GEM_rmin"
rmax=
"ce_GEM_rmax"
length=
"ce_GEM_length"
/>
<position
x=
"ce_GEM_x_pos"
y=
"ce_GEM_y_pos"
z=
"ce_GEM_z_pos"
/>
<position
x=
"ce_GEM_x_pos"
y=
"ce_GEM_y_pos"
z=
"ce_GEM_z_pos"
/>
<layer
repeat=
"ce_GEM_layer"
vis=
"ce_GEM_layerVis"
>
<layer
repeat=
"ce_GEM_layer"
vis=
"ce_GEM_layerVis"
>
<slice
name=
"Ar10C
0
2_slice"
material=
"Ar10CO2"
sensitive=
"true"
/>
<slice
name=
"Ar10C
O
2_slice"
material=
"Ar10CO2"
thickness=
"ce_GEM_layer_thickness"
sensitive=
"true"
/>
</layer>
</layer>
</detector>
</detector>
</detectors>
</detectors>
...
...
This diff is collapsed.
Click to expand it.
compact/definitions.xml
+
8
−
7
View file @
18fe6d99
...
@@ -545,6 +545,7 @@
...
@@ -545,6 +545,7 @@
<constant
name=
"ce_GEM_y_pos"
value=
"0.0 * cm"
/>
<constant
name=
"ce_GEM_y_pos"
value=
"0.0 * cm"
/>
<constant
name=
"ce_GEM_z_pos"
value=
"-SolenoidLength/2.0 + ce_GEM_length/2.0"
/>
<constant
name=
"ce_GEM_z_pos"
value=
"-SolenoidLength/2.0 + ce_GEM_length/2.0"
/>
<constant
name=
"ce_GEM_layer"
value=
"8"
/>
<constant
name=
"ce_GEM_layer"
value=
"8"
/>
<constant
name=
"ce_GEM_layer_thickness"
value=
"1.0 * cm"
/>
</define>
</define>
This diff is collapsed.
Click to expand it.
compact/display.xml
+
1
−
0
View file @
18fe6d99
...
@@ -54,6 +54,7 @@
...
@@ -54,6 +54,7 @@
<vis
name=
"cb_CTDVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_CTDVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_CTD_Si_layerVis"
alpha=
"1.0"
r=
"0.9"
g=
"1.0"
b=
"0.1"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_CTD_Si_layerVis"
alpha=
"1.0"
r=
"0.9"
g=
"1.0"
b=
"0.1"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ce_GEMVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ce_GEMVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_GEM_layerVis"
alpha=
"0.8"
r=
"0.8"
g=
"0.4"
b=
"0.3"
showDaughters=
"true"
visible=
"true"
/>
<comment>
<comment>
Deprecated colors.
Deprecated colors.
...
...
This diff is collapsed.
Click to expand it.
src/ce_GEM.cpp
+
21
−
18
View file @
18fe6d99
...
@@ -31,25 +31,28 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
...
@@ -31,25 +31,28 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
xml_comp_t
x_slice
=
x_layer
.
child
(
_U
(
slice
));
xml_comp_t
x_slice
=
x_layer
.
child
(
_U
(
slice
));
Material
slice_mat
=
desc
.
material
(
x_slice
.
materialStr
());
Material
slice_mat
=
desc
.
material
(
x_slice
.
materialStr
());
double
layerSizeZ
=
x_slice
.
thickness
();
double
layerRIn
;
double
layerROut
;
double
layerPosZ
;
// Loop over layers
// Loop over layers
//for(int i = 0; i < repeat; i++) {
for
(
int
i
=
0
;
i
<
repeat
;
i
++
)
{
// layerRIn[i] = RIn + (SiLayerGap * i);
layerRIn
=
RIn
+
1.0
*
cm
+
((
double
)
i
*
0.5
)
*
cm
;
// layerROut[i] = RIn + (0.01 + SiLayerGap * i);
layerROut
=
ROut
-
25.0
*
cm
+
((
double
)
i
*
2.0
)
*
cm
;
layerPosZ
=
SizeZ
/
2.0
-
5.0
*
cm
-
((
double
)
i
*
3.0
)
*
cm
;
// if (layerROut[i] > ROut)
layerSizeZ
=
1.0
*
cm
;
// continue;
string
logic_layer_name
=
detName
+
_toString
(
i
,
"_Logic_lay_%d"
);
// string logic_layer_name = detName + _toString(i, "_Logic_lay_%d");
Volume
layerVol
(
logic_layer_name
,
Tube
(
layerRIn
,
layerROut
,
layerSizeZ
/
2.0
,
0.0
,
360.0
*
deg
),
slice_mat
);
// Volume layerVol(logic_layer_name,Tube(layerRIn[i], layerROut[i], SizeZ / 2.0, 0.0, 360.0 * deg), slice_mat);
layerVol
.
setVisAttributes
(
desc
,
x_layer
.
visStr
());
// layerVol.setVisAttributes(desc,x_layer.visStr());
sens
.
setType
(
"tracker"
);
// sens.setType("tracker");
layerVol
.
setSensitiveDetector
(
sens
);
// layerVol.setSensitiveDetector(sens);
Position
layer_pos
=
Position
(
0.0
,
0.0
,
layerPosZ
);
// Position layer_pos = Position(0.0, 0.0, 0.0);
PlacedVolume
layerPV
=
detVol
.
placeVolume
(
layerVol
,
layer_pos
);
// PlacedVolume layerPV = detVol.placeVolume(layerVol, layer_pos);
layerPV
.
addPhysVolID
(
"layer"
,
i
+
1
);
// layerPV.addPhysVolID("layer", i+1);
}
//}
DetElement
det
(
detName
,
detID
);
DetElement
det
(
detName
,
detID
);
Volume
motherVol
=
desc
.
pickMotherVolume
(
det
);
Volume
motherVol
=
desc
.
pickMotherVolume
(
det
);
...
...
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