slic/furka
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.psi.ch/slic/furka

Browse Source
This commit is contained in:
gac-furka
2022-07-26 15:10:01 +02:00
parent 10308b56f8 481b9d6b64
commit b037315ac8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
furka.py
View File

@@ -5,13 +5,13 @@ from slic.core.acquisition import PVAcquisition
#from slic.core.acquisition import FakeAcquisition
from slic.core.adjustable import PVAdjustable, DummyAdjustable
from slic.core.condition import PVCondition
from slic.core.device import SimpleDevice
from slic.core.scanner import Scanner
from slic.devices.general.delay_stage import DelayStage
from slic.devices.general.motor import Motor
from slic.devices.general.smaract import SmarActAxis
from slic.gui import GUI
from slic.utils import devices
from slic.devices.simpledevice import SimpleDevice
from slic.utils import as_shortcut, Marker
from undulator import Undulators