lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Removed the code that starts and stops the detector; the responsibility for that now rests with the client

Browse Source
This commit is contained in:
MarkRivers
2010-02-22 17:27:04 +00:00
parent 688ff2c8b3
commit 247b187e9d
1 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/MM4005_trajectoryScan.st
-43
View File
@@ -7,43 +7,6 @@ program MM4005_trajectoryScan("P=13IDC:,R=traj1,M1=M1,M2=M2,M3=M3,M4=M4,M5=M5,M6
*
* Mark Rivers
* August 12, 2000
*
* Modifications:
* August 21, 2000 MLR Added +r option, so that the flag is just for this
* module, rather than requiring it to be in Makefile.Vx
* Dec. 5, 2001 MLR Fixed bug in computing following error
* Dec. 7, 2001 MLR Fixed bug in converting from EPICS to MM4000 units when
* building trajectory.
* Oct. 28, 2002 MLR Fixed bug in reporting updated trajectory positions after
* padding. Was not a problem in executing trajectory, only in
* values reported to EPICS
* Dec. 18, 2003 MLR Changed flyback (now a misnomer) so it does EPICS move to
* current motor positions, not start positions.
* Start position move did not work because motors already
* thought they were there (if no encoder error) and motor
* record did nothing.
* Feb. 12, 2004 MLR Added delay after starting trajectory execution.
* This is an attempt to eliminate problem where MM4000 seems
* to sometimes ignore TP command right after trajectory
* execution starts.
* Also, first MS sometimes comes back saying motors are not
* moving yet, so software thinks trajectory is done.
* Converted to OSI
* Converted to new version of seq which changes call to
* seq_pvPut
* Oct. 1, 2004 MLR Changed from using asynRecord (previously generic serial
* record) to using asynOctetSyncIO calls.
* This fixed bugs in I/O due to timing, and is simpler and
* cleaner.
* Feb. 6, 2005 MLR Changes for last version of asyn; terminators done
* differently.
* Mar. 28, 2005 MLR Increased number of pulses; added readback during trajectory
* download to prevent buffer overflow.
* Apr. 29, 2005 MLR Changed timeout to 30 seconds - necessary?
* Apr. 12, 2006 MLR Changed from strtok_r to epicsStrtok_r
* Jan. 18, 2007 MLR Use new include file, "trajectoryScan.h" to eliminate
* duplication with new XPS trajectory scan SNL program.
* Clean up code, assign EPICS motor PVs in init().
*/
%% #include <string.h>
@@ -411,9 +374,6 @@ ss trajectoryScan {
}
%%waitEpicsMotors(ssId, pVar);
}
/* Start the detector */
detOn = 1;
pvPut(detOn);
/* Send the execute command, along with simulation mode and time
* scaling factor */
sprintf(stringOut, "LS,%dEC%f",simMode,timeScale);
@@ -477,9 +437,6 @@ ss trajectoryScan {
} state wait_execute
when(execState==EXECUTE_STATE_FLYBACK) {
/* Stop the detector */
detOff = 1;
pvPut(detOff);
pvPut(execState);
pvPut(execStatus);
pvPut(execMessage);