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
579ca7b2
Commit
579ca7b2
authored
3 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "mRICH alternative implementation"
parent
2a25aab6
No related branches found
No related tags found
1 merge request
!235
Resolve "mRICH alternative implementation"
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
compact/mrich.xml
+2
-1
2 additions, 1 deletion
compact/mrich.xml
compact/mrich_alt.xml
+112
-0
112 additions, 0 deletions
compact/mrich_alt.xml
src/MRich_geo.cpp
+258
-223
258 additions, 223 deletions
src/MRich_geo.cpp
with
372 additions
and
224 deletions
compact/mrich.xml
+
2
−
1
View file @
579ca7b2
...
@@ -77,7 +77,8 @@
...
@@ -77,7 +77,8 @@
length=
"MRICHCarbonFrame_length"
>
length=
"MRICHCarbonFrame_length"
>
<frame
vis=
"AnlGray"
thickness=
"MRICHCarbonFrame_thickness"
material=
"CarbonFiber"
/>
<frame
vis=
"AnlGray"
thickness=
"MRICHCarbonFrame_thickness"
material=
"CarbonFiber"
/>
<aerogel
vis=
"MRICH_aerogel_vis"
<aerogel
vis=
"MRICH_aerogel_vis"
length=
"MRICHAerogel_thickness"
width=
"MRICHAerogel_width"
length=
"MRICHAerogel_thickness"
width=
"MRICHAerogel_width"
material=
"AerogelOptical"
>
material=
"AerogelOptical"
>
<frame
vis=
"MRICH_frame_vis"
thickness=
"MRICHFoam_thickness"
material=
"PolystyreneFoam"
/>
<frame
vis=
"MRICH_frame_vis"
thickness=
"MRICHFoam_thickness"
material=
"PolystyreneFoam"
/>
</aerogel>
</aerogel>
...
...
This diff is collapsed.
Click to expand it.
compact/mrich_alt.xml
0 → 100644
+
112
−
0
View file @
579ca7b2
<lccdd>
<comment>
MRICH (alternative design)
</comment>
<define>
<constant
name=
"MRICH_rmin"
value=
"10*cm"
/>
<constant
name=
"MRICH_rmax"
value=
"BackwardPID_rmax"
/>
<constant
name=
"MRICH_length"
value=
"BackwardPID_length"
/>
<constant
name=
"MRICH_zmin"
value=
"BackwardPID_zmin"
/>
<constant
name=
"MRICHAerogel_thickness"
value=
"30.0*mm"
/>
<constant
name=
"MRICHAerogel_width"
value=
"126.5*mm"
/>
<constant
name=
"MRICHFoam_thickness"
value=
"2*mm"
/>
<constant
name=
"MRICHFresnelLens_thickness"
value=
"0.06*inch"
/>
<constant
name=
"MRICHAerogelLensGap_thickness"
value=
"2*mm"
/>
<constant
name=
"MRICHPhotoDet_thickness"
value=
"1.5*mm"
/>
<constant
name=
"MRICHPhotoDet_length"
value=
"48.5*mm"
/>
<constant
name=
"MRICHGlassWindow_width"
value=
"103.5*mm"
/>
<constant
name=
"MRICHGlassPhotoDet_thickness"
value=
"5.0*mm"
/>
<constant
name=
"MRICHPhotoDetMCPlate_thickness"
value=
"0.3*mm"
/>
<!-- FIXME: should be 1.2*mm with PyrexGlass25 -->
<constant
name=
"MRICHPhotoDetAnode_thickness"
value=
"3.8*mm"
/>
<constant
name=
"MRICHPhotoDetPCB_thickness"
value=
"2.0*mm"
/>
<constant
name=
"MRICHPhotoDetCopper_thickness"
value=
"0.1*mm"
/>
<constant
name=
"MRICHPhotoDetKapton_thickness"
value=
"0.2*mm"
/>
<constant
name=
"MRICHRearExtraSpace_thickness"
value=
"0.3*mm"
/>
<constant
name=
"MRICHLensPhotoDet_length"
value=
"136.4*mm"
/>
<constant
name=
"MRICHFresnelLensEffectiveDiameter"
value=
"6.0*inch"
/>
<constant
name=
"MRICHFresnelLensGroove_pitch"
value=
"inch/125"
/>
<constant
name=
"MRICHCarbonFrame_thickness"
value=
"1.0*mm"
/>
<constant
name=
"MRICHCarbonFrame_width"
value=
"MRICHAerogel_width+2.0*MRICHFoam_thickness + 2.0*MRICHCarbonFrame_thickness"
/>
<constant
name=
"MRICHModules_nx"
value=
"floor((MRICH_rmax-MRICH_rmin)/MRICHCarbonFrame_width)"
/>
<constant
name=
"MRICHModules_ny"
value=
"floor((MRICH_rmax-MRICH_rmin)/MRICHCarbonFrame_width)"
/>
<constant
name=
"MRICHCarbonFrame_length"
value=
"MRICHAerogel_thickness
+ 2.0*MRICHCarbonFrame_thickness
+ 2.0*MRICHFoam_thickness
+ MRICHAerogelLensGap_thickness
+ MRICHFresnelLens_thickness
+ MRICHLensPhotoDet_length
+ MRICHGlassPhotoDet_thickness
+ 2.0*MRICHPhotoDetMCPlate_thickness
+ MRICHPhotoDetAnode_thickness
+ MRICHPhotoDetPCB_thickness
+ MRICHPhotoDetCopper_thickness
+ MRICHPhotoDetKapton_thickness
+ MRICHRearExtraSpace_thickness "
/>
</define>
<limits>
</limits>
<regions>
</regions>
<display>
</display>
<detectors>
<detector
id=
"MRICH_ID"
name=
"MRICH"
type=
"athena_MRICH"
readout=
"MRICHHits"
reflect=
"true"
projective=
"false"
vis=
"InvisibleWithDaughters"
material=
"Air"
>
<dimensions
rmin=
"MRICH_rmin"
rmax=
"MRICH_rmax"
length=
"abs(MRICH_length)"
zmin=
"MRICH_zmin"
/>
<envelope
thickness=
"MRICHCarbonFrame_thickness"
material=
"CarbonFiber"
/>
<module
name=
"MRICH_module1"
vis=
"InvisibleWithDaughters"
width=
"MRICHCarbonFrame_width"
height=
"MRICHCarbonFrame_width"
length=
"MRICHCarbonFrame_length"
>
<aerogel
vis=
"MRICH_aerogel_vis"
length=
"MRICHAerogel_thickness"
width=
"MRICHAerogel_width"
material=
"AerogelOptical"
>
<frame
vis=
"MRICH_frame_vis"
thickness=
"MRICHFoam_thickness"
material=
"PolystyreneFoam"
/>
</aerogel>
<lens
vis=
"MRICH_lens_vis"
thickness=
"MRICHFresnelLens_thickness"
pitch=
"MRICHFresnelLensGroove_pitch"
focal_length=
"6.0*inch"
effective_diameter=
"MRICHFresnelLensEffectiveDiameter"
width=
"MRICHAerogel_width"
material=
"AcrylicOptical"
/>
<space
thickness=
"MRICHLensPhotoDet_length"
/>
<photodet
width=
"MRICHGlassWindow_width"
thickness=
"MRICHGlassPhotoDet_thickness"
material=
"PyrexGlassOptical"
>
<sensor
nx=
"2"
ny=
"2"
thickness=
"MRICHPhotoDet_thickness"
width=
"MRICHPhotoDet_length"
material=
"SiliconOxide"
/>
<layer
thickness=
"MRICHPhotoDetMCPlate_thickness"
material=
"PyrexGlass"
/>
<!-- FIXME: should be PyrexGlass25 with 1.2*mm thickness -->
<layer
thickness=
"MRICHPhotoDetMCPlate_thickness"
material=
"PyrexGlass"
/>
<!-- FIXME: should be PyrexGlass25 with 1.2*mm thickness -->
<layer
thickness=
"MRICHPhotoDetAnode_thickness"
material=
"AluminumOxide"
/>
<layer
thickness=
"MRICHPhotoDetPCB_thickness"
material=
"Fr4"
/>
<layer
thickness=
"MRICHPhotoDetCopper_thickness"
material=
"Copper"
/>
<layer
thickness=
"MRICHPhotoDetKapton_thickness"
material=
"Kapton"
/>
</photodet>
</module>
</detector>
</detectors>
<readouts>
<readout
name=
"MRICHHits"
>
<segmentation
type=
"CartesianGridXY"
grid_size_x=
"3*mm"
grid_size_y=
"3*mm"
/>
<id>
system:8,module:14,sensor:8,x:32:-16,y:-16
</id>
</readout>
</readouts>
<!--Globals>
<Parameter Name="mrichInfo" Value="mrichmod/mrich_1_geoparams-0-0-4294967295-1527211159.xml"/>
</Globals-->
</lccdd>
This diff is collapsed.
Click to expand it.
src/MRich_geo.cpp
+
258
−
223
View file @
579ca7b2
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