started cleaning up devices, added automatic device list

This commit is contained in:
2020-02-27 21:38:28 +00:00
parent fedb77869c
commit f6ace9608e
2 changed files with 3 additions and 5 deletions

View File

@ -6,6 +6,8 @@ from slic.scans import Scanner
from slic.utils import Channels, Config, Elog, Screenshot from slic.utils import Channels, Config, Elog, Screenshot
from slic.checkers import PVChecker from slic.checkers import PVChecker
from slic.utils import devices
from devices import * from devices import *
from adhoc import * from adhoc import *

View File

@ -64,11 +64,7 @@ primeCryTrans = sd.endstations.alvra_prime.VonHamosBragg(
description="Prime von Hamos X-trans (Bragg)" description="Prime von Hamos X-trans (Bragg)"
) )
laser = sd.loptics.alvra_experiment.Laser_Exp( laser = sd.loptics.alvra_experiment.LaserExp()
"SLAAR11-LMOT",
z_undulator=122,
description="Experiment laser hardware"
)
laserShutter = sd.loptics.alvra_laser_shutter.laser_shutter( laserShutter = sd.loptics.alvra_laser_shutter.laser_shutter(
"SLAAR11-LDIO-LAS6891", "SLAAR11-LDIO-LAS6891",