From dd6301d66d1c90a4b57952b881e17e1470b5b2b0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 14 Mar 2018 16:19:30 +0100 Subject: [PATCH] updated for compilation --- README.md | 5 ++++- slsDetectorGui/gitInfo.txt | 12 ++++++------ slsDetectorGui/include/gitInfoGui.h | 10 +++++----- slsDetectorSoftware/gitInfo.txt | 19 +++++-------------- .../multiSlsDetector/multiSlsDetector.cpp | 2 -- slsDetectorSoftware/slsDetector/gitInfoLib.h | 16 ++++------------ slsReceiverSoftware/gitInfo.txt | 12 ++++++------ slsReceiverSoftware/include/gitInfoReceiver.h | 10 +++++----- 8 files changed, 35 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 02ce963d0..410af1eba 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Documentation to obtain the binaries via the conda package is available [here.]( ### Source code One can also obtain the source code from this repository and compile while realizing the setup dependencies as required. ``` -git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 3.1.0 +git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git ``` #### Setup dependencies @@ -44,6 +44,9 @@ Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]
* -g: Build/Rebuilds only gui
* -j: Number of threads to compile through
+Basic Option: +./cmk.sh -b + For only make: ./cmk.sh diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 16b79dc77..4ded3c165 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 -Revision: 452 -Branch: 3.1.0-rc -Last Changed Author: Erik_Frojdh -Last Changed Rev: 3458 -Last Changed Date: 2018-03-09 10:55:40.000000002 +0100 ./src/qTabSettings.cpp +Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 +Revision: 491 +Branch: developer +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3727 +Last Changed Date: 2018-03-14 15:24:03.000000002 +0100 ./src/qTabMeasurement.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index cbbcf49db..997240797 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x3458 -#define GITDATE 0x20180309 -#define GITBRANCH "3.1.0-rc" +#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3727 +#define GITDATE 0x20180314 +#define GITBRANCH "developer" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 06c0590f7..e94fe0436 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,18 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -<<<<<<< HEAD -Repsitory UUID: 92b4b3324e09299663b9862bad26b38a3257dd60 -Revision: 1752 +Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 +Revision: 1842 Branch: developer -Last Changed Author: Andrä_Marie -Last Changed Rev: 3570 -Last Changed Date: 2018-01-19 14:14:34.000000002 +0100 ./commonFiles/sls_detector_defs.h -======= -Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 -Revision: 1714 -Branch: 3.1.0-rc -Last Changed Author: Erik_Frojdh -Last Changed Rev: 3458 -Last Changed Date: 2018-03-12 14:19:44.000000002 +0100 ./threadFiles/ThreadPool.o ->>>>>>> 3.1.0 +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3727 +Last Changed Date: 2018-03-14 16:10:22.000000002 +0100 ./multiSlsDetector/multiSlsDetector.cpp diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index bd7b561f2..c415be085 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -6051,8 +6051,6 @@ void multiSlsDetector::readFrameFromReceiver(){ break; case JUNGFRAU: jungfrau = true; - maxX = thisMultiDetector->numberOfChannel[X]; - maxY = thisMultiDetector->numberOfChannel[Y]; break; default: break; diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 9f727a80f..997240797 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,14 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -<<<<<<< HEAD -#define GITREPUUID "92b4b3324e09299663b9862bad26b38a3257dd60" -#define GITAUTH "Andrä_Marie" -#define GITREV 0x3570 -#define GITDATE 0x20180119 +#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3727 +#define GITDATE 0x20180314 #define GITBRANCH "developer" -======= -#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x3458 -#define GITDATE 0x20180312 -#define GITBRANCH "3.1.0-rc" ->>>>>>> 3.1.0 diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index d85227f14..abab2e22b 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 -Revision: 708 -Branch: 3.1.0-rc -Last Changed Author: Erik_Frojdh -Last Changed Rev: 3458 -Last Changed Date: 2018-03-09 12:23:14.000000002 +0100 ./src/Listener.cpp +Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 +Revision: 764 +Branch: developer +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3727 +Last Changed Date: 2018-03-13 10:29:32.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index cbbcf49db..0d471e36c 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x3458 -#define GITDATE 0x20180309 -#define GITBRANCH "3.1.0-rc" +#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3727 +#define GITDATE 0x20180313 +#define GITBRANCH "developer"