- Committing first working version of new AMOR settings module
This commit is contained in:
6
mesure.c
6
mesure.c
@@ -1053,7 +1053,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
SNXFormatTime(pBueffel,512);
|
||||
GetScanVarStep(self->pScanner,0,&fStep);
|
||||
fPreset = GetScanPreset(self->pScanner);
|
||||
fprintf(self->fRefl,"%3d %7.3f %9.0f %7.3f %s\n",iNP,fStep,
|
||||
fprintf(self->fRefl,"%3d %7.4f %9.0f %7.3f %s\n",iNP,fStep,
|
||||
fPreset,fTemp,pBueffel);
|
||||
for(i = 0; i < iNP; i++)
|
||||
{
|
||||
@@ -1078,7 +1078,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
if(self->iCompact == 1)
|
||||
{
|
||||
strcpy(pTime,pBueffel);
|
||||
sprintf(pBueffel,"%3d%8.3f%10.0f%8.3f %s\n",iNP,fStep,
|
||||
sprintf(pBueffel,"%3d%8.4f%10.0f%8.3f %s\n",iNP,fStep,
|
||||
fPreset,fTemp,pTime);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
pBueffel[0] = '\0';
|
||||
@@ -1528,7 +1528,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
/*
|
||||
catch table processing commands
|
||||
*/
|
||||
iRet = HandleFourCircleCommands(self->stepTable,pCon,argc,argv,&err);
|
||||
iRet = HandleFourCircleCommands(&self->stepTable,pCon,argc,argv,&err);
|
||||
if(iRet == 1)
|
||||
{
|
||||
return err;
|
||||
|
||||
Reference in New Issue
Block a user