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

Fixed a bug with the eiger monochromator not driving mt when mcv did not drive

Browse Source 
Fixed expression searching in sicslogquery
Added proton monitot to tasscan output
Chnaged SICS scripts to reflect the switch from TRICS to ZEBRA
This commit is contained in:
koennecke
2016-07-01 10:51:37 +02:00
parent 7b1704c9fa
commit 2caac1016f
5 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tasscan.c
View File

@ -420,8 +420,8 @@ static int TASHeader(pScanData self)
/*
put the standard counter things
*/
strcat(pBueffel, "F8.0,1X,F8.0,1X,F9.2,1X,F8.0,1X,F8.0,1X,");
strcat(pHeader, " M1 M2 TIME CNTS M3 ");
strcat(pBueffel, "F8.0,1X,F8.0,1X,F9.2,1X,F8.0,1X,F8.0,1X,F9.0,1X,");
strcat(pHeader, " M1 M2 TIME CNTS M3 M4 ");
/*
now the additional variables
*/
@ -471,7 +471,7 @@ static int TASScanPoint(pScanData self, int iPoint)
int i, status, iPtr;
float fVal;
pMotor pMot = NULL;
long m1, m2, m3, cnts;
long m1, m2, m3, m4, cnts;
char pBueffel[1024], pWork[80], pError[132];
/*
@ -527,9 +527,10 @@ static int TASScanPoint(pScanData self, int iPoint)
m1 = GetMonitor(self->pCounterData, 1, self->pCon);
m2 = GetMonitor(self->pCounterData, 2, self->pCon);
m3 = GetMonitor(self->pCounterData, 3, self->pCon);
m4 = GetMonitor(self->pCounterData, 4, self->pCon); // integrated proton charge on target
cnts = GetCounts(self->pCounterData, self->pCon);
fVal = GetCountTime(self->pCounterData, self->pCon);
sprintf(pWork, "%8ld %8ld %9.2f %8ld %8ld ", m1, m2, fVal, cnts, m3);
sprintf(pWork, "%8ld %8ld %9.2f %8ld %8ld %9ld", m1, m2, fVal, cnts, m3, m4);
strcat(pBueffel, pWork);
/*