Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dia address change

Browse Source
This commit is contained in:
mankowsky_r
2019-02-14 23:13:15 +01:00
parent 802fab812b
commit 91a44729ca
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eco/acquisition/scan.py
-1
View File
@@ -1,4 +1,3 @@
import pyscan
import os
import json
import numpy as np
eco/aliases/namespaces/bernina.json
+1 -1
View File
File diff suppressed because one or more lines are too long
eco/bernina/config.py
+3 -1
View File
@@ -322,7 +322,7 @@ components = [
"type": "eco.acquisition.dia:DIAClient",
"kwargs": {
"instrument": "bernina",
"api_address": "http://sf-daq-swissmx:10000",
"api_address": "http://sf-daq-bernina:10000",
"pgroup": config.pgroup,
'pedestal_directory':config.jf_pedestal_directory,
"gain_path": config.jf_gain_path,
@@ -360,6 +360,8 @@ components = [
]
#### OLD STUFF TO BE TRANSFERRED OR DELETED ####
components_old = {
"SARFE10-OPSH044": {
"alias": "ShutUnd",
eco/devices_general/detectors.py
+3 -3
View File
@@ -3,9 +3,9 @@ from epics import caget
from epics import PV
from ..eco_epics.utilities_epics import EnumWrapper
from cam_server import PipelineClient
from cam_server.utils import get_host_port_from_stream_address
from bsread import source, SUB
# from cam_server import PipelineClient
# from cam_server.utils import get_host_port_from_stream_address
# from bsread import source, SUB
import subprocess
import h5py
from time import sleep
eco/loptics/bernina_experiment.py
+24 -8
View File
@@ -31,27 +31,43 @@ class Laser_Exp:
self.alias = Alias(name)
# Waveplate and Delay stage
addMotorRecordToSelf(self, self.Id + "-M534:MOT", name="wp")
try:
addMotorRecordToSelf(self, Id=self.Id + "-M521:MOTOR_1", name="_eos_delay")
addMotorRecordToSelf(self, self.Id + "-M534:MOT", name="wp_bright_field")
addMotorRecordToSelf(self, self.Id + "-M533:MOT", name="wp")
except:
print('No wp found')
try:
addMotorRecordToSelf(self, Id=self.Id + "-M521:MOTOR_1", name="_spatialenc_df_delaystg")
addDelayStageToSelf(
self, stage=self.__dict__["_eos_delay"], name="eos_delay"
self, stage=self.__dict__["_spatialenc_df_delaystg"], name="spatialenc_df_delay"
)
except:
print("No eos delay stage")
pass
try:
addMotorRecordToSelf(
self, Id=self.Id + "-M522:MOTOR_1", name="_thz_delaystg"
self, Id=self.Id + "-M522:MOTOR_1", name="_spatialenc_bf_delaystg"
)
addDelayStageToSelf(
self, self.__dict__["_thz_delaystg"], name="spatialenc_delay"
self, self.__dict__["_spatialenc_bf_delaystg"], name="spatialenc_bf_delay"
)
# addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay")
except:
print("No thz delay stage")
pass
try:
addMotorRecordToSelf(
self, Id=self.Id + "-M553:MOT", name="_spatialenc_both_delaystg"
)
addDelayStageToSelf(
self, self.__dict__["_spatialenc_both_delaystg"], name="spatialenc_both_delay"
)
# addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay")
except:
print("No thz delay stage")
pass
# compressor
addMotorRecordToSelf(self, Id=self.Id + "-M532:MOT", name="compressor")
# self.compressor = MotorRecord(Id+'-M532:MOT')
@@ -82,7 +98,7 @@ class Laser_Exp:
# SmarAct ID
### Mirrors used in the experiment ###
try:
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB18", name="spatialenc_rot")
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB18", name="spatialenc_bf_rot")
# self._eos_rot = SmarActRecord(self.IdSA+'-ESB18')
# self.eos_rot = User_to_motor(self._eos_rot,180./35.7,0.)
except:
@@ -122,13 +138,13 @@ class Laser_Exp:
pass
try:
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB6", name="spatialenc_gon")
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB6", name="spatialenc_bf_gon")
# self.par_x = SmarActRecord(self.IdSA+'-ESB6')
except:
print("No Smaract ParX")
pass
try:
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB3", name="par_z")
addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB3", name="spatialenc_df_lens")
except:
print("No Smaract ParZ")
pass