From 152bd9f9408c4d409a2dcc44b05ed646e33604b8 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Mon, 19 Sep 2011 18:45:40 +0000 Subject: [PATCH] Skip soft-limit calculations for motors that are not involved in a profile move --- motorApp/NewportSrc/XPSController.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/motorApp/NewportSrc/XPSController.cpp b/motorApp/NewportSrc/XPSController.cpp index c14a25d1..532e8270 100644 --- a/motorApp/NewportSrc/XPSController.cpp +++ b/motorApp/NewportSrc/XPSController.cpp @@ -797,6 +797,8 @@ asynStatus XPSController::buildProfile() sprintf(message, "MultipleAxesPVTVerificationResultGet error for axis %s, status=%d\n", pAxes_[j]->positionerName_, status); } + // Don't do the rest if the axis is not being used + if (!useAxis[j]) continue; /* Check that the trajectory won't exceed the software limits * The XPS does not check this because the trajectory is defined in relative moves and it does * not know where we will be in absolute coordinates when we execute the trajectory */