Skip to content
Snippets Groups Projects
Commit e0240d04 authored by jmcchesn's avatar jmcchesn
Browse files

kappa no circular imports

parent e221c9a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build/lib/iexcode/instruments/Kappa.py
+ 12
− 7
View file @ e0240d04
...@@ -4,7 +4,7 @@ from math import floor ...@@ -4,7 +4,7 @@ from math import floor
from epics import caget, caput,PV from epics import caget, caput,PV
from iexcode.instruments.IEX_endstations import * from iexcode.instruments.IEX_endstations import BL
from iexcode.instruments.staff import staff_detector_dictionary from iexcode.instruments.staff import staff_detector_dictionary
from iexcode.instruments.files_and_folders import check_run,make_user_folders,folder_mda from iexcode.instruments.files_and_folders import check_run,make_user_folders,folder_mda
...@@ -30,6 +30,9 @@ from iexcode.instruments.MPA import MPA ...@@ -30,6 +30,9 @@ from iexcode.instruments.MPA import MPA
from iexcode.instruments.spec_stuff import folders_spec from iexcode.instruments.spec_stuff import folders_spec
global Kappa_Motors
global tey, d3, d4, mesh, Kappa_scaler_pv, mpa
global tthdet
############################################################################# #############################################################################
def Kappa_init(set_folders=False,reset=False,**kwargs): def Kappa_init(set_folders=False,reset=False,**kwargs):
...@@ -55,11 +58,9 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -55,11 +58,9 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
Kappa_trigger_dictionary(),Kappa_scan_before_sequence(),Kappa_scan_after_sequence()) Kappa_trigger_dictionary(),Kappa_scan_before_sequence(),Kappa_scan_after_sequence())
#endstation #endstation
global BL
BL=Endstation('Kappa',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,Kappa_log_header,Kappa_log_entries) BL=Endstation('Kappa',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,Kappa_log_header,Kappa_log_entries)
#global detectors #global detectors
global tey, d3, d4, mesh, Kappa_scaler_pv, mpa
tey = SRS("29idMZ0:scaler1.S2", '29idd:A1') tey = SRS("29idMZ0:scaler1.S2", '29idd:A1')
d3 = SRS("29idMZ0:scaler1.S3", '29idd:A2') d3 = SRS("29idMZ0:scaler1.S3", '29idd:A2')
d4 = SRS("29idMZ0:scaler1.S4", '29idd:A3') d4 = SRS("29idMZ0:scaler1.S4", '29idd:A3')
...@@ -68,8 +69,7 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -68,8 +69,7 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
tth_pv = Kappa_motor_dictionary('tth')[3] tth_pv = Kappa_motor_dictionary('tth')[3]
mpa = MPA(tth_pv) mpa = MPA(tth_pv)
global tthdet tthdet = Kappa_Detector(Kappa_Motors)
tthdet = Kappa_Detector()
#setting folders #setting folders
if 'set_folders': if 'set_folders':
...@@ -84,7 +84,6 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -84,7 +84,6 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
Kappa_reset() Kappa_reset()
#motors #motors
global Kappa_Motors
physical_motors = ['x','y','z','tth','kth','kap','kphi'] physical_motors = ['x','y','z','tth','kth','kap','kphi']
psuedo_motors = ['th','chi','phi'] psuedo_motors = ['th','chi','phi']
Kappa_Motors = Motors('Kappa',Kappa_motor_dictionary(),physical_motors,psuedo_motors) Kappa_Motors = Motors('Kappa',Kappa_motor_dictionary(),physical_motors,psuedo_motors)
...@@ -606,7 +605,7 @@ def Kappa_tth_reset_zero(): ...@@ -606,7 +605,7 @@ def Kappa_tth_reset_zero():
def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detector=tey,**kwargs): def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,**kwargs):
""" """
Scans th2th with variable gain on SRS# (srs_num). Scans th2th with variable gain on SRS# (srs_num).
Gain is specified for a given th2th range by building tables as follow: Gain is specified for a given th2th range by building tables as follow:
...@@ -630,6 +629,7 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto ...@@ -630,6 +629,7 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto
gu_table = np.append(gu_table, unit_dict('pA')) gu_table = np.append(gu_table, unit_dict('pA'))
kwargs: kwargs:
detector (default tey)
scan_dim: 1 (default) scan_dim: 1 (default)
cts: integration time for scalers and mpa/mcp => 0.1 (default) cts: integration time for scalers and mpa/mcp => 0.1 (default)
execute: True/False to start the scan => True (default) execute: True/False to start the scan => True (default)
...@@ -639,6 +639,11 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto ...@@ -639,6 +639,11 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto
kwargs.setdefault('cts',0.1) kwargs.setdefault('cts',0.1)
kwargs.setdefault('execute',True) kwargs.setdefault('execute',True)
if 'detector' not in kwargs:
detector = tey
else:
detector = kwargs['detector']
kth_offset = Kappa_kth_offset_get() kth_offset = Kappa_kth_offset_get()
motor_dictionary = Kappa_motor_dictionary() motor_dictionary = Kappa_motor_dictionary()
......
build/lib/iexcode/instruments/Kappa_det.py
+ 1
− 2
View file @ e0240d04
from time import sleep from time import sleep
from epics import caget, caput from epics import caget, caput
from iexcode.instruments.Kappa import Kappa_Motors
############################################################################################################## ##############################################################################################################
...@@ -15,7 +14,7 @@ class Kappa_Detector: ...@@ -15,7 +14,7 @@ class Kappa_Detector:
class for Kappa detector class for Kappa detector
""" """
def __init__(self): def __init__(self,Kappa_Motors):
self.get() self.get()
def get(self): def get(self):
......
iexcode/instruments/Kappa.py
+ 12
− 7
View file @ e0240d04
...@@ -4,7 +4,7 @@ from math import floor ...@@ -4,7 +4,7 @@ from math import floor
from epics import caget, caput,PV from epics import caget, caput,PV
from iexcode.instruments.IEX_endstations import * from iexcode.instruments.IEX_endstations import BL
from iexcode.instruments.staff import staff_detector_dictionary from iexcode.instruments.staff import staff_detector_dictionary
from iexcode.instruments.files_and_folders import check_run,make_user_folders,folder_mda from iexcode.instruments.files_and_folders import check_run,make_user_folders,folder_mda
...@@ -30,6 +30,9 @@ from iexcode.instruments.MPA import MPA ...@@ -30,6 +30,9 @@ from iexcode.instruments.MPA import MPA
from iexcode.instruments.spec_stuff import folders_spec from iexcode.instruments.spec_stuff import folders_spec
global Kappa_Motors
global tey, d3, d4, mesh, Kappa_scaler_pv, mpa
global tthdet
############################################################################# #############################################################################
def Kappa_init(set_folders=False,reset=False,**kwargs): def Kappa_init(set_folders=False,reset=False,**kwargs):
...@@ -55,11 +58,9 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -55,11 +58,9 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
Kappa_trigger_dictionary(),Kappa_scan_before_sequence(),Kappa_scan_after_sequence()) Kappa_trigger_dictionary(),Kappa_scan_before_sequence(),Kappa_scan_after_sequence())
#endstation #endstation
global BL
BL=Endstation('Kappa',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,Kappa_log_header,Kappa_log_entries) BL=Endstation('Kappa',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,Kappa_log_header,Kappa_log_entries)
#global detectors #global detectors
global tey, d3, d4, mesh, Kappa_scaler_pv, mpa
tey = SRS("29idMZ0:scaler1.S2", '29idd:A1') tey = SRS("29idMZ0:scaler1.S2", '29idd:A1')
d3 = SRS("29idMZ0:scaler1.S3", '29idd:A2') d3 = SRS("29idMZ0:scaler1.S3", '29idd:A2')
d4 = SRS("29idMZ0:scaler1.S4", '29idd:A3') d4 = SRS("29idMZ0:scaler1.S4", '29idd:A3')
...@@ -68,8 +69,7 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -68,8 +69,7 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
tth_pv = Kappa_motor_dictionary('tth')[3] tth_pv = Kappa_motor_dictionary('tth')[3]
mpa = MPA(tth_pv) mpa = MPA(tth_pv)
global tthdet tthdet = Kappa_Detector(Kappa_Motors)
tthdet = Kappa_Detector()
#setting folders #setting folders
if 'set_folders': if 'set_folders':
...@@ -84,7 +84,6 @@ def Kappa_init(set_folders=False,reset=False,**kwargs): ...@@ -84,7 +84,6 @@ def Kappa_init(set_folders=False,reset=False,**kwargs):
Kappa_reset() Kappa_reset()
#motors #motors
global Kappa_Motors
physical_motors = ['x','y','z','tth','kth','kap','kphi'] physical_motors = ['x','y','z','tth','kth','kap','kphi']
psuedo_motors = ['th','chi','phi'] psuedo_motors = ['th','chi','phi']
Kappa_Motors = Motors('Kappa',Kappa_motor_dictionary(),physical_motors,psuedo_motors) Kappa_Motors = Motors('Kappa',Kappa_motor_dictionary(),physical_motors,psuedo_motors)
...@@ -606,7 +605,7 @@ def Kappa_tth_reset_zero(): ...@@ -606,7 +605,7 @@ def Kappa_tth_reset_zero():
def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detector=tey,**kwargs): def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,**kwargs):
""" """
Scans th2th with variable gain on SRS# (srs_num). Scans th2th with variable gain on SRS# (srs_num).
Gain is specified for a given th2th range by building tables as follow: Gain is specified for a given th2th range by building tables as follow:
...@@ -630,6 +629,7 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto ...@@ -630,6 +629,7 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto
gu_table = np.append(gu_table, unit_dict('pA')) gu_table = np.append(gu_table, unit_dict('pA'))
kwargs: kwargs:
detector (default tey)
scan_dim: 1 (default) scan_dim: 1 (default)
cts: integration time for scalers and mpa/mcp => 0.1 (default) cts: integration time for scalers and mpa/mcp => 0.1 (default)
execute: True/False to start the scan => True (default) execute: True/False to start the scan => True (default)
...@@ -639,6 +639,11 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto ...@@ -639,6 +639,11 @@ def Kappa_th2th_scan_sensitivity(th_table,gain_num_table,gain_unit_table,detecto
kwargs.setdefault('cts',0.1) kwargs.setdefault('cts',0.1)
kwargs.setdefault('execute',True) kwargs.setdefault('execute',True)
if 'detector' not in kwargs:
detector = tey
else:
detector = kwargs['detector']
kth_offset = Kappa_kth_offset_get() kth_offset = Kappa_kth_offset_get()
motor_dictionary = Kappa_motor_dictionary() motor_dictionary = Kappa_motor_dictionary()
......
iexcode/instruments/Kappa_det.py
+ 1
− 2
View file @ e0240d04
from time import sleep from time import sleep
from epics import caget, caput from epics import caget, caput
from iexcode.instruments.Kappa import Kappa_Motors
############################################################################################################## ##############################################################################################################
...@@ -15,7 +14,7 @@ class Kappa_Detector: ...@@ -15,7 +14,7 @@ class Kappa_Detector:
class for Kappa detector class for Kappa detector
""" """
def __init__(self): def __init__(self,Kappa_Motors):
self.get() self.get()
def get(self): def get(self):
......
iexcode/instruments/__pycache__/Kappa.cpython-37.pyc
+ 0
− 0
View file @ e0240d04
No preview for this file type
iexcode/instruments/__pycache__/Kappa_det.cpython-37.pyc
+ 0
− 0
View file @ e0240d04
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment