diff --git a/compact/drich.xml b/compact/drich.xml
index 0289e44da..dec17c9ae 100644
--- a/compact/drich.xml
+++ b/compact/drich.xml
@@ -180,7 +180,7 @@
     spherical patch below
 </documentation>
 <module
-  material="AirOptical"
+  material="SiPM"
   surface="SensorSurface_DRICH"
   vis="DRICH_sensor_vis"
   side="DRICH_sensor_size"
diff --git a/compact/optical_materials.xml b/compact/optical_materials.xml
index fe772ed30..d95d9fab8 100644
--- a/compact/optical_materials.xml
+++ b/compact/optical_materials.xml
@@ -8,6 +8,127 @@
       1.0*eV 1.00029
       5.1*eV 1.00029
       "/>
+    <matrix name="RINDEX__SiPM" coldim="2" values="
+	3.86052*eV	6.00137
+	3.8402*eV	5.99268
+	3.82009*eV	5.98609
+	3.80018*eV	5.98158
+	3.78049*eV	5.97863
+	3.76099*eV	5.97858
+	3.74057*eV	5.98263
+	3.72037*eV	5.9865
+	3.70039*eV	5.99464
+	3.68062*eV	6.00479
+	3.65998*eV	6.01731
+	3.64063*eV	6.03369
+	3.62044*eV	6.05377
+	3.60046*eV	6.08028
+	3.58071*eV	6.1132
+	3.56015*eV	6.15475
+	3.54083*eV	6.20882
+	3.52073*eV	6.27768
+	3.50085*eV	6.36838
+	3.48021*eV	6.48259
+	3.46079*eV	6.62403
+	3.44062*eV	6.77999
+	3.42069*eV	6.93477
+	3.40005*eV	7.0607
+	3.38059*eV	7.13127
+	3.36043*eV	7.13374
+	3.34052*eV	7.08041
+	3.32084*eV	6.97814
+	3.30051*eV	6.83782
+	3.28042*eV	6.6779
+	3.26058*eV	6.52084
+	3.24014*eV	6.36837
+	3.22078*eV	6.22608
+	3.2*eV		6.09465
+	3.1803*eV	5.9744
+	3.16004*eV	5.86379
+	3.14004*eV	5.76207
+	3.12028*eV	5.66928
+	3.1*eV		5.58343
+	3.08075*eV	5.50446
+	3.06022*eV	5.42998
+	3.04071*eV	5.35815
+	3.02071*eV	5.29201
+	3.00024*eV	5.22892
+	2.98005*eV	5.17029
+	2.96013*eV	5.11482
+	2.94048*eV	5.06314
+	2.9204*eV	5.01344
+	2.90058*eV	4.96515
+	2.88037*eV	4.91983
+	2.86044*eV	4.87551
+	2.84013*eV	4.83454
+	2.8201*eV	4.79402
+	2.80036*eV	4.75579
+	2.78027*eV	4.72035
+	2.76046*eV	4.68437
+	2.74033*eV	4.6499
+	2.72049*eV	4.61686
+	2.70035*eV	4.58484
+	2.6805*eV	4.55488
+	2.66037*eV	4.52398
+	2.64055*eV	4.4966
+	2.62046*eV	4.46761
+	2.60013*eV	4.44291
+	2.58011*eV	4.417
+	2.5604*eV	4.39178
+	2.54046*eV	4.36771
+	2.52033*eV	4.34368
+	2.5005*eV	4.32062
+	2.4805*eV	4.29862
+	2.46032*eV	4.27751
+	2.44046*eV	4.25561
+	2.42046*eV	4.23543
+	2.40031*eV	4.21543
+	2.3805*eV	4.19637
+	2.36011*eV	4.17734
+	2.34006*eV	4.15922
+	2.32036*eV	4.14024
+	2.30013*eV	4.12328
+	2.28025*eV	4.10624
+	2.2603*eV	4.08924
+	2.24029*eV	4.07313
+	2.22023*eV	4.05718
+	2.20014*eV	4.04213
+	2.18041*eV	4.02614
+	2.16028*eV	4.01211
+	2.14014*eV	3.99709
+	2.12038*eV	3.98311
+	2.10027*eV	3.96911
+	2.08019*eV	3.95609
+	2.06014*eV	3.94308
+	2.04014*eV	3.93108
+	2.0202*eV	3.91807
+	2.00032*eV	3.90606
+	1.9802*eV	3.89306
+	1.96016*eV	3.88205
+	1.94023*eV	3.87004
+	1.9201*eV	3.85804
+	1.90009*eV	3.84703
+	1.88021*eV	3.83703
+	1.86019*eV	3.82603
+	1.84031*eV	3.81503
+	1.82032*eV	3.80502
+	1.80023*eV	3.79602
+	1.78033*eV	3.78702
+	1.76011*eV	3.77802
+	1.74011*eV	3.76802
+	1.72031*eV	3.76102
+	1.70026*eV	3.75201
+	1.68022*eV	3.74501
+	1.6602*eV	3.73601
+	1.64021*eV	3.72801
+	1.62028*eV	3.72101
+	1.60021*eV	3.71401
+	1.58022*eV	3.70501
+	1.56014*eV	3.69701
+	1.54018*eV	3.688
+	1.52017*eV	3.681
+	1.50012*eV	3.673
+      "/>
     <matrix name="RINDEX__Quartz" coldim="2" values="
       1.0*eV 1.46
       5.1*eV 1.46
@@ -700,6 +821,12 @@
       <property name="RINDEX" ref="RINDEX__Air"/>
       <property name="ABSLENGTH"               coldim="2" values="1*eV  200*m  5*eV  200*m"/>
     </material>
+    <material name="SiPM">
+      <D type="density" unit="g/cm3" value="2.33"/>
+      <fraction n="1.000" ref="Si"/>
+      <property name="RINDEX" ref="RINDEX__SiPM"/>
+      <property name="ABSLENGTH"               coldim="2" values="1*eV  200*m  5*eV  200*m"/>
+    </material>
     <material name="VacuumOptical">
       <D type="density" unit="g/cm3" value="0.0000000001"/>
       <fraction n="0.754" ref="N"/>
@@ -857,10 +984,29 @@
     </opticalsurface>
     <opticalsurface name="SensorSurface_DRICH" model="glisur" finish="polished" type="dielectric_dielectric">
       <property name="EFFICIENCY" coldim="2" values="
-        1*eV  1
-        4*eV  1
-        7*eV  1
-        "/>
+	3.8*eV	0.02
+	3.7*eV	0.07
+	3.7*eV	0.1
+	3.6*eV	0.16
+	3.5*eV	0.2
+	3.4*eV	0.26
+	3.3*eV	0.3
+	3.1*eV	0.35
+	2.9*eV	0.38
+	2.7*eV	0.4
+	2.5*eV	0.39
+	2.3*eV	0.34
+	2*eV	0.23
+	1.9*eV	0.21
+	1.9*eV	0.2
+	1.8*eV	0.17
+	1.8*eV	0.15
+	1.7*eV	0.12
+	1.6*eV	0.1
+	1.5*eV	0.08
+	1.5*eV	0.05
+	1.4*eV	0.03	
+	"/>
     </opticalsurface>
     <opticalsurface name="SensorSurface_PFRICH" model="glisur" finish="polished" type="dielectric_dielectric">
       <property name="EFFICIENCY" coldim="2" values="