- Many fixes to the four circle codes during taking the new code into

operation.
- Fixed some missing output
- Second generation histogram memory and velocity selector objects
- Fixed a problem in diffscan
This commit is contained in:
koennecke
2009-05-15 13:21:20 +00:00
parent 8c6d95bee6
commit 3f3f0810e5
34 changed files with 1014 additions and 117 deletions

13
scan.c
View File

@ -99,6 +99,18 @@ static void ConfigureScanDict(pStringDict dict)
StringDictAddPair(dict, "userdata", "unknown");
StringDictAddPair(dict, "finish", "stdscan finish");
}
/*------------------------------------------------------------------------*/
static void ResetScanDict(pStringDict dict)
{
StringDictUpdate(dict, "writeheader", "stdscan writeheader");
StringDictUpdate(dict, "prepare", "stdscan prepare");
StringDictUpdate(dict, "drive", "stdscan drive");
StringDictUpdate(dict, "count", "stdscan count");
StringDictUpdate(dict, "collect", "stdscan collect");
StringDictUpdate(dict, "writepoint", "stdscan writepoint");
StringDictUpdate(dict, "userdata", "unknown");
StringDictUpdate(dict, "finish", "stdscan finish");
}
/*--------------------------------------------------------------------------*/
pScanData CreateScanObject(char *pRecover, char *pHeader, pCounter pCount,
@ -1921,6 +1933,7 @@ int ScanWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
return 1;
} else if (strcmp(argv[2], "script") == 0) {
ConfigureScript(self);
ResetScanDict(self->scanFunctions);
SCSendOK(pCon);
return 1;
} else {