- Added scaling to sicsdata
- Fixed fixed motor driving in tasdrive - Fixed stdscan to behnave nicely when various things are missing - Fixed a bug in multicounter
This commit is contained in:
@ -610,7 +610,7 @@ int prepareDataFile(pScanData self){
|
||||
char pBueffel[512];
|
||||
|
||||
/* allocate a new data file */
|
||||
pPtr = ScanMakeFileName(self->pSics,self->pCon);
|
||||
pPtr = ScanMakeFileName(pServ->pSics,self->pCon);
|
||||
if(!pPtr)
|
||||
{
|
||||
SCWrite(self->pCon,
|
||||
@ -637,7 +637,6 @@ int prepareDataFile(pScanData self){
|
||||
char pMessage[1024];
|
||||
|
||||
assert(self);
|
||||
assert(self->iNP > 0);
|
||||
assert(self->pCon);
|
||||
|
||||
/* check boundaries of scan variables and allocate storage */
|
||||
@ -1124,6 +1123,10 @@ int StandardScanWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(self->pCon == NULL){
|
||||
self->pCon = pCon;
|
||||
}
|
||||
|
||||
if(strcmp(argv[1],"writeheader") == 0){
|
||||
return WriteHeader(self);
|
||||
} else if(strcmp(argv[1],"prepare") == 0){
|
||||
|
Reference in New Issue
Block a user