- Removed old code
- Extended tasker to support task groups - Added task functions for motors and counters - Modifed devexec to use the new task functions - Modified TAS to treat the monochromator separatly - Coded a EIGER monochromator module to reflect even more new requirements - Added EPICS counters and motors - Modified multicounter to be better performing SKIPPED: psi/eigermono.c psi/make_gen psi/makefile_linux psi/psi.c psi/sinqhttp.c
This commit is contained in:
2
scan.c
2
scan.c
@ -644,6 +644,7 @@ int DoScan(pScanData self, int iNP, int iMode, float fPreset,
|
||||
return 0;
|
||||
}
|
||||
|
||||
self->iActive = 1;
|
||||
self->iNP = iNP;
|
||||
self->iMode = iMode;
|
||||
self->fPreset = fPreset;
|
||||
@ -661,7 +662,6 @@ int DoScan(pScanData self, int iNP, int iMode, float fPreset,
|
||||
}
|
||||
|
||||
|
||||
self->iActive = 1;
|
||||
iRet = ScanLoop(self);
|
||||
ScriptScanFinish(self);
|
||||
InvokeCallBack(self->pCall, SCANEND, self);
|
||||
|
Reference in New Issue
Block a user