mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 22:40:02 +02:00
Merge branch 'developer' into m3clks
This commit is contained in:
commit
ecabc94ade
@ -8,31 +8,12 @@ from .mythen3 import Mythen3
|
||||
from .gotthard2 import Gotthard2
|
||||
from .gotthard import Gotthard
|
||||
from .moench import Moench
|
||||
# from .jungfrau_ctb import JungfrauCTB
|
||||
# from _slsdet import DetectorApi
|
||||
|
||||
import _slsdet
|
||||
|
||||
defs = _slsdet.slsDetectorDefs
|
||||
|
||||
from .enums import *
|
||||
# runStatus = _slsdet.slsDetectorDefs.runStatus
|
||||
# speedLevel = _slsdet.slsDetectorDefs.speedLevel
|
||||
# detectorType = _slsdet.slsDetectorDefs.detectorType
|
||||
# frameDiscardPolicy = _slsdet.slsDetectorDefs.frameDiscardPolicy
|
||||
# fileFormat = _slsdet.slsDetectorDefs.fileFormat
|
||||
# dimension = _slsdet.slsDetectorDefs.dimension
|
||||
# externalSignalFlag = _slsdet.slsDetectorDefs.externalSignalFlag
|
||||
# timingMode = _slsdet.slsDetectorDefs.timingMode
|
||||
# dacIndex = _slsdet.slsDetectorDefs.dacIndex
|
||||
# detectorSettings = _slsdet.slsDetectorDefs.detectorSettings
|
||||
# clockIndex = _slsdet.slsDetectorDefs.clockIndex
|
||||
# readoutMode = _slsdet.slsDetectorDefs.readoutMode
|
||||
# masterFlags = _slsdet.slsDetectorDefs.masterFlags
|
||||
# frameModeType = _slsdet.slsDetectorDefs.frameModeType
|
||||
# detectorModeType = _slsdet.slsDetectorDefs.detectorModeType
|
||||
# burstMode = _slsdet.slsDetectorDefs.burstMode
|
||||
# timingSourceType = _slsdet.slsDetectorDefs.timingSourceType
|
||||
|
||||
|
||||
IpAddr = _slsdet.IpAddr
|
||||
|
@ -13,7 +13,5 @@ detectorSettings = _slsdet.slsDetectorDefs.detectorSettings
|
||||
clockIndex = _slsdet.slsDetectorDefs.clockIndex
|
||||
readoutMode = _slsdet.slsDetectorDefs.readoutMode
|
||||
masterFlags = _slsdet.slsDetectorDefs.masterFlags
|
||||
frameModeType = _slsdet.slsDetectorDefs.frameModeType
|
||||
detectorModeType = _slsdet.slsDetectorDefs.detectorModeType
|
||||
burstMode = _slsdet.slsDetectorDefs.burstMode
|
||||
timingSourceType = _slsdet.slsDetectorDefs.timingSourceType
|
Loading…
x
Reference in New Issue
Block a user