detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

temperature reading for eiger

Browse Source
This commit is contained in:
Erik Frojdh 2020-08-20 11:46:35 +02:00
parent 9b26f5a6c8
commit a7cc2b38d8
7 changed files with 114 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/CMakeLists.txt
View File

@ -35,6 +35,7 @@ set( PYTHON_FILES
jungfrau.py jungfrau.py
mythen3.py mythen3.py
registers.py registers.py
temperature.py
lookup.py lookup.py
utils.py utils.py

8
python/examples/threshold_scan.py Normal file
View File

@ -0,0 +1,8 @@
from slsdet import Eiger
d = Eiger()
threshold = range(0, 2000, 200)
for th in threshold:
print(f'{th=}')
d.vthreshold = th
d.acquire()

2
python/scripts/basic.py
View File

@ -8,7 +8,7 @@ from slsdet import dacIndex, readoutMode
from slsdet.lookup import view, find from slsdet.lookup import view, find
d = Detector() d = Detector()
# e = Eiger() e = Eiger()
c = Ctb() c = Ctb()
# j = Jungfrau() # j = Jungfrau()
# m = Mythen3() # m = Mythen3()

30
python/slsdet/adcs.py
View File

@ -1,23 +1,33 @@
from functools import partial from functools import partial
class Adc: class Adc:
def __init__(self, name, detector): def __init__(self, name, enum, detector):
self.name = name self.name = name
self.enum = enum
self._detector = detector self._detector = detector
self.get_nmod = self._detector._api.getNumberOfDetectors self.get_nmod = self._detector.size
# Bind functions to get and set the dac # Bind functions to get and set the dac
self.get = partial(self._detector._api.getAdc, self.name) self.get = partial(self._detector.getAdc, self.enum)
def __getitem__(self, key): def __getitem__(self, key):
"""
Get dacs either by slice, key or list
"""
if key == slice(None, None, None): if key == slice(None, None, None):
return [self.get(i) / 1000 for i in range(self.get_nmod())] return self.get()
elif isinstance(key, Iterable): elif isinstance(key, Iterable):
return [self.get(k) / 1000 for k in key] return self.get(list(key))
else: else:
return self.get(key) / 1000 return self.get([key])[0] #No list for single value
# def __getitem__(self, key):
# """
# Get dacs either by slice, key or list
# """
# if key == slice(None, None, None):
# return [self.get(i) / 1000 for i in range(self.get_nmod())]
# elif isinstance(key, Iterable):
# return [self.get(k) / 1000 for k in key]
# else:
# return self.get(key) / 1000
def __repr__(self): def __repr__(self):
"""String representation for a single adc in all modules""" """String representation for a single adc in all modules"""

3
python/slsdet/dacs.py
View File

@ -34,8 +34,7 @@ class Dac(DetectorProperty):
dacstr = ''.join([f'{item:5d}' for item in self.get()]) dacstr = ''.join([f'{item:5d}' for item in self.get()])
return f'{self.__name__:10s}:{dacstr}' return f'{self.__name__:10s}:{dacstr}'
# a = Dac('vrf', dacIndex.VRF, 0, 4000, 2500, d )
# @freeze
class DetectorDacs: class DetectorDacs:
_dacs = [] _dacs = []
_dacnames = [_d[0] for _d in _dacs] _dacnames = [_d[0] for _d in _dacs]

247
python/slsdet/eiger.py
View File

@ -9,7 +9,7 @@ Created on Wed Dec 6 11:51:18 2017
from .detector import Detector from .detector import Detector
# from .adcs import Adc, DetectorAdcs from .temperature import Temperature, DetectorTemperature
from .dacs import DetectorDacs from .dacs import DetectorDacs
import _slsdet import _slsdet
dacIndex = _slsdet.slsDetectorDefs.dacIndex dacIndex = _slsdet.slsDetectorDefs.dacIndex
@ -79,58 +79,6 @@ class EigerDacs(DetectorDacs):
('iodelay', dacIndex.IO_DELAY,0, 4000, 660)] ('iodelay', dacIndex.IO_DELAY,0, 4000, 660)]
_dacnames = [_d[0] for _d in _dacs] _dacnames = [_d[0] for _d in _dacs]
# # noinspection PyProtectedMember
# class DetectorDelays:
# _delaynames = ['frame', 'left', 'right']
# def __init__(self, detector):
# # We need to at least initially know which detector we are connected to
# self._detector = detector
# setattr(self, '_frame', DetectorProperty(detector._api.getDelayFrame,
# detector._api.setDelayFrame,
# detector._api.getNumberOfDetectors,
# 'frame'))
# setattr(self, '_left', DetectorProperty(detector._api.getDelayLeft,
# detector._api.setDelayLeft,
# detector._api.getNumberOfDetectors,
# 'left'))
# setattr(self, '_right', DetectorProperty(detector._api.getDelayRight,
# detector._api.setDelayRight,
# detector._api.getNumberOfDetectors,
# 'right'))
# # Index to support iteration
# self._current = 0
# def __getattr__(self, name):
# return self.__getattribute__('_' + name)
# def __setattr__(self, name, value):
# if name in self._delaynames:
# return self.__getattribute__('_' + name).__setitem__(slice(None, None, None), value)
# else:
# super().__setattr__(name, value)
# def __next__(self):
# if self._current >= len(self._delaynames):
# self._current = 0
# raise StopIteration
# else:
# self._current += 1
# return self.__getattr__(self._delaynames[self._current-1])
# def __iter__(self):
# return self
# def __repr__(self):
# hn = self._detector.hostname
# r_str = ['Transmission delay [ns]\n'
# '{:11s}{:>8s}{:>8s}{:>8s}'.format('', 'left', 'right', 'frame')]
# for i in range(self._detector.n_modules):
# r_str.append('{:2d}:{:8s}{:>8d}{:>8d}{:>8d}'.format(i, hn[i], self.left[i], self.right[i], self.frame[i]))
# return '\n'.join(r_str)
from .detector import freeze from .detector import freeze
@ -152,76 +100,18 @@ class Eiger(Detector):
self._dacs = EigerDacs(self) self._dacs = EigerDacs(self)
self._vcmp = EigerVcmp(self) self._vcmp = EigerVcmp(self)
# self._active = DetectorProperty(self.getActive, # Eiger specific adcs
# self.setActive, self._temp = DetectorTemperature()
# self.size, self._temp.fpga = Temperature('temp_fpga', dacIndex.TEMPERATURE_FPGA, self)
# 'active') self._temp.fpgaext = Temperature('temp_fpgaext', dacIndex.TEMPERATURE_FPGAEXT, self)
self._temp.t10ge = Temperature('temp_10ge', dacIndex.TEMPERATURE_10GE, self)
self._temp.dcdc = Temperature('temp_dcdc', dacIndex.TEMPERATURE_DCDC, self)
self._temp.sodl = Temperature('temp_sodl', dacIndex.TEMPERATURE_SODL, self)
self._temp.sodr = Temperature('temp_sodl', dacIndex.TEMPERATURE_SODR, self)
self._temp.temp_fpgafl = Temperature('temp_fpgafl', dacIndex.TEMPERATURE_FPGA2, self)
self._temp.temp_fpgafr = Temperature('temp_fpgafr', dacIndex.TEMPERATURE_FPGA3, self)
# self._trimbit_limits = namedtuple('trimbit_limits', ['min', 'max'])(0, 63)
# self._delay = DetectorDelays(self)
# # Eiger specific adcs
# self._temp = DetectorAdcs()
# self._temp.fpga = Adc('temp_fpga', self)
# self._temp.fpgaext = Adc('temp_fpgaext', self)
# self._temp.t10ge = Adc('temp_10ge', self)
# self._temp.dcdc = Adc('temp_dcdc', self)
# self._temp.sodl = Adc('temp_sodl', self)
# self._temp.sodr = Adc('temp_sodr', self)
# self._temp.fpgafl = Adc('temp_fpgafl', self)
# self._temp.fpgafr = Adc('temp_fpgafr', self)
# @property
# def active(self):
# """
# Is the detector active? Can be used to enable or disable a detector
# module
# Examples
# ----------
# ::
# d.active
# >> active: [True, True]
# d.active[1] = False
# >> active: [True, False]
# """
# return self._active
# @active.setter
# def active(self, value):
# self._active[:] = value
# @property
# def measured_period(self):
# return self._api.getMeasuredPeriod()
# @property
# def measured_subperiod(self):
# return self._api.getMeasuredSubPeriod()
# @property
# def add_gappixels(self):
# """Enable or disable the (virual) pixels between ASICs
# Examples
# ----------
# ::
# d.add_gappixels = True
# d.add_gappixels
# >> True
# """
# return self._api.getGapPixels()
# @add_gappixels.setter
# def add_gappixels(self, value):
# self._api.setGapPixels(value)
@property @property
def dacs(self): def dacs(self):
@ -284,68 +174,6 @@ class Eiger(Detector):
""" """
return self._dacs return self._dacs
# @property
# def tx_delay(self):
# """
# Transmission delay of the modules to allow running the detector
# in a network not supporting the full speed of the detector.
# ::
# d.tx_delay
# >>
# Transmission delay [ns]
# left right frame
# 0:beb048 0 15000 0
# 1:beb049 100 190000 100
# d.tx_delay.left = [2000,5000]
# """
# return self._delay
# def pulse_all_pixels(self, n):
# """
# Pulse each pixel of the chip **n** times using the analog test pulses.
# The pulse height is set using d.dacs.vcall with 4000 being 0 and 0 being
# the highest pulse.
# ::
# #Pulse all pixels ten times
# d.pulse_all_pixels(10)
# #Avoid resetting before acq
# d.eiger_matrix_reset = False
# d.acq() #take frame
# #Restore normal behaviour
# d.eiger_matrix_reset = True
# """
# self._api.pulseAllPixels(n)
# def pulse_diagonal(self, n):
# """
# Pulse pixels in super colums in a diagonal fashion. Used for calibration
# of vcall. Saves time compared to pulsing all pixels.
# """
# self._api.pulseDiagonal(n)
# def pulse_chip(self, n):
# """
# Advance the counter by toggling enable. Gives 2*n+2 int the counter
# """
# n = int(n)
# if n >= -1:
# self._api.pulseChip(n)
# else:
# raise ValueError('n must be equal or larger than -1')
@property @property
def vcmp(self): def vcmp(self):
@ -437,40 +265,33 @@ class Eiger(Detector):
# else: # else:
# self._api.setReceiverStreamingPort(port, -1) # self._api.setReceiverStreamingPort(port, -1)
# @property @property
# def temp(self): def temp(self):
# """ """
# An instance of DetectorAdcs used to read the temperature An instance of DetectorAdcs used to read the temperature
# of different components of different components
# Examples Examples
# ----------- -----------
# :: ::
# detector.temp detector.temp
# >> >>
# temp_fpga : 36.90°C, 45.60°C temp_fpga : 36.90°C, 45.60°C
# temp_fpgaext : 31.50°C, 32.50°C temp_fpgaext : 31.50°C, 32.50°C
# temp_10ge : 0.00°C, 0.00°C temp_10ge : 0.00°C, 0.00°C
# temp_dcdc : 36.00°C, 36.00°C temp_dcdc : 36.00°C, 36.00°C
# temp_sodl : 33.00°C, 34.50°C temp_sodl : 33.00°C, 34.50°C
# temp_sodr : 33.50°C, 34.00°C temp_sodr : 33.50°C, 34.00°C
# temp_fpgafl : 33.81°C, 30.93°C temp_fpgafl : 33.81°C, 30.93°C
# temp_fpgafr : 27.88°C, 29.15°C temp_fpgafr : 27.88°C, 29.15°C
# a = detector.temp.fpga[:] a = detector.temp.fpga[:]
# a a
# >> [36.568, 45.542] >> [36.568, 45.542]
# """ """
# return self._temp return self._temp
# def set_delays(self, delta):
# self.tx_delay.left = [delta*(i*2) for i in range(self.n_modules)]
# self.tx_delay.right = [delta*(i*2+1) for i in range(self.n_modules)]

49
python/slsdet/temperature.py Normal file
View File

@ -0,0 +1,49 @@
from functools import partial
from collections.abc import Iterable
class Temperature:
def __init__(self, name, enum, detector):
self.name = name
self.enum = enum
self._detector = detector
self.get_nmod = self._detector.size
# Bind functions to get and set the dac
self.get = partial(self._detector.getTemperature, self.enum)
def __getitem__(self, key):
if key == slice(None, None, None):
return self.get()
elif isinstance(key, Iterable):
return self.get(list(key))
else:
return self.get([key])[0] # No list for single value
def __repr__(self):
"""String representation for a single temperature in all modules"""
degree_sign = u"\N{DEGREE SIGN}"
# r_str = ["{:14s}: ".format(self.name)]
# r_str += [
# "{:6.2f}{:s}C, ".format(self.get(i) / 1000, degree_sign)
# for i in range(self.get_nmod())
# ]
tempstr = ''.join([f'{item:5d}{degree_sign}C' for item in self.get()])
return f'{self.name:15s}:{tempstr}'
# return "".join(r_str).strip(", ")
class DetectorTemperature:
"""
Interface to temperatures on the readout board
"""
def __iter__(self):
for attr, value in self.__dict__.items():
yield value
def __repr__(self):
"""String representation of all temps all mods"""
r_str = '\n'.join([repr(temp) for temp in self])
return r_str
# dacstr = ''.join([f'{item:5d}' for item in self.get()])
# return f'{self.__name__:10s}:{dacstr}'
# return "\n".join([str(t) for t in self])