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

Merge branch '2.1-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-22 17:19:10 +02:00
commit c678199802
7 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: e9878a26ffb7e57c6e6724215e46ae5634871e64 Repsitory UUID: 372aa91aaff8c6acd0fb70a257774ac56974a4b1
Revision: 231 Revision: 233
Branch: developer Branch: 2.1-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 336 Last Changed Rev: 22
Last Changed Date: 2016-08-24 16:47:14 +0200 Last Changed Date: 2016-09-22 17:16:49 +0200

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "e9878a26ffb7e57c6e6724215e46ae5634871e64" #define SVNREPUUID "372aa91aaff8c6acd0fb70a257774ac56974a4b1"
//#define SVNREV 0x336 //#define SVNREV 0x22
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x336 #define SVNREV 0x22
#define SVNDATE 0x20160824 #define SVNDATE 0x20160922
// //

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -130,7 +130,7 @@ int initDetector(){
detectorGain[i] = default_gain_values[(int)STANDARD]; detectorGain[i] = default_gain_values[(int)STANDARD];
for(i=0;i<NOFFSET;i++) for(i=0;i<NOFFSET;i++)
detectorOffset[i] = default_offset_values[(int)STANDARD]; detectorOffset[i] = default_offset_values[(int)STANDARD];
thisSettings = STANDARD;/**UNITIALIZED*/ thisSettings = UNINITIALIZED;
/*sChan=noneSelected; /*sChan=noneSelected;
sChip=noneSelected; sChip=noneSelected;
sMod=noneSelected; sMod=noneSelected;
@ -731,7 +731,9 @@ int setThresholdEnergy(int ev, int imod){
} }
enum detectorSettings setSettings(enum detectorSettings sett, int imod){ enum detectorSettings setSettings(enum detectorSettings sett, int imod){
if(sett != GET_SETTINGS) if(sett == UNINITIALIZED){
return thisSettings;
}if(sett != GET_SETTINGS)
thisSettings = sett; thisSettings = sett;
return thisSettings; return thisSettings;
} }

10
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: e9878a26ffb7e57c6e6724215e46ae5634871e64 Repsitory UUID: 372aa91aaff8c6acd0fb70a257774ac56974a4b1
Revision: 1149 Revision: 1154
Branch: developer Branch: 2.1-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1149 Last Changed Rev: 1154
Last Changed Date: 2016-08-24 16:47:14 +0200 Last Changed Date: 2016-09-22 17:16:49 +0200

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "e9878a26ffb7e57c6e6724215e46ae5634871e64" #define SVNREPUUIDLIB "372aa91aaff8c6acd0fb70a257774ac56974a4b1"
//#define SVNREV 0x1149 //#define SVNREV 0x1154
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1149 #define SVNREVLIB 0x1154
#define SVNDATELIB 0x20160824 #define SVNDATELIB 0x20160922
// //

1
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1932,6 +1932,7 @@ int set_module(int file_des) {
case LOWGAIN: case LOWGAIN:
case VERYHIGHGAIN: case VERYHIGHGAIN:
case VERYLOWGAIN: case VERYLOWGAIN:
case UNINITIALIZED:
break; break;
default: default:
sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg); sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg);