diff --git a/python/scripts/compare_with_commandline.py b/python/scripts/compare_with_commandline.py index 9f70004c4..2e6b78985 100644 --- a/python/scripts/compare_with_commandline.py +++ b/python/scripts/compare_with_commandline.py @@ -102,6 +102,10 @@ intentionally_missing = [ 'pulse', # use pulseChip pulsePixel pulsePixelNmove 'pulsechip', 'pulsenmove', + 'savepattern', #use savePattern() + 'resetfpga', #use resetFPGA() + 'rebootcontroller', #use rebootController() + 'firmwaretest', #use executeFirmwareTest ] pycmd += intentionally_missing diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index d5362bd98..7613d34be 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -182,6 +182,11 @@ class Detector(CppDetectorApi): """Receiver version in format [0xYYMMDD].""" return element_if_equal(self.getReceiverVersion()) + @property + @element + def rx_threads(self): + return self.getRxThreadIds() + @property def dr(self): """ @@ -344,6 +349,12 @@ class Detector(CppDetectorApi): def period(self, t): ut.set_time_using_dict(self.setPeriod, t) + + @property + @element + def periodl(self): + return self.getPeriodLeft() + @property @element def delay(self): @@ -1818,6 +1829,32 @@ class Detector(CppDetectorApi): def veto(self, value): self.setVeto(value) + @property + @element + def cdsgain(self): + return self.getCDSGain() + + @cdsgain.setter + def cdsgain(self, value): + ut.set_using_dict(self.setCDSGain, value) + + + @property + @element + def burstmode(self): + return self.getBurstMode() + + @burstmode.setter + def burstmode(self, value): + ut.set_using_dict(self.setBurstMode, value) + + @property + def burstperiod(self): + return ut.reduce_time(self.getBurstPeriod()) + + @burstperiod.setter + def burstperiod(self, value): + ut.set_time_using_dict(self.setBurstPeriod, value) @property def vetofile(self): @@ -1945,6 +1982,25 @@ class Detector(CppDetectorApi): <<>> """ + @property + @element + def adcenable(self): + return self.getADCEnableMask() + + @adcenable.setter + def adcenable(self, value): + ut.set_using_dict(self.setADCEnableMask, value) + + @property + @element + def adcenable10g(self): + return self.getTenGigaADCEnableMask() + + @adcenable10g.setter + def adcenable10g(self, value): + ut.set_using_dict(self.setTenGigaADCEnableMask, value) + + @property @element def samples(self):