From 4a31cb3ad13b8397c4f71d708f9a3d091c592e75 Mon Sep 17 00:00:00 2001 From: timmmooney Date: Thu, 12 Jun 2014 20:49:12 +0000 Subject: [PATCH] Check motor.OUT; make sure motors are in signal order, with no gaps --- motorApp/OmsSrc/MAX_trajectoryScan.st | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/motorApp/OmsSrc/MAX_trajectoryScan.st b/motorApp/OmsSrc/MAX_trajectoryScan.st index 94076cf3..1e245e1e 100644 --- a/motorApp/OmsSrc/MAX_trajectoryScan.st +++ b/motorApp/OmsSrc/MAX_trajectoryScan.st @@ -192,6 +192,8 @@ int waitingForTrigger; double vmax; double amax; +int card; +int signal; ss maxTrajectoryScan { @@ -253,6 +255,16 @@ ss maxTrajectoryScan { pvAssign(epicsMotorACCL[i], motorName); pvMonitor(epicsMotorACCL[i]); + sprintf(motorName, "%s%s.OUT", macValueGet("P"), macValueGet(macroBuf)); + pvAssign(epicsMotorOUT[i], motorName); + pvGet(epicsMotorOUT[i]); + + sscanf(epicsMotorOUT[i], "#C%d S%d", &card, &signal); + if (signal != i) { + printf("MAX_trajectoryScan: motor %d has signal %d (must be same)\n", i, signal); + initStatus = STATUS_FAILURE; + } + if (cardNumber == -2) { cardNumber = epicsMotorCard[i]; } else {