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

- Removed slit 5 from amorset.c

Browse Source 
- poldizug now sends all codes all the time
- polterwrite writes the filename again
- sanswave has been modifed to support the new second generation velocity
  selector
- sinqhttprot has been mdified to copy data to nodes, this for the second
  generation HM object
- tasscan suppressed some output
This commit is contained in:
koennecke
2009-05-15 13:24:02 +00:00
parent 5d30c7b5b9
commit caf59ef8eb
12 changed files with 225 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tasscan.c
View File

@ -1414,7 +1414,7 @@ int TASScan(SConnection * pCon, SicsInterp * pSics, void *pData,
snprintf(pLine, 1023, "%8s %3d Points Scan %3d Scanned Variable(s) %s",
pTAS->tasPar[INST]->text,
pTAS->pScan->iNP, pTAS->pScan->iScanVar, pWork);
SCWrite(pCon, pLine, eWarning);
SCWrite(pCon, pLine, eLog);
if (GetCounterMode(pTAS->pScan->pCounterData) == eTimer) {
sprintf(pLine, " %8f Seconds per point",
GetCounterPreset(pTAS->pScan->pCounterData));
@ -1423,7 +1423,7 @@ int TASScan(SConnection * pCon, SicsInterp * pSics, void *pData,
GetCounterPreset(pTAS->pScan->pCounterData));
}
SCWrite(pCon, pLine, eWarning);
SCWrite(pCon, pLine, eLog);
SCWrite(pCon, " ", eWarning);
SCWrite(pCon, " ", eWarning);
sprintf(pLine,
@ -1440,7 +1440,7 @@ int TASScan(SConnection * pCon, SicsInterp * pSics, void *pData,
(pTAS->pScan->iNP / 2) * pTAS->tasPar[DEN]->fVal,
pTAS->tasPar[DQH]->fVal, pTAS->tasPar[DQK]->fVal,
pTAS->tasPar[DQL]->fVal, pTAS->tasPar[DEN]->fVal);
SCWrite(pCon, pLine, eWarning);
SCWrite(pCon, pLine, eLog);
if (iTas > 0) {
if (pTAS->tasPar[FX]->iVal == 1) {
sprintf(pLine, " Constant KI Scan: KI= %7.4f Angs-1; EI= %9.4f",
@ -1449,7 +1449,7 @@ int TASScan(SConnection * pCon, SicsInterp * pSics, void *pData,
sprintf(pLine, " Constant KF Scan: KF= %7.4f Angs-1; EF= %9.4f",
pTAS->tasPar[KF]->fVal, pTAS->tasPar[EF]->fVal);
}
SCWrite(pCon, pLine, eWarning);
SCWrite(pCon, pLine, eLog);
}
/*
@ -1474,7 +1474,7 @@ int TASScan(SConnection * pCon, SicsInterp * pSics, void *pData,
print a message for Severian Gvassilja
*/
sprintf(pLine, "Scan finished, data saved to %s", pTAS->pScan->pFile);
SCWrite(pCon, pLine, eWarning);
SCWrite(pCon, pLine, eLog);
return status;
}