detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

made only master set high voltage, others dont complain. also updated version file

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-06-13 19:05:53 +02:00
parent 86ab51ec41
commit cce41969f9
11 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37
Revision: 141 Revision: 192
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 300 Last Changed Rev: 321
Last Changed Date: 2015-06-22 17:09:47 +0200 Last Changed Date: 2016-06-13 19:00:34 +0200

10
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "maliakal_d@gitorious.psi.ch:sls_det_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 "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" #define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37"
//#define SVNREV 0x300 //#define SVNREV 0x321
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x300 #define SVNREV 0x321
#define SVNDATE 0x20150622 #define SVNDATE 0x20160613
// //

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -421,7 +421,7 @@ void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]){
int setHighVoltage(int val, int imod){ int setHighVoltage(int val, int imod){
if(val!=-1){ if(val!=-1){
printf(" Setting High Voltage: %d\n",val); printf(" Setting High Voltage: %d\n",val);
if(!top) if(!master)
eiger_highvoltage = val; eiger_highvoltage = val;
else if(Feb_Control_SetHighVoltage(val)) else if(Feb_Control_SetHighVoltage(val))
eiger_highvoltage = val; eiger_highvoltage = val;

14
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37
Revision: 945 Revision: 1094
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 945 Last Changed Rev: 1094
Last Changed Date: 2015-06-22 17:09:47 +0200 Last Changed Date: 2016-06-13 19:00:34 +0200

14
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/gotthardDetectorServer
Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37
Revision: 179 Revision: 189
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 300 Last Changed Rev: 321
Last Changed Date: 2015-06-22 17:09:47 +0200 Last Changed Date: 2016-06-13 19:00:34 +0200

10
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" #define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37"
//#define SVNREV 0x300 //#define SVNREV 0x321
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x300 #define SVNREV 0x321
#define SVNDATE 0x20150622 #define SVNDATE 0x20160613
// //

14
slsDetectorSoftware/moenchDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer
URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/moenchDetectorServer
Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37
Revision: 66 Revision: 72
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 300 Last Changed Rev: 321
Last Changed Date: 2015-06-22 17:09:47 +0200 Last Changed Date: 2016-06-13 19:00:34 +0200

10
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" #define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37"
//#define SVNREV 0x300 //#define SVNREV 0x321
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x300 #define SVNREV 0x321
#define SVNDATE 0x20150622 #define SVNDATE 0x20160613
// //

14
slsDetectorSoftware/mythenDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer
URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer
Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37
Revision: 95 Revision: 98
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 300 Last Changed Rev: 321
Last Changed Date: 2015-06-22 17:09:47 +0200 Last Changed Date: 2016-06-13 19:00:34 +0200

10
slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" #define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37"
//#define SVNREV 0x300 //#define SVNREV 0x321
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x300 #define SVNREV 0x321
#define SVNDATE 0x20150622 #define SVNDATE 0x20160613
// //

10
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" #define SVNREPUUIDLIB "c5eb9dba43284c8002dceda00d8243a53260aa37"
//#define SVNREV 0x945 //#define SVNREV 0x1094
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x945 #define SVNREVLIB 0x1094
#define SVNDATELIB 0x20150622 #define SVNDATELIB 0x20160613
// //