diff --git a/motorApp/NewportSrc/MM4005_trajectoryScan.st b/motorApp/NewportSrc/MM4005_trajectoryScan.st index 1fb82392..2370affd 100644 --- a/motorApp/NewportSrc/MM4005_trajectoryScan.st +++ b/motorApp/NewportSrc/MM4005_trajectoryScan.st @@ -645,11 +645,7 @@ static int getEpicsMotorMoving(SS_ID ssId, struct UserVar *pVar) int result=0, mask=0x01; for (j=0; jnumAxes; j++) { -#if LT_SEQ_VERSION(2,2) seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0); -#else - seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0, DEFAULT_TIMEOUT); -#endif if (pVar->epicsMotorDone[j] == 0) result |= mask; mask = mask << 1; } @@ -669,21 +665,13 @@ static int waitEpicsMotors(SS_ID ssId, struct UserVar *pVar) /* Get the current motor positions, post them */ for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } epicsThreadSleep(POLL_INTERVAL); } for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } return(0); } diff --git a/motorApp/NewportSrc/XPS_trajectoryScan.st b/motorApp/NewportSrc/XPS_trajectoryScan.st index 42e85191..d3082e25 100644 --- a/motorApp/NewportSrc/XPS_trajectoryScan.st +++ b/motorApp/NewportSrc/XPS_trajectoryScan.st @@ -699,11 +699,7 @@ static int getEpicsMotorMoving(SS_ID ssId, struct UserVar *pVar) int result=0, mask=0x01; for (j=0; jnumAxes; j++) { -#if LT_SEQ_VERSION(2,2) seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0); -#else - seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0, DEFAULT_TIMEOUT); -#endif if (pVar->epicsMotorDone[j] == 0) result |= mask; mask = mask << 1; } @@ -722,21 +718,13 @@ static int waitMotors(SS_ID ssId, struct UserVar *pVar) /* Get the current motor positions, post them */ getMotorPositions(ssId, pVar, pVar->motorCurrent); for (j=0; jnumAxes; j++) { -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } epicsThreadSleep(POLL_INTERVAL); } getMotorPositions(ssId, pVar, pVar->motorCurrent); for (j=0; jnumAxes; j++) { -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } return(0); } @@ -753,21 +741,13 @@ static int waitEpicsMotors(SS_ID ssId, struct UserVar *pVar) /* Get the current motor positions, post them */ for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } epicsThreadSleep(POLL_INTERVAL); } for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } return(0); }