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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
detectors
athena
Commits
bca4580b
Commit
bca4580b
authored
Nov 16, 2021
by
Alexander Kiselev
Browse files
Options
Downloads
Patches
Plain Diff
Fixed sensor optical surface issue with ERICH
parent
a68cd809
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
compact/erich.xml
+4
-4
4 additions, 4 deletions
compact/erich.xml
compact/optical_materials.xml
+7
-0
7 additions, 0 deletions
compact/optical_materials.xml
src/ERich_geo.cpp
+2
-3
2 additions, 3 deletions
src/ERich_geo.cpp
with
13 additions
and
7 deletions
compact/erich.xml
+
4
−
4
View file @
bca4580b
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
name=
"ERICH"
name=
"ERICH"
type=
"athena_ERICH"
type=
"athena_ERICH"
readout=
"ERICHHits"
readout=
"ERICHHits"
gas=
"
AirOptical
"
gas=
"
C4F10_ERICH
"
material=
"Aluminum"
material=
"Aluminum"
vis_vessel=
"DRICH_vessel_vis"
vis_vessel=
"DRICH_vessel_vis"
vis_gas=
"DRICH_gas_vis"
vis_gas=
"DRICH_gas_vis"
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
thickness=
"ERICH_aerogel_thickness"
thickness=
"ERICH_aerogel_thickness"
/>
/>
<filter
<filter
material=
"A
irOptical
"
material=
"A
crylic_DRICH
"
vis=
"DRICH_filter_vis"
vis=
"DRICH_filter_vis"
thickness=
"0.3*mm"
thickness=
"0.3*mm"
/>
/>
...
@@ -129,8 +129,8 @@
...
@@ -129,8 +129,8 @@
sensor placement algorithm will try to place as many as it can in the specified region
sensor placement algorithm will try to place as many as it can in the specified region
</documentation>
</documentation>
<module
<module
material=
"
Silicon
"
material=
"
AirOptical
"
surface=
"SensorSurface_
D
RICH"
surface=
"SensorSurface_
E
RICH"
vis=
"ERICH_sensor_vis"
vis=
"ERICH_sensor_vis"
side=
"ERICH_sensor_active_size"
side=
"ERICH_sensor_active_size"
thickness=
"ERICH_sensor_thickness"
thickness=
"ERICH_sensor_thickness"
...
...
This diff is collapsed.
Click to expand it.
compact/optical_materials.xml
+
7
−
0
View file @
bca4580b
...
@@ -1097,6 +1097,13 @@
...
@@ -1097,6 +1097,13 @@
7*eV 1.92
7*eV 1.92
"
/>
"
/>
</opticalsurface>
</opticalsurface>
<opticalsurface
name=
"SensorSurface_ERICH"
model=
"glisur"
finish=
"polished"
type=
"dielectric_dielectric"
>
<property
name=
"EFFICIENCY"
coldim=
"2"
values=
"
1*eV 1
4*eV 1
7*eV 1
"
/>
</opticalsurface>
<!-- END dRICh surface definitions -->
<!-- END dRICh surface definitions -->
</surfaces>
</surfaces>
...
...
This diff is collapsed.
Click to expand it.
src/ERich_geo.cpp
+
2
−
3
View file @
bca4580b
...
@@ -252,7 +252,6 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
...
@@ -252,7 +252,6 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
}
}
// filter placement and surface properties
// filter placement and surface properties
#if 1//_OFF_
if
(
!
debug_optics
)
{
if
(
!
debug_optics
)
{
auto
filterPV
=
gasvolVol
.
placeVolume
(
auto
filterPV
=
gasvolVol
.
placeVolume
(
filterVol
,
filterVol
,
...
@@ -272,7 +271,6 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
...
@@ -272,7 +271,6 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
geometry
->
AddFlatRadiator
(
detector
,
"Filter"
,
0
,
(
G4LogicalVolume
*
)(
0x2
),
0
,
surface
,
filterThickness
/
mm
);
geometry
->
AddFlatRadiator
(
detector
,
"Filter"
,
0
,
(
G4LogicalVolume
*
)(
0x2
),
0
,
surface
,
filterThickness
/
mm
);
}
}
}
}
#endif
// BUILD SENSORS ///////////////////////
// BUILD SENSORS ///////////////////////
...
@@ -393,10 +391,11 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
...
@@ -393,10 +391,11 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
//@@@ Write the geometry out as a custom TObject class instance;
//@@@ Write the geometry out as a custom TObject class instance;
{
{
// FIXME: import from the geometry database; FIXME: crappy style in general;
// FIXME: import from the geometry database; FIXME: crappy style in general;
// in general these values can (and should) be tweaked in the juggler .py options file;
const
char
*
name
[]
=
{
"GasVolume"
,
"Aerogel"
,
"Filter"
};
const
char
*
name
[]
=
{
"GasVolume"
,
"Aerogel"
,
"Filter"
};
//double n[] = { 1.0013, 1.0200, 1.5017};
//double n[] = { 1.0013, 1.0200, 1.5017};
//double n[] = { 1.0013, 1.0200};//, 1.0000};
//double n[] = { 1.0013, 1.0200};//, 1.0000};
double
n
[]
=
{
1.00
00
,
1.019
5
,
1.
0000
};
double
n
[]
=
{
1.00
13
,
1.019
0
,
1.
5017
};
for
(
unsigned
ir
=
0
;
ir
<
sizeof
(
n
)
/
sizeof
(
n
[
0
]);
ir
++
)
{
for
(
unsigned
ir
=
0
;
ir
<
sizeof
(
n
)
/
sizeof
(
n
[
0
]);
ir
++
)
{
auto
radiator
=
detector
->
GetRadiator
(
name
[
ir
]);
auto
radiator
=
detector
->
GetRadiator
(
name
[
ir
]);
...
...
This diff is collapsed.
Click to expand it.
Christopher Dilks
@c.dilks
mentioned in issue
#136 (closed)
·
Nov 18, 2021
mentioned in issue
#136 (closed)
mentioned in issue #136
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