diff --git a/config/devices.properties b/config/devices.properties index 3c5c73b..ee4512c 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -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||| diff --git a/plugins/importer.java b/plugins/importer.java index d49e709..01fbc67 100644 --- a/plugins/importer.java +++ b/plugins/importer.java @@ -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");