Skip to content

Make number of steps in loop command predictable #3305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasemir merged 5 commits into from
Mar 4, 2025
Merged

Make number of steps in loop command predictable #3305

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30964db
make number of steps in loop command predictable
DenSinH Mar 3, 2025
6f10297
make sure alternating scans work with predictable steps
DenSinH Mar 3, 2025
6ac30cf
also do alternating in the simulation
DenSinH Mar 3, 2025
0e2df3a
add extra step for including bounds
DenSinH Mar 4, 2025
a9875c1
don't use functions with side effects and update getWorkUnits
DenSinH Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 16 additions & 27 deletions services/scan-server/src/main/java/org/csstudio/scan/server/command/LoopCommandImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public LoopCommandImpl(final LoopCommand command) throws Exception
@Override
public long getWorkUnits()
{
final long iterations = 1 + Math.round(Math.abs((command.getEnd() - command.getStart()) / command.getStepSize()));
final long iterations = getNumSteps();
long body_units = 0;
for (ScanCommandImpl<?> command : implementation)
body_units += command.getWorkUnits();
Expand Down Expand Up @@ -128,21 +128,22 @@ private double getLoopStep()
return step;
}

public int getNumSteps() {
return (int)Math.ceil(Math.abs(((command.getEnd() - command.getStart()) / command.getStepSize()))) + 1;
}

/** {@inheritDoc} */
@Override
public void simulate(final SimulationContext context) throws Exception
{
final SimulatedDevice device = context.getDevice(context.getMacros().resolveMacros(command.getDeviceName()));

final double start = getLoopStart();
final double end = getLoopEnd();
final double step = getLoopStep();
if (step > 0)
for (double value = start; value <= end; value += step)
simulateStep(context, device, value);
else // step is < 0, so stepping down
for (double value = end; value >= start; value += step)
simulateStep(context, device, value);
// step is < 0 means we are stepping down
double start = step < 0 ? getLoopEnd() : getLoopStart();
int num_steps = getNumSteps();
for (int i = 0; i < num_steps; i++)
simulateStep(context, device, start + i * step);
}

/** Simulate one step in the loop iteration
Expand Down Expand Up @@ -204,25 +205,13 @@ public void execute(final ScanContext context) throws Exception
else
condition = null;

double start = getLoopStart();
double end = getLoopEnd();
double step = getLoopStep();
if (step > 0)
for (double value = start; value <= end; value += step)
{
executeStep(context, device, condition, readback, value);
// Permit changed step and end, but keep the direction
end = getLoopEnd();
step = Math.abs(command.getStepSize());
}
else // step is < 0, so stepping down
for (double value = end; value >= start; value += step)
{
executeStep(context, device, condition, readback, value);
// Permit changed step and start, but keep the direction
start = getLoopStart();
step = - Math.abs(command.getStepSize());
}
// step is < 0 means we are stepping down
double start = step < 0 ? getLoopEnd() : getLoopStart();
int num_steps = getNumSteps();

for (int i = 0; i < num_steps; i++)
executeStep(context, device, condition, readback, start + i * step);
}

/** Execute one step of the loop
Expand Down