Commit 50a84c74 authored by Philipp Oleynik's avatar Philipp Oleynik
Browse files

Kludge added for Python 3.6 that does not understand numpy.int as index

parent 38fb1ca4
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RSettings" path="/usr/bin/R" />
<component name="RSettings">
<option name="interpreterPath" value="/usr/bin/R" />
</component>
</project>
\ No newline at end of file
......@@ -162,7 +162,7 @@ class Sixs:
if np.isscalar(adc11):
adc11 = int(saturate2048(adc11))
else:
adc11 = np.array(list(map(int, np.clip(adc11, 0, 2047))))
adc11 = (list(map(int, np.clip(adc11, 0, 2047))))
return self.loglut[adc11]
def birks_correction(self, energy): # Birks coefficient and parameter estimates taken from the calibration of RADMON
......@@ -286,7 +286,7 @@ class Sixs:
:return:
"""
if thlevel == 1:
channel = self.lut[63 - side6bit, core6bit]
channel = self.lut[list(map(int, 63 - side6bit)), list(map(int, core6bit))]
else:
channel = self.lut[63 - side6bit, core6bit]
return channel
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment