3201 Commits

Author SHA1 Message Date
Erik Frojdh
13ec32c79a With corrections 2022-03-28 14:30:45 +02:00
039e1fd829 merge fix with developer 2022-03-28 10:26:28 +02:00
2453390cc3 merge fix 2022-03-28 09:11:32 +02:00
Erik Frojdh
4cce1dbd7f added missing files 2022-03-25 15:13:08 +01:00
Erik Frojdh
5c79a1a1e8 Moved to class implementation 2022-03-25 15:08:50 +01:00
9ff43efdc5 Merge branch 'developer' into numudp 2022-03-25 10:50:51 +01:00
Erik Frojdh
b112cf81c4 fixed daclist setter 2022-03-24 17:46:20 +01:00
Erik Frojdh
589124845a working implementation 2022-03-24 17:40:44 +01:00
Dhanya Thattil
2a1f6dc544
Merge pull request #371 from slsdetectorgroup/g225gui
Gotthard25um: gui image
2022-03-23 12:06:27 +01:00
0803f1bc1f help in cmdline, fixed get for daclist in python 2022-03-23 11:27:52 +01:00
9995b74217 added setdaclist in cmd line 2022-03-23 10:53:29 +01:00
Erik Frojdh
2823451c9d Hacky implementation 2022-03-22 16:45:02 +01:00
0f4bcf3a9d test if special file when updating kernel(solution: reboot only), --force-delete-normal-file used to force delete bfin fpga drive if normal file and create proper device tree 2022-03-22 16:44:12 +01:00
2b35101b17 moved shm numUdpInterfaces initialization up front, moved updating this value in DetectorImpl::setHostname to DetectorImpl::addModule for more readability, renamed getNumberofUdpInterfaces to an updateNumberofUdpInterfaces as the shm was being updated and is used only in setHostname, everywhere else getNumberofUdpInterfaces is replaced by getNumberofUdpInterfacesFromShm 2022-03-22 10:23:22 +01:00
89395bd990 merge fix 2022-03-18 12:11:40 +01:00
509946d964 Merge branch 'developer' into g225gui 2022-03-17 11:52:30 +01:00
c1895c4bc8 Merge branch 'developer' into rxacqIndices 2022-03-17 08:48:15 +01:00
ef1c52ddc1 merge conflict fix 2022-03-17 08:46:04 +01:00
39d3ee2b15 merge fix 2022-03-17 08:41:49 +01:00
7a39822813 fixes for set top, masterin api 2022-03-16 12:49:22 +01:00
80d31bbb10 added tests 2022-03-16 11:35:27 +01:00
45171d82a4 minor 2022-03-16 09:56:03 +01:00
ed5a1cdf1c eiger: get nextframenumber for 10g fixed (was connected to 1g registers for get), eiger/jungfrau/ctb/moench: if after a stop the next framenumbers are inconsistent, then it will get their max value andf set to +1 2022-03-15 17:17:28 +01:00
34588356e8 added top 2022-02-28 17:05:24 +01:00
b6d63a8381 master tests 2022-02-28 16:28:15 +01:00
261ac78743 wip 2022-02-28 14:49:02 +01:00
4db34effda fixed tests 2022-02-24 11:57:00 +01:00
5a5d4eadf1 minor 2022-02-24 11:27:29 +01:00
b9016fad12 reverting to normal command parsing for missing packets 2022-02-24 11:26:17 +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
89edf58f41 wip, setmaster 2022-02-23 12:26:37 +01:00
ef3df36e55 merge fix 2022-02-23 11:40:50 +01:00
939fc70284 bug fix in startDetector vector 2022-02-23 10:32:06 +01:00
92beb3aa2a bug fix from an earlier PR, slaves.begin() 2022-02-23 09:32:25 +01:00
543eb7bb60 merge fixed 2022-02-23 09:23:00 +01:00
2b2533f465 allowing setmaster for eiger 2022-02-22 15:23:04 +01:00
8f632db2a0 get number of missing packets now returns signed so negative numbers mean extra packets 2022-02-22 10:27:22 +01:00
daa536077d merge fix 2022-02-21 15:14:47 +01:00
5e97bcde7f startdetector (non blocking) is allowed at modular level 2022-02-21 09:42:24 +01:00
4107938921 adding 12 bit mode for eiger, WIP 2022-02-16 15:03:25 +01:00
83a65f85ab allowing localhost for virtual server 2022-02-14 10:25:34 +01:00
a1888bf7c9 Merge branch 'developer' into g225gui 2022-02-11 16:24:36 +01:00
fa929b138e Merge branch 'developer' into localhost 2022-02-11 16:24:11 +01:00
7e5e9faf1c Merge branch 'developer' into datastreamFix 2022-02-11 16:22:55 +01:00
e8ededc1d1 fixes 2022-02-09 11:56:57 +01:00
2cf539c16e reg for m3 is reserved only for gaincaps and not settings. Fixed in set threshold and setall threshold 2022-02-09 11:53:18 +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
753387c34c gotthard type can only have max 2 modules 2022-02-04 13:29:42 +01:00
Dhanya Thattil
771b1e7877
rx_arping for 10g mode (#359)
* test for rx_arping

* arping ip and interface from client interface

* apring thread added to thread ids

* clean code for thread for arping

* removing the assumption that udpip1 fill be updated along with udpip2

* review, replacing syscall(sys_gettid) with gettid()
2022-02-04 10:12:57 +01:00