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

made code proper to avoid warning/fixed some small potential bugs

Browse Source
This commit is contained in:
zolliker
2005-03-04 12:53:07 +00:00
parent 52e8c78aa9
commit 9a94b6dca7
29 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mesure.c
View File

@@ -32,6 +32,7 @@
#include "lld.h"
extern void SNXFormatTime(char *pBueffel, int iLen);
extern float nintf(float f);
#define ANGERR 0.2
/*
@@ -854,7 +855,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
/* write it */
if(self->fRefl)
{
fprintf(self->fRefl,"%4d%8.3f%8.3f%8.3f%8.2f%8.2f%8.2f%8.2f%8.0f%8.2f\n",
fprintf(self->fRefl,"%4d %7.3f %7.3f %7.3f %7.2f %7.2f %7.2f %7.2f %7.0f %7.2f\n",
self->iCount, fHKL[0],fHKL[1],fHKL[2],
self->fPosition[0], self->fPosition[1],
self->fPosition[2],self->fPosition[3],
@@ -862,13 +863,13 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
}
if(self->fHKL)
{
fprintf(self->fHKL,"%5d%7.2f%7.2f%7.2f%8.2f%8.2f%8.2f%8.2f%8.0f%8.2f\n",
fprintf(self->fHKL,"%5d %6.2f %6.2f %6.2f %7.2f %7.2f %7.2f %7.2f %7.0f %7.2f\n",
self->iCount, fHKL[0],fHKL[1],fHKL[2],
self->fPosition[0], self->fPosition[1],
self->fPosition[2],self->fPosition[3],
fSum,fSigma);
}
sprintf(pBueffel,"%5d%7.2f%7.2f%7.2f%8.2f%8.2f%8.2f%8.2f%8.0f%8.2f\n",
sprintf(pBueffel,"%5d %6.2f %6.2f %6.2f %7.2f %7.2f %7.2f %7.2f %7.0f %7.2f\n",
self->iCount, fHKL[0],fHKL[1],fHKL[2],
self->fPosition[0], self->fPosition[1],
self->fPosition[2],self->fPosition[3],
@@ -892,13 +893,13 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
GetScanVarStep(self->pScanner,0,&fStep);
iNP = GetScanNP(self->pScanner);
fPreset = GetScanPreset(self->pScanner);
fprintf(self->fRefl,"%3d%8.3f%10.0f%8.3f %s\n",iNP,fStep,
fprintf(self->fRefl,"%3d %7.3f %9.0f %7.3f %s\n",iNP,fStep,
fPreset,fTemp,pBueffel);
for(i = 0; i < iNP; i++)
{
for(ii = 0; ii < 10 && i < iNP; ii++)
{
fprintf(self->fRefl,"%8d",self->lCounts[i]);
fprintf(self->fRefl," %7ld",self->lCounts[i]);
iLF = 1;
i++;
}
@@ -925,7 +926,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
{
for(ii = 0; ii < 10 && i < iNP; ii++)
{
sprintf(pNum,"%7d",self->lCounts[i]);
sprintf(pNum," %6ld",self->lCounts[i]);
strcat(pBueffel,pNum);
iLF = 1;
i++;
@@ -1375,6 +1376,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
else if(strcmp(argv[1],"list") == 0)
{
ListMesure(self,argv[0],pCon);
return 1;
}
/*------ file */
else if(strcmp(argv[1],"file") == 0)