diff --git a/config/devices.properties b/config/devices.properties index c1ab6a9..b297c0b 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,4 +1,4 @@ -scienta=Scienta|X09LA-SCIENTA false|||true +scienta=Scienta|X09LA-SCIENTA true|||true current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 6|Read||true keithley10=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI10:READOUT|Read||true keithley11=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI11:READOUT|Read||true diff --git a/config/variables.properties b/config/variables.properties index 83a3e3d..43bf783 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Jan 27 11:28:54 CET 2022 -LastRunDate=220127 -DaySequentialNumber=1 -FileSequentialNumber=180 +#Wed Mar 02 15:34:58 CET 2022 +LastRunDate=220302 +DaySequentialNumber=6 +FileSequentialNumber=187 diff --git a/extensions/Scienta.jar b/extensions/Scienta.jar index c92db18..7cf33ec 100644 Binary files a/extensions/Scienta.jar and b/extensions/Scienta.jar differ diff --git a/script/scans/test/test.json b/script/scans/test/test.json index 6b5465c..fb01e9d 100644 --- a/script/scans/test/test.json +++ b/script/scans/test/test.json @@ -1,16 +1,30 @@ { "PASSES" : 1, - "STOP" : [ ], + "STOP" : [ 1.0 ], "DIAGS" : [ "phi", "theta", "tilt", "x", "y", "z" ], - "PRE_ACTIONS" : { }, + "PRE_ACTIONS" : { + "id_mode" : "OFF", + "grating" : "G1 300", + "scienta.passEnergyDev" : "20", + "scienta.acquisitionModeDev" : "Fixed", + "scienta.energyModeDev" : "Kinetic", + "scienta.detectorModeDev" : "ADC", + "scienta.lowEnergy" : 14.0, + "scienta.centerEnergy" : 14.5, + "scienta.highEnergy" : 15.0, + "scienta.energyStepSize" : 0.005, + "scienta.centerThetaX" : 0.0, + "scienta.slices" : 601, + "scienta.channels" : 801 + }, "COMPRESSION" : true, "SENSORS" : [ "scienta.dataMatrix" ], "ZIGZAG" : false, "SETTLING_TIME" : 0.0, "MONITORS" : [ "current" ], - "START" : [ ], - "RANGE" : [ null, null, null, null ], - "POSITIONERS" : [ ], - "STEPS" : [ ], - "SNAPS" : [ "acmi", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ] + "START" : [ 0.0 ], + "RANGE" : [ 900, 100, 800, 200 ], + "POSITIONERS" : [ "tilt" ], + "STEPS" : [ 10 ], + "SNAPS" : [ "acmi", "cff", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "pgm_cff", "photon_energy", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ] } \ No newline at end of file diff --git a/script/templates/SIStem.py b/script/templates/SIStem.py index e69b268..55a50d1 100644 --- a/script/templates/SIStem.py +++ b/script/templates/SIStem.py @@ -1,6 +1,5 @@ from collections import OrderedDict -time.sleep(2.0) -1/0 + #Debugging if get_exec_pars().args is None: PRE_ACTIONS = {z:0.1} diff --git a/script/test/TestLensMode.py b/script/test/TestLensMode.py new file mode 100644 index 0000000..46a858a --- /dev/null +++ b/script/test/TestLensMode.py @@ -0,0 +1,24 @@ +import ch.psi.utils.swing.SwingUtils as SwingUtils +import ch.psi.pshell.swing.DiscretePositionerPanel as DiscretePositionerPanel +import ch.psi.pshell.swing.DiscretePositionerSelector as DiscretePositionerSelector +import ch.psi.pshell.swing.RegisterPanel as RegisterPanel + +setp = scienta.getChannelCtrl()+":LENS_MODE" +rbck = scienta.getChannelCtrl()+":LENS_MODE_RBV" + +dp = DiscretePositioner("lens_mode", setp, rbck) +dp.monitored=True +add_device(dp, True) + + +pn=DiscretePositionerSelector() +pn.setDevice(dp) +SwingUtils.showDialog(App.getInstance().mainFrame, dp.name, None, pn) + +show_panel(dp) + +reg=scienta.getEnergyStepSize() +rp=RegisterPanel() +rp.setDevice(reg) +SwingUtils.showDialog(App.getInstance().mainFrame, reg.name, None, rp) +