Merge pull request #2699 from gudlot/issue-2694-mar-sensors

Added missing sensor materials for Mar detectors

Author: kif

MANIFEST.in

@@ -498,6 +498,15 @@ def __init__(self, pixel1=79.346e-6, pixel2=79.346e-6, max_shape=None, orientati
 # (some detectors are the same)
 ################################################################################
 
+# Define sensors used in MAR detectors
+
+# MAR345 detector: BaFBr0.85I0.15:Eu2+ coating, 124 μm thickness
+BaFBr085I015124 = SensorConfig.from_dict({"material": "BaFBr0.85I0.15", "thickness": 124e-6})
+
+# MAR555 detector: Amorphous Selenium, 300 μm thickness
+Se300 = SensorConfig.from_dict({"material": "Se", "thickness": 300e-6})
+
+
 
 class Mar345(Detector):
 
@@ -522,8 +531,7 @@ class Mar345(Detector):
                   1800: 100e-6}
 
     aliases = ["MAR 345", "Mar3450"]
-    #TODO: Add sensor materials
-    #SENSORS=()
+    SENSORS=(BaFBr085I015124)
 
     def __init__(self, pixel1=100e-6, pixel2=100e-6, max_shape=None, orientation=0, sensor:SensorConfig|None=None):
         super().__init__(pixel1, pixel2, max_shape=max_shape, orientation=orientation, sensor=sensor)
@@ -587,8 +595,7 @@ class Mar555(Detector):
     force_pixel = True
     MAX_SHAPE = (3072, 2560)
     aliases = ["MAR 555"]
-    #TODO: Add sensor information for Mar555
-    #SENSORS=()
+    SENSORS=(Se300)
 
     def __init__(self, pixel1=139e-6, pixel2=139e-6, max_shape=None, orientation=0, sensor:SensorConfig|None=None):
         super().__init__(pixel1, pixel2, max_shape=max_shape, orientation=orientation, sensor = sensor)

src/pyFAI/detectors/_rayonix.py

@@ -157,6 +157,7 @@ def absorbance(self, energy:float, length: float, unit:str="m") -> float:
 ALL_MATERIALS["GaAs"] = GaAs_MATERIAL = SensorMaterial("GaAs", density=5.3176)
 ALL_MATERIALS["Gd2O2S"] = Gd2O2S_MATERIAL = SensorMaterial("Gd2O2S", density=7.32)
 ALL_MATERIALS["BaFBr0.85I0.15"] = BaFBr085I015_MATERIAL = SensorMaterial("BaFBr0.85I0.15", density=3.18) 
+ALL_MATERIALS["Se"] = Se_MATERIAL = SensorMaterial("Se", density=4.26)
 
 
 @dataclass

src/pyFAI/detectors/sensors.py

@@ -0,0 +1,47 @@
+# Energy (MeV) mu/rho (cm²/g) mu_en/rho (cm²/g)
+   1.00000E-03  2.317E+03  2.312E+03
+   1.19825E-03  1.512E+03  1.506E+03
+   1.43580E-03  9.814E+02  9.760E+02
+L3 1.43580E-03  4.347E+03  4.287E+03
+   1.45586E-03  4.057E+03  4.002E+03
+   1.47620E-03  3.907E+03  3.855E+03
+L2 1.47620E-03  5.186E+03  5.112E+03
+   1.50000E-03  5.336E+03  5.260E+03
+   1.65390E-03  4.342E+03  4.284E+03
+L1 1.65390E-03  4.915E+03  4.849E+03
+   2.00000E-03  3.098E+03  3.062E+03
+   3.00000E-03  1.116E+03  1.104E+03
+   4.00000E-03  5.252E+02  5.187E+02
+   5.00000E-03  2.896E+02  2.851E+02
+   6.00000E-03  1.773E+02  1.737E+02
+   8.00000E-03  8.116E+01  7.865E+01
+   1.00000E-02  4.414E+01  4.221E+01
+   1.26578E-02  2.318E+01  2.173E+01
+K  1.26578E-02  1.589E+02  8.599E+01
+   1.50000E-02  1.033E+02  6.270E+01
+   2.00000E-02  4.818E+01  3.352E+01
+   3.00000E-02  1.596E+01  1.240E+01
+   4.00000E-02  7.184E+00  5.796E+00
+   5.00000E-02  3.864E+00  3.143E+00
+   6.00000E-02  2.341E+00  1.886E+00
+   8.00000E-02  1.090E+00  8.332E-01
+   1.00000E-01  6.278E-01  4.426E-01
+   1.50000E-01  2.703E-01  1.483E-01
+   2.00000E-01  1.742E-01  7.695E-02
+   3.00000E-01  1.144E-01  4.113E-02
+   4.00000E-01  9.299E-02  3.261E-02
+   5.00000E-01  8.129E-02  2.941E-02
+   6.00000E-01  7.350E-02  2.775E-02
+   8.00000E-01  6.314E-02  2.581E-02
+   1.00000E+00  5.619E-02  2.446E-02
+   1.25000E+00  4.999E-02  2.306E-02
+   1.50000E+00  4.564E-02  2.195E-02
+   2.00000E+00  4.010E-02  2.052E-02
+   3.00000E+00  3.476E-02  1.947E-02
+   4.00000E+00  3.247E-02  1.944E-02
+   5.00000E+00  3.145E-02  1.978E-02
+   6.00000E+00  3.105E-02  2.025E-02
+   8.00000E+00  3.119E-02  2.130E-02
+   1.00000E+01  3.186E-02  2.226E-02
+   1.50000E+01  3.395E-02  2.394E-02
+   2.00000E+01  3.599E-02  2.487E-02

src/pyFAI/resources/sensors/Se.abs

@@ -6,6 +6,7 @@ py.install_sources(
      'Ge.abs',
      'Gd2O2S.abs',
      'BaFBr0.85I0.15.abs',
+     'Se.abs',
     ],
   pure: false,   # Will be installed next to binaries
   subdir: 'pyFAI/resources/sensors'  # Folder relative to site-packages to install to

src/pyFAI/resources/sensors/meson.build

@@ -5,3 +5,6 @@ For Fuji-I.P. phosphor BaFBr0.85I0.15:
  * data from https://physics.nist.gov/PhysRefData/Xcom/html/xcom1.html
  * calculated by Paul Antoine DOUISSARD, ESRF
  * density from https://theses.hal.science/tel-04521313v1/file/SONG_PANYI_2023.pdf, p94
+
+For armorphous Se
+ * density from https://pubchem.ncbi.nlm.nih.gov/compound/Selenium#section=Solubility