tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

renamed SmarActRecord -> SmarActAxis

Browse Source
This commit is contained in:
augustin_s
2020-08-21 14:14:36 +02:00
parent eba5808a16
commit 124f2e2be5
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/devices/endstations/alvra_prime.py
+1 -1
View File
@@ -1,6 +1,6 @@
from epics import PV
from slic.devices.general.motor import Motor
from ..general.smaract import SmarActRecord
from ..general.smaract import SmarActAxis
class Huber:
slic/devices/endstations/unused/alvra_xtg.py
+1 -1
View File
@@ -1,4 +1,4 @@
from ..devices_general.smaract import SmarActRecord
from ..devices_general.smaract import SmarActAxis
from epics import PV
slic/devices/loptics/bernina_experiment.py
+8 -8
View File
@@ -2,7 +2,7 @@ from epics import PV
from slic.utils.eco_components.aliases import Alias
from slic.devices.general.motor import Motor
from ..general.smaract import SmarActRecord
from ..general.smaract import SmarActAxis
from ..general.delay_stage import DelayStage
from ..general.adjustable import AdjustableVirtual
@@ -17,7 +17,7 @@ def addMotorToSelf(self, Id=None, name=None):
self.alias.append(self.__dict__[name].alias)
def addSmarActRecordToSelf(self, Id=None, name=None):
def addSmarActAxisToSelf(self, Id=None, name=None):
self.__dict__[name] = SmarActAxis(Id, name=name)
self.alias.append(self.__dict__[name].alias)
@@ -157,9 +157,9 @@ class Laser_Exp:
# self.compressor = Motor(Id+'-M532:MOT')
# LAM delay stages
addSmarActRecordToSelf(self, Id="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addSmarActAxisToSelf(self, Id="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addDelayStageToSelf(self, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
# self._lam_delayStg_Smar = SmarActRecord('SLAAR21-LMTS-LAM11')
# self._lam_delayStg_Smar = SmarActAxis('SLAAR21-LMTS-LAM11')
# self.lam_delay_Smar = DelayStage(self._lam_delayStg_Smar)
addMotorToSelf(self, Id=self.Id + "-M548:MOT", name="_lam_delaystg")
@@ -188,7 +188,7 @@ class Laser_Exp:
for smar_name, smar_address in self.smar_config.items():
try:
addSmarActRecordToSelf(self, Id=(self.IdSA + smar_address), name=smar_name)
addSmarActAxisToSelf(self, Id=(self.IdSA + smar_address), name=smar_name)
except:
print("Loading %s SmarAct motor in bernina laser conifg failed") % (smar_name)
@@ -254,9 +254,9 @@ class Laser_Exp_old:
# self.compressor = Motor(Id+'-M532:MOT')
# LAM delay stages
addSmarActRecordToSelf(self, Id="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addSmarActAxisToSelf(self, Id="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addDelayStageToSelf(self, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
# self._lam_delayStg_Smar = SmarActRecord('SLAAR21-LMTS-LAM11')
# self._lam_delayStg_Smar = SmarActAxis('SLAAR21-LMTS-LAM11')
# self.lam_delay_Smar = DelayStage(self._lam_delayStg_Smar)
addMotorToSelf(self, Id=self.Id + "-M548:MOT", name="_lam_delaystg")
@@ -279,7 +279,7 @@ class Laser_Exp_old:
for smar_name, smar_address in self.smar_config.items():
try:
addSmarActRecordToSelf(self, Id=(self.IdSA + smar_address), name=smar_name)
addSmarActAxisToSelf(self, Id=(self.IdSA + smar_address), name=smar_name)
except:
print("Loading %s SmarAct motor in bernina laser conifg failed") % (smar_name)
slic/devices/timing/unused/palm.py
+1 -1
View File
@@ -1,7 +1,7 @@
from epics import PV
from slic.devices.general.motor import Motor
from ...general.smaract import SmarActRecord
from ...general.smaract import SmarActAxis
from ...general.delay_stage import DelayStage
slic/devices/timing/unused/psen.py
+1 -1
View File
@@ -1,7 +1,7 @@
from epics import PV
from slic.devices.general.motor import Motor
from ...general.smaract import SmarActRecord
from ...general.smaract import SmarActAxis
from ...general.delay_stage import DelayStage
slic/devices/xdiagnostics/timetools.py
+1 -1
View File
@@ -1,6 +1,6 @@
from slic.devices.general.motor import Motor
#from ..devices_general.smaract import SmarActRecord
#from ..devices_general.smaract import SmarActAxis
#from epics import PV
from ..general.delay_stage import DelayStage
slic/devices/xdiagnostics/unused/palm.py
+1 -1
View File
@@ -1,7 +1,7 @@
from epics import PV
from slic.devices.general.motor import Motor
from ...general.smaract import SmarActRecord
from ...general.smaract import SmarActAxis
from ...general.delay_stage import DelayStage
slic/devices/xdiagnostics/unused/psen.py
+1 -1
View File
@@ -1,7 +1,7 @@
from epics import PV
from slic.devices.general.motor import Motor
from ...general.smaract import SmarActRecord
from ...general.smaract import SmarActAxis
from ...general.delay_stage import DelayStage