Skip to content
Snippets Groups Projects
Commit ee5e73a3 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

added missing k scan parameters (SCAN-986)

parent 48616c2d
No related branches found
No related tags found
No related merge requests found
...@@ -1055,6 +1055,10 @@ public class ConfigImpl<T extends IDimension> implements IConfig<T>, IObjectImpl ...@@ -1055,6 +1055,10 @@ public class ConfigImpl<T extends IDimension> implements IConfig<T>, IObjectImpl
ITrajectory trajectory = null; ITrajectory trajectory = null;
IActuator actuator = null; IActuator actuator = null;
// These 2 values are not written in nexus file by scanserver: add them (SCAN-986).
scanInfoList.add("actuators_delay:" + getActuatorsDelay());
scanInfoList.add("timebases_delay:" + getTimebasesDelay());
for (IDimension dimension : dimensionList) { for (IDimension dimension : dimensionList) {
// Get the actuator List // Get the actuator List
actuatorList = dimension.getActuatorsList(); actuatorList = dimension.getActuatorsList();
...@@ -1091,17 +1095,19 @@ public class ConfigImpl<T extends IDimension> implements IConfig<T>, IObjectImpl ...@@ -1091,17 +1095,19 @@ public class ConfigImpl<T extends IDimension> implements IConfig<T>, IObjectImpl
scanInfoList.add(actuatorInfo + "emin:" + ktraj.getEMin()); scanInfoList.add(actuatorInfo + "emin:" + ktraj.getEMin());
scanInfoList scanInfoList
.add(actuatorInfo + "pre_edge_delta:" + ktraj.getEDeltaPreEdge()); .add(actuatorInfo + "pre_edge_delta:" + ktraj.getEDeltaPreEdge());
scanInfoList.add(actuatorInfo + "pre_edge_time:" + ktraj.getTimePreEdge());
scanInfoList.add(actuatorInfo + "e0:" + ktraj.getE0()); scanInfoList.add(actuatorInfo + "e0:" + ktraj.getE0());
scanInfoList.add(actuatorInfo + "e1:" + ktraj.getE1()); scanInfoList.add(actuatorInfo + "e1:" + ktraj.getE1());
scanInfoList.add(actuatorInfo + "e2:" + ktraj.getE2()); scanInfoList.add(actuatorInfo + "e2:" + ktraj.getE2());
scanInfoList.add(actuatorInfo + "edge_delta:" + ktraj.getEDeltaEdge()); scanInfoList.add(actuatorInfo + "edge_delta:" + ktraj.getEDeltaEdge());
if (ktraj.getM() > 0) { scanInfoList.add(actuatorInfo + "edge_time:" + ktraj.getTimeEdge());
scanInfoList.add(actuatorInfo + "m:" + ktraj.getM()); scanInfoList.add(actuatorInfo + "m:" + ktraj.getM());
}
scanInfoList.add(actuatorInfo + "kmin:" + ktraj.getKMin()); scanInfoList.add(actuatorInfo + "kmin:" + ktraj.getKMin());
scanInfoList.add(actuatorInfo + "kmax:" + ktraj.getKMax()); scanInfoList.add(actuatorInfo + "kmax:" + ktraj.getKMax());
scanInfoList.add(actuatorInfo + "kdelta:" + ktraj.getKDelta()); scanInfoList.add(actuatorInfo + "kdelta:" + ktraj.getKDelta());
scanInfoList.add(actuatorInfo + "deadtime:" + ktraj.getDeadTime()); scanInfoList.add(actuatorInfo + "deadtime:" + ktraj.getDeadTime());
scanInfoList.add(actuatorInfo + "tmin:" + ktraj.getTimePostEdge());
scanInfoList.add(actuatorInfo + "n:" + ktraj.getN());
} else { } else {
if (rangeIndex == 1) { if (rangeIndex == 1) {
if (trajectory instanceof ITrajectoryHCS) { if (trajectory instanceof ITrajectoryHCS) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment