mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 13:27:14 +02:00
merge conflict
This commit is contained in:
@ -843,9 +843,7 @@ class Detector(CppDetectorApi):
|
|||||||
>>> d.getPeriod()
|
>>> d.getPeriod()
|
||||||
[datetime.timedelta(seconds=181, microseconds=230000)]
|
[datetime.timedelta(seconds=181, microseconds=230000)]
|
||||||
"""
|
"""
|
||||||
|
return reduce_time(self.getRateCorrection())
|
||||||
"""
|
|
||||||
return element_if_equal(self.getRateCorrection())
|
|
||||||
|
|
||||||
@ratecorr.setter
|
@ratecorr.setter
|
||||||
def ratecorr(self, tau):
|
def ratecorr(self, tau):
|
||||||
|
Reference in New Issue
Block a user