|
|
4404ee717a
|
Merge branch 'main-rc' into b3.1.1
|
2020-11-30 16:52:52 +01:00 |
|
|
|
54530ab103
|
Merge branch 'main-rc' into b3.1.0
|
2020-11-30 16:50:15 +01:00 |
|
|
|
6126780660
|
Merge branch 'main-rc' into b3.0.1
|
2020-11-30 16:45:00 +01:00 |
|
|
|
9b7f9b1be1
|
Merge branch 'main-rc' into b3.0.0
|
2020-11-30 16:42:35 +01:00 |
|
|
|
26c829d766
|
Merge branch 'main-rc' into b2.3.4
|
2020-11-30 16:38:04 +01:00 |
|
|
|
3fde5c5b55
|
Merge branch 'main-rc' into b2.3.3
|
2020-11-30 16:36:24 +01:00 |
|
|
|
3e5f546ebe
|
Merge branch 'main-rc' into b2.3.2
|
2020-11-30 16:26:44 +01:00 |
|
|
|
9833a7d330
|
Merge branch 'main-rc' into b2.3.1
|
2020-11-30 16:25:23 +01:00 |
|
|
|
8f9155e578
|
Merge branch 'main-rc' into b2.3.0
|
2020-11-30 16:23:50 +01:00 |
|
|
|
9df1eac3c1
|
Merge branch 'main-rc' into b2.2.0
|
2020-11-30 15:46:45 +01:00 |
|
|
|
5ededf9be4
|
Merge branch 'main-rc' into b2.1.1
|
2020-11-30 15:16:57 +01:00 |
|
|
|
3e8774798a
|
Merge branch 'main-rc' into b2.1.0
|
2020-11-30 15:13:43 +01:00 |
|
|
|
595b7aa5e8
|
Merge branch 'main' into test
|
2020-11-20 14:03:36 +01:00 |
|
|
|
f72ad4326f
|
Merge branch 'main' into test
|
2020-11-20 14:00:47 +01:00 |
|
|
|
2306e44ae3
|
Merge branch 'main' into test
|
2020-11-20 13:02:36 +01:00 |
|
|
|
834794ad98
|
gotthard renamed binaries
|
2017-12-19 18:04:44 +01:00 |
|
|
|
56c504abbb
|
Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4
|
2017-12-12 11:14:19 +01:00 |
|
|
|
4d6346e678
|
Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3
|
2017-12-12 11:14:15 +01:00 |
|
|
|
dc7e448759
|
Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2
|
2017-12-12 11:14:12 +01:00 |
|
|
|
e658cbacda
|
Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1
|
2017-12-12 11:14:08 +01:00 |
|
|
|
1e6c6dea71
|
Merge remote branch 'slsDetectorCalibration/2.3' into 2.3
|
2017-12-12 11:14:05 +01:00 |
|
|
|
0e5d4d1d8e
|
Merge remote branch 'slsDetectorCalibration/2.2' into 2.2
|
2017-12-12 11:14:01 +01:00 |
|
|
|
a2986784d3
|
Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1
|
2017-12-12 11:13:34 +01:00 |
|
|
|
975cbb576e
|
Merge remote branch 'slsDetectorCalibration/2.1' into 2.1
|
2017-12-12 11:06:15 +01:00 |
|
|
|
e48a92d9cd
|
Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5
|
2017-12-12 11:02:57 +01:00 |
|
|
|
befdcf7f36
|
Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4
|
2017-12-04 16:48:01 +01:00 |
|
|
|
02f5c472a8
|
Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:48:00 +01:00 |
|
|
|
75ed2cd2e4
|
Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:47:59 +01:00 |
|
|
|
3be045f9b6
|
Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
|
|
8fae982802
|
Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
|
|
128ec88b5f
|
Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:52 +01:00 |
|
|
|
d5fc158330
|
Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
|
|
864e6e4c81
|
Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
|
|
343d96ff16
|
Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:46 +01:00 |
|
|
|
4142328437
|
Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
|
|
6c797988c7
|
Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
|
|
215c262981
|
Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:39 +01:00 |
|
|
|
081b809078
|
Merge remote branch 'slsDetectorGui/2.3' into 2.3
|
2017-12-04 16:47:35 +01:00 |
|
|
|
9263567cd8
|
Merge remote branch 'slsReceiverSoftware/2.3' into 2.3
|
2017-12-04 16:47:34 +01:00 |
|
|
|
58e90a85be
|
Merge remote branch 'slsDetectorSoftware/2.3' into 2.3
|
2017-12-04 16:47:33 +01:00 |
|
|
|
025c836e25
|
Merge remote branch 'slsDetectorGui/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
|
|
5d5abae3f4
|
Merge remote branch 'slsReceiverSoftware/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
|
|
e2ad46386e
|
Merge remote branch 'slsDetectorSoftware/2.2' into 2.2
|
2017-12-04 16:47:26 +01:00 |
|
|
|
308d44e452
|
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
|
|
69da61b1fb
|
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
|
|
460168ce04
|
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:21 +01:00 |
|
|
|
4e429c0d77
|
Merge remote branch 'slsDetectorGui/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
|
|
bf4fab549d
|
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
|
|
f7705eb1da
|
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
|
2017-12-04 16:45:32 +01:00 |
|
|
|
a2217e2066
|
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:33:33 +01:00 |
|
|
|
aaa02706fc
|
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:31:52 +01:00 |
|
|
|
6a80bc5b54
|
new feature, set threshold without uploading trimbits
|
2017-06-27 13:00:38 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b6b0df62b6
|
updaterev
|
2017-04-20 08:26:29 +02:00 |
|
|
|
0ba537e479
|
removed headersize compile error
|
2017-04-20 08:26:16 +02:00 |
|
|
|
75ddf535dc
|
updaterev
|
2017-04-19 17:59:53 +02:00 |
|
|
|
b1de501bef
|
updaterev
|
2017-04-19 17:59:46 +02:00 |
|
|
|
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 |
|
|
|
3b4b2d707f
|
changes without ostringstream done
|
2017-04-19 10:17:39 +02:00 |
|
|
|
f405aa1733
|
split zmq_msg_t so its not reused
|
2017-04-19 10:17:30 +02:00 |
|
|
|
df0fdb7ecb
|
changes without ostringstream done
|
2017-04-19 10:16:45 +02:00 |
|
|
|
91b7a87557
|
just started changin frm ostringstream
|
2017-04-18 15:32:01 +02:00 |
|
|
|
9468b9ca1e
|
updaterev
|
2017-04-11 13:39:59 +02:00 |
|
|
|
d7982e178e
|
updaterev
|
2017-04-11 13:39:53 +02:00 |
|
|
|
9cf5714a5b
|
removing warnings shown from esrf debian
|
2017-04-11 13:39:35 +02:00 |
|
|
|
0c9ac8911a
|
removing warnings shown from esrf debian
|
2017-04-11 13:39:28 +02:00 |
|
|
|
4730c8c0a9
|
updaterev
|
2017-04-11 13:31:49 +02:00 |
|
|
|
43efb8acfd
|
removing warnings shown from esrf debian
|
2017-04-11 13:31:32 +02:00 |
|
|
|
6ecca8fcb0
|
updaterev
|
2017-04-11 09:03:26 +02:00 |
|
|
|
17cb63a57f
|
updaterev
|
2017-04-11 09:03:19 +02:00 |
|
|
|
4f83fcb001
|
updaterev
|
2017-04-11 09:02:10 +02:00 |
|
|
|
ab94af6d29
|
removed verbose etc
|
2017-04-07 15:08:40 +02:00 |
|
|
|
7c725cc69b
|
.c_str() must not access global variables from thread
|
2017-04-07 14:57:19 +02:00 |
|
|
|
f0198d2d2e
|
alejandro's changes from ESRF
|
2017-04-07 14:50:17 +02:00 |
|
|
|
5ddccbdee4
|
changed all -lpthread to -pthread
|
2017-04-07 14:28:00 +02:00 |
|
|
|
8fb39b8c7e
|
changed all -lpthread to -pthread
|
2017-04-07 14:27:27 +02:00 |
|
|
|
bd5293f4b1
|
changed all -lpthread to -pthread
|
2017-04-07 14:26:09 +02:00 |
|
|
|
b91180f5b2
|
changed all -lpthread to -pthread
|
2017-04-07 14:26:03 +02:00 |
|
|
|
7c3b5065a5
|
changed all -lpthread to -pthread
|
2017-04-07 14:25:09 +02:00 |
|
|
|
9aef802bea
|
changed all -lpthread to -pthread
|
2017-04-07 14:24:49 +02:00 |
|
|
|
f7d85231f2
|
solved warnings except sscanf for uint64_t
|
2017-04-07 14:12:21 +02:00 |
|
|
|
5b3a911e8d
|
solved warnings except sscanf for uint64_t
|
2017-04-07 14:11:34 +02:00 |
|
|
|
65f5e1c1ab
|
strtok is not thread safe..used to set receiver udp ip etc to detector, fixed
|
2017-04-06 15:04:33 +02:00 |
|
|
|
839896c7e6
|
fixed the print file packet loss progress bug
|
2016-10-19 15:53:26 +02:00 |
|
|
|
4a7e246604
|
removed asking only 1 for framescaugh
|
2016-10-19 10:21:29 +02:00 |
|
|
|
7f293115c4
|
moved f_activate to receiver funcs from detectors funcs
|
2016-10-10 08:43:18 +02:00 |
|
|
|
f59f40a659
|
ask only 1 for frames caught for 9m
|
2016-10-10 08:41:03 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
172fa66b1f
|
hotfix for memory leak in server
|
2016-08-18 11:57:36 +02:00 |
|
