mcammara
/
mcutils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fidex bug, chargeToPhoton was neglecting thickness

This commit is contained in:
Marco Cammarata 2017-03-09 23:22:26 +01:00
parent d17b9caa7f
commit ce3780e74a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xray/utils.py
View File

@ -30,11 +30,13 @@ def getEdfFiles(folder,**kw):
return getFiles(folder,basename="*.edf*",**kw) return getFiles(folder,basename="*.edf*",**kw)
def getDelayFromString(string) : def getDelayFromString(string) :
match = _timeInStr_regex_regex.search(string) match = _timeInStr_regex.search(string)
return match and match.group(1) or None return match and match.group(1) or None
_time_regex = re.compile("(-?\d+\.?\d*)((?:s|fs|ms|ns|ps|us)?)") _time_regex = re.compile("(-?\d+\.?\d*)((?:s|fs|ms|ns|ps|us)?)")
def strToTime(delay) : def strToTime(delay) :
if isinstance(delay,bytes): delay = delay.decode('ascii')
_time2value = dict( fs = 1e-15, ps = 1e-12, ns = 1e-9, us = 1e-6, ms = 1e-3, s = 1) _time2value = dict( fs = 1e-15, ps = 1e-12, ns = 1e-9, us = 1e-6, ms = 1e-3, s = 1)
match = _time_regex.search(delay) match = _time_regex.search(delay)
@ -309,7 +311,7 @@ def chargeToPhoton(chargeOrCurrent,material="Si",thickness=100e-6,energy=10,e_ho
""" """
# calculate absortption # calculate absortption
A = 1-transmission(material=material,energy=energy) A = 1-transmission(material=material,energy=energy,thickness=thickness)
chargeOrCurrent = chargeOrCurrent/A chargeOrCurrent = chargeOrCurrent/A
e_hole_pair_energy = 3.6e-3 e_hole_pair_energy = 3.6e-3