Merge branch 'main-rc' into b4.0.1

Merge branch 'main-rc' into b4.0.0
Merge branch 'main-rc' into b3.1.5
2025-06-14 13:57:13 +02:00 · 2020-11-30 17:03:16 +01:00 · 2020-11-30 17:00:57 +01:00 · 2020-11-30 16:58:53 +01:00 · 2020-11-30 16:57:17 +01:00 · 2020-11-30 16:56:01 +01:00
5 changed files with 21 additions and 24 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -41,5 +41,4 @@ deploy:
  provider: script
  script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
  on:
-    branch: 4.0.1-rc
-
+    all_branches: true
--- a/RELEASE.txt
+++ b/RELEASE.txt
@ -123,8 +123,8 @@ This document describes the differences between 4.0.1 and 4.0.0 releases.
                                      09.02.2018 (25 um Slave) 
        Eiger
        =====  
-        Minimum compatible version  : 22
-        Latest compatible version   : 22
+        Minimum compatible version  : 23
+        Latest compatible version   : 23
        
        Jungfrau
        ========       
@ -196,10 +196,6 @@ This document describes the differences between 4.0.1 and 4.0.0 releases.
    Support
    -------

-    General Software related:
        dhanya.thattil@psi.ch
-        anna.bergamaschi@psi.ch
-        
-    Python related:
        erik.frojdh@psi.ch
-
+        anna.bergamaschi@psi.ch
--- a/recipe/copy_lib.sh
+++ b/recipe/copy_lib.sh
@ -6,9 +6,9 @@ mkdir $PREFIX/include/slsDetectorPackage

 #Shared and static libraries
 cp build/bin/libSlsDetector.so $PREFIX/lib/.
-cp build/bin/libSlsDetector.a $PREFIX/lib/.
+# cp build/bin/libSlsDetector.a $PREFIX/lib/.
 cp build/bin/libSlsReceiver.so $PREFIX/lib/.
-cp build/bin/libSlsReceiver.a $PREFIX/lib/.
+# cp build/bin/libSlsReceiver.a $PREFIX/lib/.

 #Binaries
 cp build/bin/sls_detector_acquire $PREFIX/bin/.
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@ -7,7 +7,7 @@ source:
  - path: ..

 build:
-  number: 0
+  number: 1
  rpaths:
    - lib/

--- a/slsDetectorSoftware/CMakeLists.txt
+++ b/slsDetectorSoftware/CMakeLists.txt
@ -23,18 +23,18 @@ set(HEADERS
 )

 include_directories(
-commonFiles
-multiSlsDetector 
-sharedMemory
-slsDetector 
-slsDetectorUtils 
-slsDetectorCommand 
-slsDetectorAnalysis 
-slsReceiverInterface 
-threadFiles
-usersFunctions 
-../slsReceiverSoftware/include 
-../slsReceiverSoftware/MySocketTCP 
+    commonFiles
+    multiSlsDetector 
+    sharedMemory
+    slsDetector 
+    slsDetectorUtils 
+    slsDetectorCommand 
+    slsDetectorAnalysis 
+    slsReceiverInterface 
+    threadFiles
+    usersFunctions 
+    ../slsReceiverSoftware/include 
+    ../slsReceiverSoftware/MySocketTCP 
 )

 add_definitions(
@ -69,6 +69,8 @@ set(PUBLICHEADERS
    multiSlsDetector/multiSlsDetector.h
    slsReceiverInterface/receiverInterface.h
    ../slsReceiverSoftware/include/sls_receiver_exceptions.h
+    slsDetector/slsDetectorUsers.h
+    ../slsReceiverSoftware/include/slsReceiverUsers.h
 )
 set_target_properties(slsDetectorShared PROPERTIES
    LIBRARY_OUTPUT_NAME SlsDetector
Author	SHA1	Message	Date
Dhanya Thattil	835e62425f	Merge branch 'main-rc' into b4.0.1	2020-11-30 17:03:16 +01:00
Dhanya Thattil	c8cdbfc488	Merge branch 'main-rc' into b4.0.0	2020-11-30 17:00:57 +01:00
Dhanya Thattil	2f75143245	Merge branch 'main-rc' into b3.1.5	2020-11-30 16:58:53 +01:00
Dhanya Thattil	6f7c31b747	Merge branch 'main-rc' into b3.1.4	2020-11-30 16:57:17 +01:00
Dhanya Thattil	75c2d987c4	Merge branch 'main-rc' into b3.1.3	2020-11-30 16:56:01 +01:00
Dhanya Thattil	726f5eba29	Merge branch 'main-rc' into b3.1.2	2020-11-30 16:54:56 +01:00
Dhanya Thattil	4404ee717a	Merge branch 'main-rc' into b3.1.1	2020-11-30 16:52:52 +01:00
Dhanya Thattil	54530ab103	Merge branch 'main-rc' into b3.1.0	2020-11-30 16:50:15 +01:00
Dhanya Thattil	6126780660	Merge branch 'main-rc' into b3.0.1	2020-11-30 16:45:00 +01:00
Dhanya Thattil	9b7f9b1be1	Merge branch 'main-rc' into b3.0.0	2020-11-30 16:42:35 +01:00
Dhanya Thattil	26c829d766	Merge branch 'main-rc' into b2.3.4	2020-11-30 16:38:04 +01:00
Dhanya Thattil	3fde5c5b55	Merge branch 'main-rc' into b2.3.3	2020-11-30 16:36:24 +01:00
Dhanya Thattil	3e5f546ebe	Merge branch 'main-rc' into b2.3.2	2020-11-30 16:26:44 +01:00
Dhanya Thattil	9833a7d330	Merge branch 'main-rc' into b2.3.1	2020-11-30 16:25:23 +01:00
Dhanya Thattil	8f9155e578	Merge branch 'main-rc' into b2.3.0	2020-11-30 16:23:50 +01:00
Dhanya Thattil	9df1eac3c1	Merge branch 'main-rc' into b2.2.0	2020-11-30 15:46:45 +01:00
Dhanya Thattil	5ededf9be4	Merge branch 'main-rc' into b2.1.1	2020-11-30 15:16:57 +01:00
Dhanya Thattil	3e8774798a	Merge branch 'main-rc' into b2.1.0	2020-11-30 15:13:43 +01:00
Dhanya Thattil	3dce1e46f9	Merge branch 'main' into test	2020-11-20 14:25:45 +01:00
Dhanya Thattil	08ecc1e52d	Merge branch 'main' into test	2020-11-20 14:24:14 +01:00
Dhanya Thattil	8c1974b34e	Merge branch 'main' into test	2020-11-20 14:13:20 +01:00
Dhanya Thattil	d89d349247	Merge branch 'main' into test	2020-11-20 14:10:35 +01:00
Dhanya Thattil	910961cf41	Merge branch 'main' into test	2020-11-20 14:05:53 +01:00
Dhanya Thattil	595b7aa5e8	Merge branch 'main' into test	2020-11-20 14:03:36 +01:00
Dhanya Thattil	f72ad4326f	Merge branch 'main' into test	2020-11-20 14:00:47 +01:00
Dhanya Thattil	2306e44ae3	Merge branch 'main' into test	2020-11-20 13:02:36 +01:00
Dhanya Thattil	e7eee67fed	Update RELEASE.txt	2019-06-13 11:44:43 +02:00
Dhanya Thattil	f36a12e454	Release Notes typo: jungfrau min exptime is 50ns and not 50 us (#16 )	2019-05-02 15:28:03 +02:00
Erik Frojdh	d7ce5fedfd	path	2019-02-12 15:06:15 +01:00
Erik Frojdh	3a2682ffe7	missing headers updated build number	2019-02-12 14:46:56 +01:00
Erik Frojdh	bf74a4135e	travis	2019-02-11 10:25:58 +01:00
Erik Frojdh	252ecf2769	travis	2019-02-11 10:15:57 +01:00
Erik Frojdh	de01ab75e9	travis	2019-02-11 09:24:39 +01:00
Erik Frojdh	5698da5f95	added conda recipe	2018-12-12 16:33:25 +01:00
Dhanya Thattil	7300d73675	udpate release	2018-11-30 15:34:15 +01:00
Dhanya Thattil	d4b467a641	update	2018-11-30 15:31:22 +01:00
Dhanya Thattil	7b71076180	update	2018-11-30 15:28:35 +01:00
Dhanya Thattil	9197d2b209	updated revisions	2018-11-30 15:27:39 +01:00
Dhanya Thattil	e094e41d89	updated releases.txt	2018-11-30 15:24:43 +01:00
Dhanya Thattil	512e1a3136	users bug fix:getting id(version) for single/multi detector, added resetframescaught in users	2018-11-30 14:39:01 +01:00
Dhanya Thattil	6d04c14bd6	users: added stopped to getrunstatus list	2018-11-30 11:35:31 +01:00
Dhanya Thattil	64183d8d6a	gotthard server bug fix: updated a register for token timing for revision 2 boards	2018-11-30 11:27:06 +01:00
Dhanya Thattil	287efde54a	Update RELEASE.txt	2018-08-17 18:01:13 +02:00
Dhanya Thattil	faa25b9e9f	updated versioning	2018-08-17 17:57:53 +02:00
Dhanya Thattil	1b92b01a46	slsreceiver: removed warnings	2018-08-16 17:42:59 +02:00
Dhanya Thattil	4849063b6c	client: unnecessary print while programming fpga	2018-08-16 12:21:26 +02:00
Dhanya Thattil	5cd020ae81	updated release.txt	2018-08-03 12:25:58 +02:00
Dhanya Thattil	160fabe02c	slsDetectorSoftware: connect stop socket as well to confirm detector on line, also to prevent fclose closing socket 0 (if it never connected to stop socket). Future releases can use exception instead of using socketDescriptor 0 value to validate succesful constructor	2018-08-03 12:21:35 +02:00
Dhanya Thattil	90dd8e70e5	updated release.txt	2018-07-30 16:56:39 +02:00
Dhanya Thattil	08e121c71f	slsDetectorSoftware: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values	2018-07-30 16:49:15 +02:00
Dhanya Thattil	cb3b337a99	updated binary	2018-07-26 13:49:18 +02:00
Dhanya Thattil	5d9a952316	updated release.txt	2018-07-26 13:16:34 +02:00
Dhanya Thattil	8cc05c5848	gotthard server and slsDetectorSoftware: more accuracy when converting from double to int64_t by adding 0.5, improved clock precision of gotthard from 32.1 to 32.007729	2018-07-26 11:47:55 +02:00
Dhanya Thattil	d69d69e892	Merge branch '3.1.4-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.4-rc	2018-07-23 14:57:56 +02:00
Dhanya Thattil	07a120fc4a	slsDetectorSoftware: users class setsettings(-1) gave undefined settings from slsDetector::setSettings. It has been fixed.	2018-07-23 14:57:27 +02:00
Dhanya Thattil	11e8796847	slsReceiver: HDF5: printError obsolete since hdf51.10.2 and so using printErrorStack()	2018-07-18 12:53:52 +02:00
Dhanya Thattil	f79b009978	updated release txt	2018-07-17 14:42:49 +02:00
Dhanya Thattil	3259bfb008	slsReceiver: HDF5: absolute to relative linking	2018-07-17 14:23:32 +02:00
Dhanya Thattil	934bc5b9db	slsReceiver HDF5: unlimited x dimension (#images) by extending by numImages if caught more images, fixed virtual mapping, fixed linking for jungfrau single module (removed virtual_ in all namings	2018-07-17 14:07:23 +02:00
Dhanya Thattil	6d11faed87	updated binaries	2018-06-28 15:32:53 +02:00
Dhanya Thattil	35fc52dae7	3.1.3: Bug fix: jungfrau server: delay after trigger always set to 5 seconds	2018-06-28 15:31:09 +02:00
Dhanya Thattil	e599bfe56f	updating br versioning --version for binaries	2018-06-12 12:26:30 +02:00
Dhanya Thattil	764becc271	updated release.txt	2018-06-12 12:23:24 +02:00
Dhanya Thattil	7462d1002d	bug fix for memory leak for every multi threading command when using API	2018-06-12 12:17:30 +02:00
Dhanya Maliakal	834794ad98	gotthard renamed binaries	2017-12-19 18:04:44 +01:00
Dhanya Maliakal	56c504abbb	Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4	2017-12-12 11:14:19 +01:00
Dhanya Maliakal	4d6346e678	Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3	2017-12-12 11:14:15 +01:00
Dhanya Maliakal	dc7e448759	Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2	2017-12-12 11:14:12 +01:00
Dhanya Maliakal	e658cbacda	Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1	2017-12-12 11:14:08 +01:00
Dhanya Maliakal	1e6c6dea71	Merge remote branch 'slsDetectorCalibration/2.3' into 2.3	2017-12-12 11:14:05 +01:00
Dhanya Maliakal	0e5d4d1d8e	Merge remote branch 'slsDetectorCalibration/2.2' into 2.2	2017-12-12 11:14:01 +01:00
Dhanya Maliakal	a2986784d3	Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1	2017-12-12 11:13:34 +01:00
Dhanya Maliakal	975cbb576e	Merge remote branch 'slsDetectorCalibration/2.1' into 2.1	2017-12-12 11:06:15 +01:00
Dhanya Maliakal	e48a92d9cd	Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5	2017-12-12 11:02:57 +01:00
Dhanya Maliakal	befdcf7f36	Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4	2017-12-04 16:48:01 +01:00
Dhanya Maliakal	02f5c472a8	Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4	2017-12-04 16:48:00 +01:00
Dhanya Maliakal	75ed2cd2e4	Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4	2017-12-04 16:47:59 +01:00
Dhanya Maliakal	3be045f9b6	Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3	2017-12-04 16:47:54 +01:00
Dhanya Maliakal	8fae982802	Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3	2017-12-04 16:47:54 +01:00
Dhanya Maliakal	128ec88b5f	Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3	2017-12-04 16:47:52 +01:00
Dhanya Maliakal	d5fc158330	Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2	2017-12-04 16:47:47 +01:00
Dhanya Maliakal	864e6e4c81	Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2	2017-12-04 16:47:47 +01:00
Dhanya Maliakal	343d96ff16	Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2	2017-12-04 16:47:46 +01:00
Dhanya Maliakal	4142328437	Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1	2017-12-04 16:47:41 +01:00
Dhanya Maliakal	6c797988c7	Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:41 +01:00
Dhanya Maliakal	215c262981	Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:39 +01:00
Dhanya Maliakal	081b809078	Merge remote branch 'slsDetectorGui/2.3' into 2.3	2017-12-04 16:47:35 +01:00
Dhanya Maliakal	9263567cd8	Merge remote branch 'slsReceiverSoftware/2.3' into 2.3	2017-12-04 16:47:34 +01:00
Dhanya Maliakal	58e90a85be	Merge remote branch 'slsDetectorSoftware/2.3' into 2.3	2017-12-04 16:47:33 +01:00
Dhanya Maliakal	025c836e25	Merge remote branch 'slsDetectorGui/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	5d5abae3f4	Merge remote branch 'slsReceiverSoftware/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	e2ad46386e	Merge remote branch 'slsDetectorSoftware/2.2' into 2.2	2017-12-04 16:47:26 +01:00
Dhanya Maliakal	308d44e452	Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	69da61b1fb	Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	460168ce04	Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:21 +01:00
Dhanya Maliakal	4e429c0d77	Merge remote branch 'slsDetectorGui/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	bf4fab549d	Merge remote branch 'slsReceiverSoftware/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	f7705eb1da	Merge remote branch 'slsDetectorSoftware/2.1' into 2.1	2017-12-04 16:45:32 +01:00
Dhanya Maliakal	a2217e2066	Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5	2017-12-04 15:33:33 +01:00
Dhanya Maliakal	aaa02706fc	Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5	2017-12-04 15:31:52 +01:00
Dhanya Maliakal	6a80bc5b54	new feature, set threshold without uploading trimbits	2017-06-27 13:00:38 +02:00
Dhanya Maliakal	b9275646ad	crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later	2017-04-27 14:05:04 +02:00
Dhanya Maliakal	9e2f2697c7	crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later	2017-04-27 13:58:25 +02:00
Dhanya Maliakal	b6b0df62b6	updaterev	2017-04-20 08:26:29 +02:00
Dhanya Maliakal	0ba537e479	removed headersize compile error	2017-04-20 08:26:16 +02:00
Dhanya Maliakal	75ddf535dc	updaterev	2017-04-19 17:59:53 +02:00
Dhanya Maliakal	b1de501bef	updaterev	2017-04-19 17:59:46 +02:00
Dhanya Maliakal	0f3a63f101	changed zmq default port starting at 40001 to be able to view in wireshark and removed headersize for warning	2017-04-19 17:42:38 +02:00
Dhanya Maliakal	3b4b2d707f	changes without ostringstream done	2017-04-19 10:17:39 +02:00
Dhanya Maliakal	f405aa1733	split zmq_msg_t so its not reused	2017-04-19 10:17:30 +02:00
Dhanya Maliakal	df0fdb7ecb	changes without ostringstream done	2017-04-19 10:16:45 +02:00
Dhanya Maliakal	91b7a87557	just started changin frm ostringstream	2017-04-18 15:32:01 +02:00
Dhanya Maliakal	9468b9ca1e	updaterev	2017-04-11 13:39:59 +02:00
Dhanya Maliakal	d7982e178e	updaterev	2017-04-11 13:39:53 +02:00
Dhanya Maliakal	9cf5714a5b	removing warnings shown from esrf debian	2017-04-11 13:39:35 +02:00
Dhanya Maliakal	0c9ac8911a	removing warnings shown from esrf debian	2017-04-11 13:39:28 +02:00
Dhanya Maliakal	4730c8c0a9	updaterev	2017-04-11 13:31:49 +02:00
Dhanya Maliakal	43efb8acfd	removing warnings shown from esrf debian	2017-04-11 13:31:32 +02:00
Dhanya Maliakal	6ecca8fcb0	updaterev	2017-04-11 09:03:26 +02:00
Dhanya Maliakal	17cb63a57f	updaterev	2017-04-11 09:03:19 +02:00
Dhanya Maliakal	4f83fcb001	updaterev	2017-04-11 09:02:10 +02:00
Dhanya Maliakal	ab94af6d29	removed verbose etc	2017-04-07 15:08:40 +02:00
Dhanya Maliakal	7c725cc69b	.c_str() must not access global variables from thread	2017-04-07 14:57:19 +02:00
Dhanya Maliakal	f0198d2d2e	alejandro's changes from ESRF	2017-04-07 14:50:17 +02:00
Dhanya Maliakal	5ddccbdee4	changed all -lpthread to -pthread	2017-04-07 14:28:00 +02:00
Dhanya Maliakal	8fb39b8c7e	changed all -lpthread to -pthread	2017-04-07 14:27:27 +02:00
Dhanya Maliakal	bd5293f4b1	changed all -lpthread to -pthread	2017-04-07 14:26:09 +02:00
Dhanya Maliakal	b91180f5b2	changed all -lpthread to -pthread	2017-04-07 14:26:03 +02:00
Dhanya Maliakal	7c3b5065a5	changed all -lpthread to -pthread	2017-04-07 14:25:09 +02:00
Dhanya Maliakal	9aef802bea	changed all -lpthread to -pthread	2017-04-07 14:24:49 +02:00
Dhanya Maliakal	f7d85231f2	solved warnings except sscanf for uint64_t	2017-04-07 14:12:21 +02:00
Dhanya Maliakal	5b3a911e8d	solved warnings except sscanf for uint64_t	2017-04-07 14:11:34 +02:00
Dhanya Maliakal	65f5e1c1ab	strtok is not thread safe..used to set receiver udp ip etc to detector, fixed	2017-04-06 15:04:33 +02:00
Dhanya Maliakal	839896c7e6	fixed the print file packet loss progress bug	2016-10-19 15:53:26 +02:00
Dhanya Maliakal	4a7e246604	removed asking only 1 for framescaugh	2016-10-19 10:21:29 +02:00
Dhanya Maliakal	7f293115c4	moved f_activate to receiver funcs from detectors funcs	2016-10-10 08:43:18 +02:00
Dhanya Maliakal	f59f40a659	ask only 1 for frames caught for 9m	2016-10-10 08:41:03 +02:00
Dhanya Maliakal	64fd82f92c	fixed bug in gui that overwrites the individual sls file path values with the multi value, included a febl and febr temp read	2016-10-10 08:39:46 +02:00
Dhanya Maliakal	cd232fd732	fixed bug in gui that overwrites the individual sls file path values with the multi value	2016-10-10 08:17:34 +02:00
Dhanya Maliakal	172fa66b1f	hotfix for memory leak in server	2016-08-18 11:57:36 +02:00