Change Aerogel radius to 90 cm and retuning optics (#374)

### Briefly, what does this PR introduce?
Optics re-tuning and reshaping aerogel.

### What kind of change does this PR introduce?
- Optics re-tuning to achieve ATHENA like acceptance
- Aerogel size reduced to 90 cm

### Please check if this PR fulfills the following:
- [x] Tests for the changes have been added
- [x] Documentation has been added / updated
- [x] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
No 
### Does this PR change default behavior?
No

---------

Co-authored-by: chchatte92 <[email protected]>
Co-authored-by: Christopher Dilks <[email protected]>

compact/pid/drich.xml

@@ -1,5 +1,5 @@
 <!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
-<!-- Copyright (C) 2022 Christopher Dilks -->
+<!-- Copyright (C) 2023 Christopher Dilks, Chandradoy Chatterjee -->
 
 <lccdd>
 
@@ -15,10 +15,9 @@
 <constant name="DRICH_window_thickness"   value="0.1*cm"/>  <!-- thickness of entrance and exit walls -->
 <constant name="DRICH_num_sectors"        value="6"/>  <!-- number of azimuthal sectors -->
 <!-- snout geometry: cone with front radius rmax0 and back radius of rmax1 -->
-<constant name="DRICH_rmax0"              value="110.0*cm"/>
+<constant name="DRICH_rmax0"              value="90.0*cm"/>
 <constant name="DRICH_snout_length"       value="20.0*cm"/>
-<constant name="DRICH_snout_slope"        value="DRICH_rmax0 / DRICH_zmin"/> <!-- TODO: increase slope to allow more space for aerogel cones ? -->
-<constant name="DRICH_rmax1"              value="DRICH_rmax0 + DRICH_snout_length * DRICH_snout_slope"/>
+<constant name="DRICH_rmax1"              value="DRICH_rmax0 + DRICH_snout_length * (tan(0.200+atan(DRICH_rmax0/DRICH_zmin))) "/>  <!--extra 0.200 takes into account the saturated cone of light from aerogel-->
 <!-- tank geometry: cylinder, holding the majority of detector components -->
 <constant name="DRICH_rmax2"              value="ForwardPIDRegion_rmax"/>  <!-- cylinder radius -->
 <!-- aerogel+filter geometry -->
@@ -156,13 +155,13 @@
   material="Acrylic_DRICH"
   surface="MirrorSurface_DRICH"
   vis="DRICH_mirror_vis"
-  backplane="DRICH_window_thickness + 2.0*cm"
+  backplane="DRICH_window_thickness + 1.0*cm"
   rmin="DRICH_rmin1 + DRICH_wall_thickness - 1.0*cm"
   rmax="DRICH_rmax2 - DRICH_wall_thickness - 3.0*cm"
   phiw="59.5*degree"
   thickness="0.2*cm"
-  focus_tune_x="-5.0*cm"
-  focus_tune_z="0.0*cm"
+  focus_tune_x="3.60*cm"
+  focus_tune_z="-2.00*cm"
   />
 
 <!-- /detectors/detector/sensors -->
@@ -211,12 +210,12 @@
 <sphere
   centerz="-50.0*cm"
   centerx="180.0*cm"
-  radius="100.0*cm"
+  radius="110.0*cm"
   />
 <sphericalpatch
   phiw="18*degree"
-  rmin="DRICH_rmax1 + 2.0*cm"
-  rmax="DRICH_rmax2 - 5.0*cm"
+  rmin="DRICH_rmax1 + 3.0*cm"
+  rmax="DRICH_rmax2 - 3.0*cm"
   zmin="DRICH_snout_length + 5.0*cm"
   />
 
@@ -245,6 +244,4 @@
     <id>system:8,sector:3,module:12,x:32:-16,y:-16</id>
   </readout>
 </readouts>
-
-
 </lccdd>