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

eiger:fixed module to be 1 and getmodule saves dacs to variables in server for now

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@625 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-06-21 14:26:51 +00:00
parent 19d3c1eb0c
commit 3aaca5296f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -36,7 +36,7 @@ int timingMode = AUTO_TIMING;
enum detectorSettings thisSettings; enum detectorSettings thisSettings;
int sChan, sChip, sMod, sDac, sAdc; int sChan, sChip, sMod, sDac, sAdc;
int nModBoard; int nModBoard = 1;
extern int dataBytes; extern int dataBytes;
@ -248,7 +248,7 @@ int getADC(enum detDacIndex ind, int imod){
int setModule(sls_detector_module myMod){ int setModule(sls_detector_module myMod){
#ifdef VERBOSE #ifdef VERBOSE
printf("Setting module\n"); printf("Setting module with settings %d\n",myMod.reg);
#endif #endif
//int nchip = myMod.nchip; //int nchip = myMod.nchip;
@ -265,8 +265,12 @@ int setModule(sls_detector_module myMod){
} }
int getModule(sls_detector_module *myMod){ int getModule(sls_detector_module *myMod){
int i;
for(i=0;i<myMod->ndac;i++)
myMod->dacs[i]= dacvalues[i];
//template getModulebyNumber() from mcb_funcs.c //template getModulebyNumber() from mcb_funcs.c
return FAIL; return OK;
} }
int getThresholdEnergy(int imod){ int getThresholdEnergy(int imod){

6
slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x616 //#define SVNREV 0x621
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x616 #define SVNREV 0x621
#define SVNDATE 0x20130619 #define SVNDATE 0x20130620
// //