- Fix to various drivers due to changes in rs232controller
- hkl now searches psi in .5 steps - first point of fastscan is driven normally SKIPPED: psi/amor2t.c psi/amor2t.h psi/amor2t.i psi/amor2t.tex psi/amor2t.w psi/dornier2.c psi/el734hp.c psi/nxamor.c psi/slsmagnet.c psi/sps.c
This commit is contained in:
18
stdscan.c
18
stdscan.c
@ -267,7 +267,7 @@ static char *fixExtension(char *filename)
|
||||
int WriteScanPoints(pScanData self, int iPoint)
|
||||
{
|
||||
int i, i2;
|
||||
char pLine[512], pItem[30], pInfo[512];
|
||||
char pLine[512], pItem[30], pInfo[1024], pSteps[256];
|
||||
pVarEntry pVar = NULL;
|
||||
pCountEntry pData = NULL;
|
||||
void *pPtr = NULL;
|
||||
@ -296,6 +296,7 @@ static char *fixExtension(char *filename)
|
||||
/* make the data header */
|
||||
sprintf(pLine,"%-4s ","NP");
|
||||
strcpy(pInfo,"Scanning Variables: ");
|
||||
strcpy(pSteps,"Steps: ");
|
||||
for(i = 0; i < self->iScanVar;i++)
|
||||
{
|
||||
DynarGet(self->pScanVar,i,&pPtr);
|
||||
@ -306,6 +307,8 @@ static char *fixExtension(char *filename)
|
||||
strcat(pLine,pItem);
|
||||
sprintf(pItem,"%s, ",ScanVarName(pVar));
|
||||
strcat(pInfo,pItem);
|
||||
sprintf(pItem,"%f ",ScanVarStep(pVar));
|
||||
strcat(pSteps,pItem);
|
||||
}
|
||||
}
|
||||
strcat(pLine," Counts ");
|
||||
@ -313,6 +316,7 @@ static char *fixExtension(char *filename)
|
||||
strcat(pLine,"Monitor2 ");
|
||||
strcat(pLine,"Monitor3 ");
|
||||
strcat(pLine,"Time ");
|
||||
strcat(pInfo,pSteps);
|
||||
sprintf(pItem,"\n%d Points,",self->iNP);
|
||||
strcat(pInfo,pItem);
|
||||
if(self->iMode == eTimer)
|
||||
@ -369,7 +373,7 @@ static char *fixExtension(char *filename)
|
||||
return 1;
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
static int prepareDataFile(pScanData self){
|
||||
int prepareDataFile(pScanData self){
|
||||
char *pPtr = NULL;
|
||||
char pBueffel[512];
|
||||
|
||||
@ -704,6 +708,16 @@ static int prepareDataFile(pScanData self){
|
||||
long lTask;
|
||||
int status;
|
||||
|
||||
/*
|
||||
* drive the first point normally, otherwise there is to much intensity
|
||||
* in the first data point from the long time driving to the start
|
||||
* position.
|
||||
*/
|
||||
if(iPoint == 0)
|
||||
{
|
||||
return ScanDrive(self,iPoint);
|
||||
}
|
||||
|
||||
iRet = StartToDrive(self,iPoint);
|
||||
if(!iRet)
|
||||
{
|
||||
|
Reference in New Issue
Block a user