- Fixed sign problems with om in tasub
- Mended tasdrive to drive energy even if Q is askew - Fixed QM values - Fixed problems in mesure: om2th, wrong theta selection - Fixed core dump when driving h,kl, failed
This commit is contained in:
7
mesure.c
7
mesure.c
@@ -633,6 +633,8 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
ClearScanVar(self->pScanner);
|
||||
AddScanVar(self->pScanner, pServ->pSics,pCon,self->pCOmega,
|
||||
fStart, stepWidth);
|
||||
snprintf(pBueffel,131,"Scanning om from %f with step %f", fStart, stepWidth);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
/*
|
||||
Oksana does not want o2t scans to be tightly coupled, this is why we
|
||||
cannot use the normal o2t scan variable. Instead we calculate new limits and
|
||||
@@ -648,6 +650,8 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
fStart -= (np/2.)*stepWidth;
|
||||
AddScanVar(self->pScanner, pServ->pSics,pCon,self->pC2Theta,
|
||||
fStart, stepWidth);
|
||||
snprintf(pBueffel,131,"Scanning 2theta from %f with step %f", fStart, stepWidth);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -665,10 +669,7 @@ static int ScanReflection(pMesure self, float twoTheta, SConnection *pCon)
|
||||
}
|
||||
|
||||
/* do the scan */
|
||||
snprintf(pBueffel,131,"Scanning %s, step %f, np = %d",scanVar, stepWidth, np);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
free(scanVar);
|
||||
|
||||
if(self->iCompact)
|
||||
{
|
||||
self->pScanner->CollectScanData = CompactScanData;
|
||||
|
||||
Reference in New Issue
Block a user