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

updaterev

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-02-10 11:50:13 +01:00
parent 490e756622
commit 3d2264fa56
8 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.0
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 230d6b36e9852214f4ba5ae7c92647f35000b24d
Revision: 263
Branch: developer
Repsitory UUID: 3d4e56cfec309c4d7a90df164dbfa6132e6757dd
Revision: 268
Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1313
Last Changed Date: 2016-11-30 10:36:34 +0100
Last Changed Rev: 1324
Last Changed Date: 2017-02-03 12:31:33 +0100

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "230d6b36e9852214f4ba5ae7c92647f35000b24d"
//#define SVNREV 0x1313
#define SVNREPUUID "3d4e56cfec309c4d7a90df164dbfa6132e6757dd"
//#define SVNREV 0x1324
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1313
#define SVNDATE 0x20161130
#define SVNREV 0x1324
#define SVNDATE 0x20170203
//

12
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -601,6 +601,7 @@ int64_t getCurrentTau(){
void setDefaultSettingsTau_in_nsec(int t){
default_tau_from_file = t;
printf("Default tau set to %d\n",default_tau_from_file);
}
int setModule(sls_detector_module myMod, int delay){
@ -708,6 +709,7 @@ enum detectorSettings setSettings(enum detectorSettings sett, int imod){
return thisSettings;
}if(sett != GET_SETTINGS)
thisSettings = sett;
printf(" Settings: %d\n", thisSettings);
return thisSettings;
}
@ -1267,9 +1269,12 @@ enum synchronizationMode setSynchronization(enum synchronizationMode arg){
return NO_SYNCHRONIZATION;
}
void setAllTrimbits(int val){
int setAllTrimbits(int val){
int ichan;
if(Feb_Control_SaveAllTrimbitsTo(val)){
if(!Feb_Control_SaveAllTrimbitsTo(val)){
cprintf(RED,"error in setting all trimbits to value\n");
return FAIL;
}else{
#ifdef VERBOSE
printf("Copying register %x value %d\n",destMod->reg,val);
#endif
@ -1278,7 +1283,8 @@ void setAllTrimbits(int val){
*((detectorModules->chanregs)+ichan)=val;
}
}
}else printf("error in setting all trimbits to value\n");
}
return OK;
}
int getAllTrimbits(){