Merge branch 'jmcchesn-main-patch-45002' into 'main'

updated imports in instruments.xrays

See merge request 29id/IEXcode!7

iexcode/instruments/xrays.py

@@ -9,7 +9,8 @@ from time import sleep
 from epics import caget,caput
 
 import iexcode.instruments.cfg as iex
-from iexcode.instruments.SRS_current_amplifiers import ca_average, ca_detector_list
+from iexcode.instruments.SRS_current_amplifiers import *
+from iexcode.instruments.Keithlys import *
 from iexcode.instruments.diagnostics import *
 from iexcode.instruments.FMB_mirrors import FMB_mirror_get
 from iexcode.instruments.IEX_VPU import *