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
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
32add61e
Commit
32add61e
authored
4 years ago
by
Jihee Kim
Browse files
Options
Downloads
Patches
Plain Diff
Added Si layers and defined global parameters
parent
f3cf8d06
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!30
Resolve "Implement cb_CTD_SI"
Pipeline
#7886
failed
4 years ago
Stage: config
Stage: build
Stage: docs
Stage: test
Stage: finalize
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
compact/cb_CTD_Si.xml
+2
-2
2 additions, 2 deletions
compact/cb_CTD_Si.xml
compact/definitions.xml
+10
-9
10 additions, 9 deletions
compact/definitions.xml
compact/display.xml
+1
-1
1 addition, 1 deletion
compact/display.xml
src/cb_CTD_Si.cpp
+30
-0
30 additions, 0 deletions
src/cb_CTD_Si.cpp
with
43 additions
and
12 deletions
compact/cb_CTD_Si.xml
+
2
−
2
View file @
32add61e
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
</display>
</display>
<detectors>
<detectors>
<detector
id=
"cb_CTD_Si_ID"
name=
"cb_CTD_Si"
type=
"cb_CTD_Si"
readout=
"cb_CTD_Si_Hits"
vis=
"cb_CTD
_Si
Vis"
insideTrackingVloume=
"true"
>
<detector
id=
"cb_CTD_Si_ID"
name=
"cb_CTD_Si"
type=
"cb_CTD_Si"
readout=
"cb_CTD_Si_Hits"
vis=
"cb_CTDVis"
insideTrackingVloume=
"true"
>
<dimensions
rmin=
"cb_CTD_
Si_
rmin"
rmax=
"cb_CTD_
Si_
rmax"
length=
"cb_CTD_
Si_
length"
zmax=
"cb_CTD_
Si_
zmax"
gap=
"cb_CTD_Si_gap"
/>
<dimensions
rmin=
"cb_CTD_rmin"
rmax=
"cb_CTD_rmax"
length=
"cb_CTD_length"
zmax=
"cb_CTD_zmax"
gap=
"cb_CTD_Si_gap"
/>
<layer
repeat=
"cb_CTD_Si_layer"
vis=
"cb_CTD_Si_layerVis"
>
<layer
repeat=
"cb_CTD_Si_layer"
vis=
"cb_CTD_Si_layerVis"
>
<slice
name=
"Silicon_slice"
material=
"Si"
sensitive=
"true"
/>
<slice
name=
"Silicon_slice"
material=
"Si"
sensitive=
"true"
/>
</layer>
</layer>
...
...
This diff is collapsed.
Click to expand it.
compact/definitions.xml
+
10
−
9
View file @
32add61e
...
@@ -321,22 +321,23 @@
...
@@ -321,22 +321,23 @@
<constant
name=
"SiliconTrackerOuterBarrelLength"
value=
"SolenoidLength/2.0"
/>
<constant
name=
"SiliconTrackerOuterBarrelLength"
value=
"SolenoidLength/2.0"
/>
<comment>
<comment>
----------------------------
----------------------------
---
Central Barrel Tracker -
Si
Central Barrel Tracker -
Global
----------------------------
----------------------------
---
</comment>
</comment>
<constant
name=
"cb_CTD_
Si_
rmin"
value=
"21.0 * cm"
/>
<constant
name=
"cb_CTD_rmin"
value=
"21.0 * cm"
/>
<constant
name=
"cb_CTD_
Si_
rmax"
value=
"80.0 * cm"
/>
<constant
name=
"cb_CTD_rmax"
value=
"80.0 * cm"
/>
<constant
name=
"cb_CTD_
Si_
zmax"
value=
"200.0 * cm"
/>
<constant
name=
"cb_CTD_zmax"
value=
"200.0 * cm"
/>
<comment>
Original Global parameter
</comment>
<comment>
Original Global parameter
</comment>
<!--
<!--
<constant name="cb_CTD_
Si_
zmax" value="120.0 * cm"/>
<constant name="cb_CTD_zmax" value="120.0 * cm"/>
-->
-->
<constant
name=
"cb_CTD_
Si_
length"
value=
"SolenoidLength - cb_CTD_
Si_
zmax"
/>
<constant
name=
"cb_CTD_length"
value=
"SolenoidLength - cb_CTD_zmax"
/>
<comment>
After fix cb_Solenoid parameters
</comment>
<comment>
After fix cb_Solenoid parameters
</comment>
<!--
<!--
<constant name="cb_CTD_
Si_
length" value="cb_Solenoid_z - cb_CTD_
Si_
zmax"/>
<constant name="cb_CTD_length" value="cb_Solenoid_z - cb_CTD_zmax"/>
-->
-->
<comment>
Si layer opiton
</comment>
<constant
name=
"cb_CTD_Si_gap"
value=
"5.0 * cm"
/>
<constant
name=
"cb_CTD_Si_gap"
value=
"5.0 * cm"
/>
<constant
name=
"cb_CTD_Si_layer"
value=
"15"
/>
<constant
name=
"cb_CTD_Si_layer"
value=
"15"
/>
...
...
This diff is collapsed.
Click to expand it.
compact/display.xml
+
1
−
1
View file @
32add61e
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
<vis
name=
"cb_SolenoidVis"
alpha=
"0.4"
r=
"0.1"
g=
"0.0"
b=
"0.1"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_SolenoidVis"
alpha=
"0.4"
r=
"0.1"
g=
"0.0"
b=
"0.1"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ffi_ZDCVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ffi_ZDCVis"
alpha=
"0.1"
r=
"0.1"
g=
"0.0"
b=
"1.0"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ffi_ZDCmoduleVis"
alpha=
"1.0"
r=
"0.1"
g=
"1.0"
b=
"0.9"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"ffi_ZDCmoduleVis"
alpha=
"1.0"
r=
"0.1"
g=
"1.0"
b=
"0.9"
showDaughters=
"true"
visible=
"true"
/>
<vis
name=
"cb_CTD
_Si
Vis"
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"
/>
<comment>
<comment>
...
...
This diff is collapsed.
Click to expand it.
src/cb_CTD_Si.cpp
+
30
−
0
View file @
32add61e
...
@@ -26,11 +26,41 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
...
@@ -26,11 +26,41 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
Volume
detVol
(
"cb_CTD_GVol_Logic"
,
cb_CTD_GVol_Solid
,
Vacuum
);
Volume
detVol
(
"cb_CTD_GVol_Logic"
,
cb_CTD_GVol_Solid
,
Vacuum
);
detVol
.
setVisAttributes
(
desc
.
visAttributes
(
x_det
.
visStr
()));
detVol
.
setVisAttributes
(
desc
.
visAttributes
(
x_det
.
visStr
()));
// Construct Silicon Layers
xml_comp_t
x_layer
=
x_det
.
child
(
_U
(
layer
));
const
int
repeat
=
x_layer
.
repeat
();
xml_comp_t
x_slice
=
x_layer
.
child
(
_U
(
slice
));
Material
slice_mat
=
desc
.
material
(
x_slice
.
materialStr
());
double
layerRIn
[
100
];
double
layerROut
[
100
];
// Loop over layers
for
(
int
i
=
0
;
i
<
repeat
;
i
++
)
{
layerRIn
[
i
]
=
RIn
+
(
SiLayerGap
*
i
);
layerROut
[
i
]
=
RIn
+
(
0.01
+
SiLayerGap
*
i
);
if
(
layerROut
[
i
]
>
ROut
)
continue
;
string
logic_layer_name
=
detName
+
_toString
(
i
,
"_Logic_lay_%d"
);
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
());
sens
.
setType
(
"tracker"
);
layerVol
.
setSensitiveDetector
(
sens
);
Position
layer_pos
=
Position
(
0.0
,
0.0
,
0.0
);
PlacedVolume
layerPV
=
detVol
.
placeVolume
(
layerVol
,
layer_pos
);
layerPV
.
addPhysVolID
(
"layer"
,
i
+
1
);
}
DetElement
det
(
detName
,
detID
);
DetElement
det
(
detName
,
detID
);
Volume
motherVol
=
desc
.
pickMotherVolume
(
det
);
Volume
motherVol
=
desc
.
pickMotherVolume
(
det
);
Transform3D
tr
(
RotationZYX
(
0.0
,
0.0
,
0.0
),
Position
(
0.0
,
0.0
,
0.0
));
Transform3D
tr
(
RotationZYX
(
0.0
,
0.0
,
0.0
),
Position
(
0.0
,
0.0
,
0.0
));
PlacedVolume
detPV
=
motherVol
.
placeVolume
(
detVol
,
tr
);
PlacedVolume
detPV
=
motherVol
.
placeVolume
(
detVol
,
tr
);
detPV
.
addPhysVolID
(
"system"
,
detID
);
detPV
.
addPhysVolID
(
"system"
,
detID
);
detPV
.
addPhysVolID
(
"barrel"
,
1
);
det
.
setPlacement
(
detPV
);
det
.
setPlacement
(
detPV
);
return
det
;
return
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