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

Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sicspsi

Browse Source
This commit is contained in:
koennecke
2015-03-17 11:46:38 +01:00
parent a793526a8e c6715af717
commit 889749c90b
303 changed files with 11 additions and 34216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
psi.c
View File

@ -26,7 +26,6 @@
#include <site.h>
#include "sinqhmdriv.i"
#include "tdchm.h"
#include "tecsdriv.h"
#include "itc4.h"
#include "bruker.h"
#include "ltc11.h"
@ -313,9 +312,7 @@ static void ConfigureController(char *name, pEVControl pNew,
{
EVCSetPar(pNew, "upperlimit", 300.0, pCon);
EVCSetPar(pNew, "lowerlimit", 1.0, pCon);
if (strcmp(name, "tecs") == 0) {
TecsCustomize(pCon, pNew);
} else if (strcmp(name, "euro") == 0) {
if (strcmp(name, "euro") == 0) {
EVCSetPar(pNew, "upperlimit", 750.0, pCon);
EVCSetPar(pNew, "lowerlimit", 15.0, pCon);
} else if (strcmp(name, "el755") == 0) {
@ -351,17 +348,7 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp * pSics,
for the device. If 0 the default command will be installed later on
*/
if (strcmp(argv[3], "tecs") == 0) {
checkError = 1;
pDriv = CreateTecsDriver(argc - 4, &argv[4]);
if (pDriv != NULL) {
pNew = CreateEVController(pDriv, argv[2], &status);
if (pNew) {
AddCommand(pSics, argv[2], TecsWrapper, DeleteEVController, pNew);
commandInstalled = 1;
}
}
} else if (strcmp(argv[3], "itc4") == 0) {
if (strcmp(argv[3], "itc4") == 0) {
checkError = 1;
pDriv = CreateITC4Driver(argc - 4, &argv[4]);
if (pDriv) {