- Many fixes to accomodate a nitty picky TRICS wishlist
- Added a log facility to scan which includes a variable which is logged but not driven during a scan. - Fixed normal beam operation
This commit is contained in:
17
hklscan.c
17
hklscan.c
@@ -7,6 +7,14 @@
|
||||
copyright: see copyright.h
|
||||
|
||||
Mark Koennecke, June 1999
|
||||
|
||||
This is obsolete: h,k,l are now drivable. Logged variables have been added
|
||||
to the scan module. The command is now implemented through scripts.
|
||||
This module is left in the source tree in order to allow for a quick
|
||||
reinstallation in case of problems but should be retired from the
|
||||
source tree in the shutdown 2007
|
||||
|
||||
Mark Koennecke, January 2006
|
||||
--------------------------------------------------------------------------*/
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@@ -86,7 +94,7 @@
|
||||
}
|
||||
|
||||
/* alright. Install command */
|
||||
iRet = AddCommand(pSics, "hklscan",
|
||||
iRet = AddCommand(pSics, "__hklscan",
|
||||
HklscanAction,KillHklscan,pNew);
|
||||
if(!iRet)
|
||||
{
|
||||
@@ -232,7 +240,7 @@
|
||||
self->fd = NULL;
|
||||
return 1;
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
/*-------------------------------------------------------------------*/
|
||||
int Hklscan(pHklscan self, SConnection *pCon,
|
||||
int iNP, int iMode, float fPreset)
|
||||
{
|
||||
@@ -279,10 +287,11 @@
|
||||
int argc, char *argv[])
|
||||
{
|
||||
char pBueffel[512];
|
||||
int iRet, iMode, iNP;
|
||||
int iRet, iMode, iNP, iPoint;
|
||||
pHklscan self = NULL;
|
||||
double dVal;
|
||||
float fPreset;
|
||||
void *pPtr;
|
||||
|
||||
assert(pCon);
|
||||
assert(pSics);
|
||||
@@ -438,7 +447,7 @@
|
||||
SCSendOK(pCon);
|
||||
}
|
||||
return iRet;
|
||||
}
|
||||
}
|
||||
sprintf(pBueffel,
|
||||
"ERROR: %s not recognized as command word to hklscan",argv[1]);
|
||||
SCWrite(pCon,pBueffel,eError);
|
||||
|
||||
Reference in New Issue
Block a user