linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- New batch file management module

Browse Source 
- New oscillator module
- Bug fixes


SKIPPED:
	psi/buffer.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/nextrics.c
	psi/nxamor.c
	psi/pimotor.c
	psi/polterwrite.c
	psi/psi.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tricssupport.c
	psi/tricssupport.h
	psi/tecs/make_gen
	psi/utils/ecb_load_new/ecb_load.c
	psi/utils/ecb_load_new/ecb_load.h
	psi/utils/ecb_load_new/ecbdriv_els.c
	psi/utils/ecb_load_new/gpib_els.c
	psi/utils/ecb_load_new/makefile
	psi/utils/ecb_load_new/makefile_EGPIB
	psi/utils/ecb_load_new/makefile_GPIB
This commit is contained in:
cvs
2004-11-17 10:50:15 +00:00
parent f7c8ae30c6
commit 0f4e959e22
46 changed files with 3675 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fitcenter.c
View File

@ -109,13 +109,9 @@
pMot = FindMotor(pServ->pSics,self->pName);
if(pMot)
{
i = MotorGetPar(pMot,"softzero",&fZero);
i = MotorGetPar(pMot,"sign",&fSign);
assert(i);
for(i = 0; i < self->iNP; i++)
{
self->fAxis[i] -= fZero;
self->fAxis[i] *= fSign;
self->fAxis[i] = MotorHardToSoftPosition(pMot,self->fAxis[i]);
}
}
}
@ -349,7 +345,8 @@
SCWrite(pCon,"Driving to center done",eStatus);
break;
default:
SCWrite(pCon,"WARNING: driving to center finished with problems",
SCWrite(pCon,
"WARNING: driving to center finished with problems",
eWarning);
break;
@ -370,7 +367,8 @@
if(argc < 2)
{
SCWrite(pCon,"ERROR: MakeFit expected the name of a scan command as a parameter",
SCWrite(pCon,
"ERROR: MakeFit expected the name of a scan command as a parameter",
eError);
return 0;
}
@ -408,7 +406,8 @@
iRet1 = AddCommand(pSics,"center",CenterWrapper,NULL,self);
if(!iRet || !iRet1)
{
sprintf(pBueffel,"ERROR: duplicate commands peak and center not created",argv[2]);
sprintf(pBueffel,
"ERROR: duplicate commands peak and center not created",argv[2]);
SCWrite(pCon,pBueffel,eError);
DeleteFitCenter((void *)self);
return 0;
@ -435,11 +434,15 @@
break;
case -1:
SCWrite(pCon,"WARNING: could not find left hand half width",eWarning);
SCWrite(pCon,"Fit Results most certainly dodgy, SICS suggests measuring a full peak",eWarning);
SCWrite(pCon,
"Fit Results most certainly dodgy, SICS suggests measuring a full peak",
eWarning);
break;
case -2:
SCWrite(pCon,"WARNING: could not find right hand half width",eError);
SCWrite(pCon,"Fit Results most certainly dodgy, SICS suggests measuring a full peak",eWarning);
SCWrite(pCon,
"Fit Results most certainly dodgy, SICS suggests measuring a full peak",
eWarning);
break;
case -3:
SCWrite(pCon,"ERROR: No counts found in Fit!",eError);