- 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:
41
scan.c
41
scan.c
@ -1648,6 +1648,40 @@ static int InterpretScanFunctions(pScanData self, SConnection *pCon,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
static int DumpScan(pScanData self, SConnection *pCon)
|
||||
{
|
||||
int i;
|
||||
SConnection *oldCon;
|
||||
char pFile[1024];
|
||||
|
||||
if(self->iActive)
|
||||
{
|
||||
SCWrite(pCon,"ERROR: cannot dump scan while running",eError);
|
||||
return 0;
|
||||
}
|
||||
if(!self->pSics)
|
||||
{
|
||||
self->pSics = pServ->pSics;
|
||||
}
|
||||
/*
|
||||
* save old file etc status
|
||||
*/
|
||||
oldCon = self->pCon;
|
||||
pFile[0] = '\0';
|
||||
strncpy(pFile,self->pFile,1023);
|
||||
prepareDataFile(self);
|
||||
self->pCon = pCon;
|
||||
self->WriteHeader(self);
|
||||
for(i = 0; i < self->iNP; i++)
|
||||
{
|
||||
self->WriteScanPoints(self,i);
|
||||
}
|
||||
SCWrite(pCon,"Scan dumped", eValue);
|
||||
self->pCon = oldCon;
|
||||
strncpy(self->pFile,pFile,1023);
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int ScanWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
int argc, char *argv[])
|
||||
@ -1970,7 +2004,12 @@ static int InterpretScanFunctions(pScanData self, SConnection *pCon,
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
/*------------ dump */
|
||||
else if(strcmp(argv[1],"dump") == 0)
|
||||
{
|
||||
return DumpScan(self,pCon);
|
||||
}
|
||||
/* --------callback */
|
||||
else if(strcmp(argv[1],"callback") == 0)
|
||||
{
|
||||
|
Reference in New Issue
Block a user