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

- Minor fixes

Browse Source
This commit is contained in:
koennecke
2007-08-03 15:12:23 +00:00
parent 3cf163f7f2
commit 2ffaa4828a
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
el737hpdriv.c
View File

@ -544,6 +544,9 @@ static int EL737Set(struct __COUNTER *self, char *name, int iCter,
return 0; return 0;
} }
return 1; return 1;
} else if(strcmp(name,"debug") == 0){
setRS232Debug(pPriv->controller,(int)fVal);
return 1;
} else { } else {
self->iErrorCode = UNKNOWNPAR; self->iErrorCode = UNKNOWNPAR;
return 0; return 0;
@ -567,6 +570,9 @@ static int EL737Get(struct __COUNTER *self, char *name, int iCter,
} }
sscanf(pReply,"%f", fVal); sscanf(pReply,"%f", fVal);
return 1; return 1;
} else if(strcmp(name,"debug") == 0){
*fVal = pPriv->controller->debug;
return 1;
} else { } else {
self->iErrorCode = UNKNOWNPAR; self->iErrorCode = UNKNOWNPAR;
return 0; return 0;

16
fowrite.c
View File

@ -749,25 +749,15 @@
fAxis[i] = (float)i; fAxis[i] = (float)i;
} }
iStat = CalculateFitFromData(self->pFitter,fAxis,lSum,iTime); iStat = CalculateFitFromData(self->pFitter,fAxis,lSum,iTime);
if(iStat != 1)
{
SCWrite(pCon,"WARNING: problem locating elastic peak",eWarning);
}
GetFitResults(self->pFitter,&fCenter,&fStdDev,&fFWHM,&fVal); GetFitResults(self->pFitter,&fCenter,&fStdDev,&fFWHM,&fVal);
fVal = fCenter - self->fElastic; fVal = fCenter - self->fElastic;
if(fVal < 0.) if(fVal < 0.)
fVal = - fVal; fVal = - fVal;
/* bad value, leave at theoretical value */ /* bad value, leave at theoretical value */
if(fVal > 10.) if(fVal < 10.)
{ {
SCWrite(pCon,
"WARNING: bad fit result, using theoretical elastic peak position",
eWarning);
}
else
{
self->fElastic = fCenter; self->fElastic = fCenter;
} }
free(lSum); free(lSum);
free(fAxis); free(fAxis);
} }