89395bd990
merge fix
2022-03-18 12:11:40 +01:00
c1895c4bc8
Merge branch 'developer' into rxacqIndices
2022-03-17 08:48:15 +01:00
7b66466186
Merge branch 'developer' into metadataGeometry
2022-03-17 08:47:34 +01:00
Dhanya Thattil
c9769579e3
Merge pull request #388 from slsdetectorgroup/eiger12
...
eiger 12 bit mode
2022-03-16 16:50:41 +01:00
9c1bc262e5
added geometry to master file
2022-03-16 16:09:50 +01:00
c17914e0a1
split MasterAtrributes into cpp
2022-03-16 15:49:06 +01:00
Dhanya Thattil
0b7c202f98
datastream 10g Receiver ( #401 )
...
* datastream not updated when tengiga enabled in receiver
2022-02-24 16:16:48 +01:00
4db34effda
fixed tests
2022-02-24 11:57:00 +01:00
a1ee681135
- framescaught and frameindex now returns a vector for each port
...
- progress looks at activated or enabled ports, so progress does not stagnate
- (eiger) disable datastreaming also for virtual servers only for 10g
- missing packets also takes care of disabled ports
2022-02-24 11:15:03 +01:00
ab302a5160
hdf5 works
2022-02-18 16:16:46 +01:00
7a607c6dd1
refactored
2022-02-18 16:08:04 +01:00
83ff4ab112
hdf5 doestn work yet, wip
2022-02-18 15:51:54 +01:00
2ba89b8a45
wip
2022-02-16 17:40:30 +01:00
4cfb35c176
receiver 12 bit, wip
2022-02-16 16:53:25 +01:00
29cd944c11
file write disabled by default
2022-02-15 15:34:50 +01:00
83a65f85ab
allowing localhost for virtual server
2022-02-14 10:25:34 +01:00
fa929b138e
Merge branch 'developer' into localhost
2022-02-11 16:24:11 +01:00
bcca99e38c
clearer exceptions to help user fix the issue of localhost not getting mac address
2022-02-09 11:30:34 +01:00
f9a88b0f79
datastream is only for 10g for eiger atm, its mentioned in comments. accordingly handled in receiver. This is better solution, in case it was disabled in 10g, and not possible to set enable in 1g mode, which is given to the receiver
2022-02-07 17:10:31 +01:00
c9fbd7afdf
fix for gettid() only after glibc 2.30
2022-02-07 15:05:57 +01:00
8f2bacfd53
Merge branch 'arping' into eiger_datastream
2022-02-04 10:41:58 +01:00
e8cf366616
review, replacing syscall(sys_gettid) with gettid()
2022-02-04 09:51:49 +01:00
3350e3997e
fixes fromreview
2022-02-04 08:19:46 +01:00
bc4cf95d0e
merge fix
2022-02-03 13:03:40 +01:00
97417737b6
removing the assumption that udpip1 fill be updated along with udpip2
2022-02-03 12:53:07 +01:00
47c6954044
clean code for thread for arping
2022-02-03 12:14:29 +01:00
7af5d991d9
using ThreadObject, waiting for 1 sec
2022-02-03 10:59:52 +01:00
cace18e535
merge fix
2022-02-03 09:43:06 +01:00
0ed7d1e9b1
receiver suimmary print out more clear when it is deactivated and exception when trying to disable data stream in 10g mode
2022-02-02 15:27:37 +01:00
158719e325
eiger and 2 udpinterfaces
2022-02-01 15:38:15 +01:00
2a63548f40
apring thread added to thread ids
2022-02-01 15:28:32 +01:00
bf83c9b3e2
arping ip and interface from client interface
2022-02-01 14:03:48 +01:00
c236cbf17b
one therad is enough
2022-02-01 12:23:57 +01:00
df6b9e192b
fixes 200% in acquire, instead of currentframeindex in listener (+1 to what it expects) to lastframeindex
2022-02-01 09:43:34 +01:00
ca8a1c046a
wip, thread to start arping
2022-01-31 17:12:32 +01:00
a771c56f6f
fix progress
2022-01-28 16:35:51 +01:00
80c1c6428a
fix
2022-01-28 16:16:18 +01:00
b5070f384a
Merge branch 'developer' into rxframeindex
2022-01-28 16:09:48 +01:00
Erik Fröjdh
f6e76145c1
Make a library for writing and reading tiff, added tests ( #347 )
...
* removed Makefile for moench and integrated the build in CMake
* broke out tiff reading and writing to its own library
* moved tiff includes to include/sls
* moved tiffio source to src
* removed incorrectly used bps
* cleanup and tests for tiffio
* removed using namespace std from header
* some fixing for moench04
* Program for offline processing renamed
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2022-01-27 10:24:02 +01:00
28fe6eadb5
progress also depends on listener index now
2022-01-26 17:35:31 +01:00
0d0429983b
Merge branch 'developer' into rxframeindex
2022-01-26 14:42:55 +01:00
bf43b003b6
using xy instead of portGeometry
2022-01-24 15:42:25 +01:00
6c0356ff90
merge with developer
2022-01-24 11:39:13 +01:00
Erik Frojdh
c554bbb2d3
formatted slsDetectorCalibration
2022-01-24 11:26:56 +01:00
5f40e32924
rxr: frame number should be forwarded to caught frame number for discard partial frames or discardemptyframe mode, currentframeindex command should point to listener current frame index and not dataprocessors index
2022-01-21 14:46:38 +01:00
a41b6f73d4
merge from developer
2022-01-17 11:58:22 +01:00
fd655437ab
gui doesnt work, but ports fixed
2022-01-07 12:51:49 +01:00
88869c1746
some more fixes for eiger 2 udp interface
2022-01-07 12:44:32 +01:00
c92d0e5ee2
minor
2022-01-07 08:57:31 +01:00
549fef5680
fixed warnings
2022-01-07 08:54:20 +01:00
