detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-07-11 13:06:48 +02:00
parent 018b800117
commit 828a2dbd17
21 changed files with 867 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -34,9 +34,10 @@ int moduleTest( enum digitalTestMode arg, int imod);
int detectorTest( enum digitalTestMode arg);
int setDAC(enum detDacIndex ind, int val, int imod);
void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]);
int getADC(enum detDacIndex ind, int imod);
#if defined(EIGERD) || defined(GOTTHARD)
int setHighVolage(int val, int imod);
#endif
@ -125,6 +126,9 @@ enum externalCommunicationMode setTiming( enum externalCommunicationMode arg);
enum masterFlags setMaster(enum masterFlags arg);
enum synchronizationMode setSynchronization(enum synchronizationMode arg);
#ifdef EIGERD
void setExternalGating(int enable[]);
#endif
#endif

34
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1043,13 +1043,15 @@ int digital_test(int file_des) {
int set_dac(int file_des) {
int retval;
int retval[2];retval[1]=-1;
int temp;
int ret=OK,ret1=OK;
int arg[2];
int arg[3];
enum dacIndex ind;
int imod;
int n;
int val;
int mV;
enum detDacIndex idac=0;
sprintf(mess,"Can't set DAC\n");
@ -1062,6 +1064,7 @@ int set_dac(int file_des) {
}
ind=arg[0];
imod=arg[1];
mV=arg[2];
n = receiveData(file_des,&val,sizeof(val),INT32);
if (n < 0) {
@ -1182,25 +1185,33 @@ int set_dac(int file_des) {
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else{
if(ind == HV_POT)
retval = setHighVolage(val,imod);
retval[0] = setHighVolage(val,imod);
else if(ind == IO_DELAY)
retval = setIODelay(val,imod);
retval[0] = setIODelay(val,imod);
else
retval=setDAC(idac,val,imod);
setDAC(idac,val,imod,mV,retval);
}
}
#endif
#ifdef VERBOSE
printf("DAC set to %d V\n", retval);
printf("DAC set to %d in dac units and %d mV\n", retval[0],retval[1]);
#endif
if(ret == OK){
if ((abs(retval-val)<=5) || val==-1) {
if(mV)
temp = retval[1];
else
temp = retval[0];
if ((abs(temp-val)<=5) || val==-1) {
ret=OK;
if (differentClients)
ret=FORCE_UPDATE;
} else {
ret=FAIL;
printf("Setting dac %d of module %d: wrote %d but read %d\n", idac, imod, val, retval);
printf("Setting dac %d of module %d: wrote %d but read %d\n", idac, imod, val, temp);
}
}
@ -2977,6 +2988,7 @@ int configure_mac(int file_des) {
if (imod>=getTotalNumberOfModules()) {
ret=FAIL;
sprintf(mess,"Module number out of range %d\n",imod);
printf("mess:%s\n",mess);
}
#endif
#ifdef VERBOSE
@ -3384,14 +3396,14 @@ int enable_ten_giga(int file_des) {
}
/* execute action */
if(ret != FAIL){
#ifdef VERBOSE
//#ifdef VERBOSE
printf("Enabling 10Gbe :%d \n",arg);
#endif
//#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
retval=enableTenGigabitEthernet(arg);
if((arg != -1) && (retval != arg))
ret=FAIL;
else if (differentClients==1 && ret==OK) {
else if (differentClients==1) {
ret=FORCE_UPDATE;
}
#endif