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

updated for compilation

Browse Source
This commit is contained in:
maliakal_d 2018-03-14 16:19:30 +01:00
parent b58c3e8951
commit dd6301d66d
8 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -7,7 +7,7 @@ Documentation to obtain the binaries via the conda package is available [here.](
### Source code ### Source code
One can also obtain the source code from this repository and compile while realizing the setup dependencies as required. 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 #### Setup dependencies
@ -44,6 +44,9 @@ Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
* -g: Build/Rebuilds only gui<br> * -g: Build/Rebuilds only gui<br>
* -j: Number of threads to compile through<br> * -j: Number of threads to compile through<br>
Basic Option:
./cmk.sh -b
For only make: For only make:
./cmk.sh ./cmk.sh

12
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8
Revision: 452 Revision: 491
Branch: 3.1.0-rc Branch: developer
Last Changed Author: Erik_Frojdh Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3458 Last Changed Rev: 3727
Last Changed Date: 2018-03-09 10:55:40.000000002 +0100 ./src/qTabSettings.cpp Last Changed Date: 2018-03-14 15:24:03.000000002 +0100 ./src/qTabMeasurement.cpp

10
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" #define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8"
#define GITAUTH "Erik_Frojdh" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3458 #define GITREV 0x3727
#define GITDATE 0x20180309 #define GITDATE 0x20180314
#define GITBRANCH "3.1.0-rc" #define GITBRANCH "developer"

19
slsDetectorSoftware/gitInfo.txt
View File

@ -1,18 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
<<<<<<< HEAD Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8
Repsitory UUID: 92b4b3324e09299663b9862bad26b38a3257dd60 Revision: 1842
Revision: 1752
Branch: developer Branch: developer
Last Changed Author: Andrä_Marie Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3570 Last Changed Rev: 3727
Last Changed Date: 2018-01-19 14:14:34.000000002 +0100 ./commonFiles/sls_detector_defs.h Last Changed Date: 2018-03-14 16:10:22.000000002 +0100 ./multiSlsDetector/multiSlsDetector.cpp
=======
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

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -6051,8 +6051,6 @@ void multiSlsDetector::readFrameFromReceiver(){
break; break;
case JUNGFRAU: case JUNGFRAU:
jungfrau = true; jungfrau = true;
maxX = thisMultiDetector->numberOfChannel[X];
maxY = thisMultiDetector->numberOfChannel[Y];
break; break;
default: default:
break; break;

16
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,14 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
<<<<<<< HEAD #define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8"
#define GITREPUUID "92b4b3324e09299663b9862bad26b38a3257dd60" #define GITAUTH "Dhanya_Thattil"
#define GITAUTH "Andrä_Marie" #define GITREV 0x3727
#define GITREV 0x3570 #define GITDATE 0x20180314
#define GITDATE 0x20180119
#define GITBRANCH "developer" #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

12
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8
Revision: 708 Revision: 764
Branch: 3.1.0-rc Branch: developer
Last Changed Author: Erik_Frojdh Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3458 Last Changed Rev: 3727
Last Changed Date: 2018-03-09 12:23:14.000000002 +0100 ./src/Listener.cpp Last Changed Date: 2018-03-13 10:29:32.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp

10
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" #define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8"
#define GITAUTH "Erik_Frojdh" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3458 #define GITREV 0x3727
#define GITDATE 0x20180309 #define GITDATE 0x20180313
#define GITBRANCH "3.1.0-rc" #define GITBRANCH "developer"