updated with slic master branch

cristallina.py

@@ -13,12 +13,23 @@ import numpy as np
 # from tqdm import trange
 from epics import PV
 
+#MODULE_PATH = "/sf/cristallina/applications/slic/slic/slic/__init__.py"
+#MODULE_NAME = "slic"
+#import importlib
+#import sys
+#spec = importlib.util.spec_from_file_location(MODULE_NAME, MODULE_PATH)
+#module = importlib.util.module_from_spec(spec)
+#sys.modules[spec.name] = module 
+#spec.loader.exec_module(module)
+
+
 from slic.gui import GUI
 from slic.core.adjustable import Adjustable, PVAdjustable, DummyAdjustable
 from slic.core.acquisition import SFAcquisition, PVAcquisition
 from slic.core.condition import PVCondition
 from slic.core.scanner import Scanner
-from slic.devices.simpledevice import SimpleDevice
+from slic.core.device.simpledevice import SimpleDevice
+
 from slic.devices.general.motor import Motor
 from slic.utils import devices, Marker, as_shortcut
 from slic.utils import Channels, Config, Elog, Screenshot, PV
@@ -38,23 +49,21 @@ cool_motor = MyNewCoolThing("cool_motor")
 dummy = DummyAdjustable(units="au")
 
 ## Attenuator
-from slic.devices.xoptics.attenuator_aramis import AttenuatorAramis
+from slic.devices.xoptics.aramis_attenuator import Attenuator
 from knife_edge import KnifeEdge
 
 attenuator_ID = "SAROP31-OATA150"
-attenuator = AttenuatorAramis(
+attenuator = Attenuator(
     attenuator_ID, description="Attenuators with absolute encoders"
 )
 
-
 def test_attenuator():
-    tfundamental, tHG = attenuator.get_transmission(verbose=False)
+    tfundamental = attenuator.get_transmission()
     try:
         assert tfundamental > 0
     except TypeError:
         print("No transmission value reported from {attenuator.ID}")
 
-
 test_attenuator()
 
 
@@ -68,11 +77,11 @@ undulators = undulator.Undulators()
 from slic.devices.xoptics import slits
 
 # _old for Alvra codepath, recommended here
-slits_ADC = slits.SlitPosWidth_old("SAROP31-OAPU149", name="Apertures - ADC")
+# slits_ADC = slits.SlitPosWidth_old("SAROP31-OAPU149", name="Apertures - ADC")
 
 ## Smaract stage
-from smaract import smaract
-
+from smaract_device_def import smaract
+# from attocube_assignment import attocube
 
 ###########################################
 instrument = "cristallina"