pshell_config/x07ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x07maop
2016-02-11 16:56:32 +01:00
parent d1f3546b98
commit 0cf7bd4b86
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/importer.java
View File

@@ -274,8 +274,8 @@ public class importer implements Plugin {
} else {
String start = "init_field=" + tokens[4] + ", ";
String end = "final_field=" + tokens[5] + ", ";
String ramp = "ramp_speed=" + tokens[6] + ", ";
sb.append(ident).append("hyst_step(").append(forward).append(field).append(start).append(end).append(ramp).append(energies).append(")\n");
String step = "step=" + tokens[6] + ", ";
sb.append(ident).append("hyst_step(").append(forward).append(field).append(start).append(end).append(step).append(energies).append(")\n");
}
break;
default:

15
script/local.py
View File

@@ -285,19 +285,20 @@ def hyst_cont(field, init_field, final_field, ramp_speed, energies):
def hyst_cont_mult(field, ranges, energies):
run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "MODE":None, "OFFSET":None})
def hyst_step(forward, field, init_field, final_field, ramp_speed, energies):
pass
def hyst_step(forward, field, init_field, final_field, step, energies):
run("HistScanMult",{"FIELD":field, "RANGES":[(init_field, final_field, step),], "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None})
def hyst_step_mult(forward, ranges, ramp_speed, energies):
pass
run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None})
def scan_e(start, end, step):
setpoint = Channel (energy, 'd')
readback = Channel (keithleys[keithley][2], 'd')
lscan(setpoint, readback, float(start), float(end), float(step), latency = 0.1)
setpoint = Channel (energy.channelName, 'd') #Not using energy device to have a blocking write
wait_beam()
lscan(setpoint, energy_readback, float(start), float(end), float(step))
def scan_e(ranges):
pass
setpoint = Channel (energy.channelName, 'd')
rscan(setpoint, energy_readback, ranges)
def scan_v(keithley,start, end, step):
setpoint = Channel (keithleys[keithley][0], 'd')