diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index c7df38234..788ffc1e7 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer -URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer -Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 -Revision: 141 -Branch: master +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: c5eb9dba43284c8002dceda00d8243a53260aa37 +Revision: 192 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 300 -Last Changed Date: 2015-06-22 17:09:47 +0200 +Last Changed Rev: 321 +Last Changed Date: 2016-06-13 19:00:34 +0200 diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 55e1387c1..a5aa674d1 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,11 +1,11 @@ //#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 SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" -//#define SVNREV 0x300 +#define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37" +//#define SVNREV 0x321 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x300 -#define SVNDATE 0x20150622 +#define SVNREV 0x321 +#define SVNDATE 0x20160613 // diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 4e506b1cf..b8510da7e 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -421,7 +421,7 @@ void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]){ int setHighVoltage(int val, int imod){ if(val!=-1){ printf(" Setting High Voltage: %d\n",val); - if(!top) + if(!master) eiger_highvoltage = val; else if(Feb_Control_SetHighVoltage(val)) eiger_highvoltage = val; diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 67448f583..0e0b0bb77 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware -URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 -Revision: 945 -Branch: master +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 +Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37 +Revision: 1094 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 945 -Last Changed Date: 2015-06-22 17:09:47 +0200 +Last Changed Rev: 1094 +Last Changed Date: 2016-06-13 19:00:34 +0200 diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 49ffa8ec7..9454419e7 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer -URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer -Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 -Revision: 179 -Branch: master +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/gotthardDetectorServer +Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git +Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37 +Revision: 189 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 300 -Last Changed Date: 2015-06-22 17:09:47 +0200 +Last Changed Rev: 321 +Last Changed Date: 2016-06-13 19:00:34 +0200 diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 360680d24..1581b6a74 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,11 +1,11 @@ //#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 SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" -//#define SVNREV 0x300 +#define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37" +//#define SVNREV 0x321 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x300 -#define SVNDATE 0x20150622 +#define SVNREV 0x321 +#define SVNDATE 0x20160613 // diff --git a/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt b/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt index b1ef89fbd..26363720e 100644 --- a/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer -URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer -Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 -Revision: 66 -Branch: master +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/moenchDetectorServer +Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git +Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37 +Revision: 72 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 300 -Last Changed Date: 2015-06-22 17:09:47 +0200 +Last Changed Rev: 321 +Last Changed Date: 2016-06-13 19:00:34 +0200 diff --git a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h index bcbe5fce7..1d7f6b8d3 100644 --- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h +++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h @@ -1,11 +1,11 @@ //#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 SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" -//#define SVNREV 0x300 +#define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37" +//#define SVNREV 0x321 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x300 -#define SVNDATE 0x20150622 +#define SVNREV 0x321 +#define SVNDATE 0x20160613 // diff --git a/slsDetectorSoftware/mythenDetectorServer/gitInfo.txt b/slsDetectorSoftware/mythenDetectorServer/gitInfo.txt index 6a82cdf7c..791f8e5ab 100644 --- a/slsDetectorSoftware/mythenDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/mythenDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer -URL: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer -Repository Root: origin maliakal_d@gitorious.psi.ch:sls_det_software/sls_detector_software.git -Repsitory UUID: 3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3 -Revision: 95 -Branch: master +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer +Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git +Repsitory UUID: c5eb9dba43284c8002dceda00d8243a53260aa37 +Revision: 98 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 300 -Last Changed Date: 2015-06-22 17:09:47 +0200 +Last Changed Rev: 321 +Last Changed Date: 2016-06-13 19:00:34 +0200 diff --git a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h index b4f624804..2b7f60f50 100644 --- a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h +++ b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h @@ -1,11 +1,11 @@ //#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 SVNREPUUID "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" -//#define SVNREV 0x300 +#define SVNREPUUID "c5eb9dba43284c8002dceda00d8243a53260aa37" +//#define SVNREV 0x321 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x300 -#define SVNDATE 0x20150622 +#define SVNREV 0x321 +#define SVNDATE 0x20160613 // diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 7d42fe403..e7d11cdd7 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,11 +1,11 @@ //#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 SVNREPUUIDLIB "3b5e43dfbd7f3819ace58ad8cd0aefd0ba0034c3" -//#define SVNREV 0x945 +#define SVNREPUUIDLIB "c5eb9dba43284c8002dceda00d8243a53260aa37" +//#define SVNREV 0x1094 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x945 -#define SVNDATELIB 0x20150622 +#define SVNREVLIB 0x1094 +#define SVNDATELIB 0x20160613 //