mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-04-22 00:24:37 +02:00
fix pyctbgui powerindex (#1433)
Build and Deploy on local RHEL9 / build (push) Successful in 2m4s
Build on RHEL9 docker image / build (push) Successful in 3m32s
Build on RHEL8 docker image / build (push) Successful in 4m50s
Build and Deploy on local RHEL8 / build (push) Successful in 4m50s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m6s
Build and Deploy on local RHEL9 / build (push) Successful in 2m4s
Build on RHEL9 docker image / build (push) Successful in 3m32s
Build on RHEL8 docker image / build (push) Successful in 4m50s
Build and Deploy on local RHEL8 / build (push) Successful in 4m50s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m6s
* fix pyctbgui powerindex * detangled power enable and power dac values * displaybox for vchip --------- Co-authored-by: Martin Mueller <martin.mueller@psi.ch> Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
This commit is contained in:
@@ -10,6 +10,7 @@ runStatus = slsDetectorDefs.runStatus
|
||||
timingMode = slsDetectorDefs.timingMode
|
||||
speedLevel = slsDetectorDefs.speedLevel
|
||||
dacIndex = slsDetectorDefs.dacIndex
|
||||
powerIndex = slsDetectorDefs.powerIndex
|
||||
detectorType = slsDetectorDefs.detectorType
|
||||
streamingInterface = slsDetectorDefs.streamingInterface
|
||||
|
||||
@@ -4107,7 +4108,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: Not implemented
|
||||
"""
|
||||
return self.getMeasuredCurrent(dacIndex.I_POWER_A)
|
||||
return self.getMeasuredCurrent(powerIndex.I_POWER_A)
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -4116,7 +4117,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: Not implemented
|
||||
"""
|
||||
return self.getMeasuredCurrent(dacIndex.I_POWER_B)
|
||||
return self.getMeasuredCurrent(powerIndex.I_POWER_B)
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -4125,7 +4126,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: Not implemented
|
||||
"""
|
||||
return self.getMeasuredCurrent(dacIndex.I_POWER_C)
|
||||
return self.getMeasuredCurrent(powerIndex.I_POWER_C)
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -4134,7 +4135,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: Not implemented
|
||||
"""
|
||||
return self.getMeasuredCurrent(dacIndex.I_POWER_D)
|
||||
return self.getMeasuredCurrent(powerIndex.I_POWER_D)
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -4143,7 +4144,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: Not implemented
|
||||
"""
|
||||
return self.getMeasuredCurrent(dacIndex.I_POWER_IO)
|
||||
return self.getMeasuredCurrent(powerIndex.I_POWER_IO)
|
||||
|
||||
@property
|
||||
def clkphase(self):
|
||||
|
||||
Reference in New Issue
Block a user