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 14:40:47 +01:00
parent cd5ae8de14
commit 1d8fc84b33
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/devices.properties
View File

@@ -13,7 +13,8 @@ pol_offset=ch.psi.pshell.epics.ChannelDouble|X07MA-ID:ENERGY-OFFS|||
pol_angle=ch.psi.pshell.epics.ChannelDouble|X07MA-ID:ALPHA|||
pol_done=ch.psi.pshell.epics.ChannelString|X07MA-ID:DONE|Read||
#pol_done_pos=ch.psi.pshell.epics.BinaryPositioner|X07MA-ID:DONE|Read||
ramp_rate=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS2:SET:DMD:RAMPRATE:TPM|||
ramp_rate_x=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS2:SET:DMD:RAMPRATE:TPM|||
ramp_rate_z=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS1:SET:DMD:RAMPRATE:TPM|||
sample_hor=ch.psi.pshell.epics.Motor|X07MA-ES1-MAG:TRZ1|||
sample_vert=ch.psi.pshell.epics.Motor|X07MA-ES1-MAG:TRY1|||
sample_rot=ch.psi.pshell.epics.Motor|X07MA-ES1-MAG:ROY1|||

9
plugins/importer.java
View File

@@ -243,17 +243,18 @@ public class importer implements Plugin {
break;
case "hyst":
String ppe = "";
if (pars.containsKey("ppe")){
//TODO
scanCommand = scanCommand.substring(0, scanCommand.lastIndexOf("ppe")).trim();
ppe = ", ppe=" + pars.get("ppe");
//PPE not needed anymore
//ppe = ", ppe=" + pars.get("ppe");
}
String energies = "energies=[" + scanCommand.substring(scanCommand.lastIndexOf(" E ") + 3).trim().replace(" ", ", ") + "]" + ppe;
tokens = getTokens(scanCommand.substring(0, scanCommand.lastIndexOf(" E ")).trim());
String field;
switch (tokens[1]){
case "cont":
field = "field=" + tokens[2] + ", ";
field = "field='" + tokens[2] + "', ";
if (tokens.length == 4){
String file = tokens[3];
sb.append(ident).append("hyst_cont_mult(").append(field).append(getRanges(file)).append(", ").append(energies).append(")\n");
@@ -266,7 +267,7 @@ public class importer implements Plugin {
break;
case "step":
String forward = tokens[2].equals("for") ? "forward = True, ": "forward = False, ";
field = "field=" + tokens[3] + ", ";
field = "field='" + tokens[3] + "', ";
if (tokens.length == 5){
String file = tokens[4];
sb.append(ident).append("hyst_step_mult(").append(forward).append(field).append(getRanges(file)).append(", ").append(energies).append(")\n");