Commit Graph

340 Commits

Author SHA1 Message Date
Dhanya Thattil
fcc7f7aef8 Rx roi (#428)
* roi structure expanded to have ymin and ymax

* compile with 'detector roi'

* wip

* wip, rx_roi, rx_clearroi

* wip rxroi

* rxroi wip

* wip rxroi

* merge fix

* wip

* rx_roi works, impl wip, test

* tests in, impl left

* wip, rxroi impl

* wip, rxroi impl

* wip

* setrx_Roi works, getrx_roi, wip

* rx_roi impl done

* wip, rxroi

* wip, getrx_roi rxr ports

* fix ports

* wip

* wip

* fix positions on server side

* wip

* numports wip

* wip

* jungfrau top inner interface row increment

* x, y detpos, wip

* removed eiger row indices flipping in gui (bottom flipping maintained)

* wip

* wip, jungfrau numinterfaces2

* jungfrau virtual works

* eiger, jungfrau, g2 virtual server works

* eiger positions fix, wip

* binaries in

* minor printout

* binaries in

* merge fix

* merge fix

* removing getposition

* setrxroi wip

* set upto port

* get messed, wip

* roi multi to module works, wip

* wip

* roi dont return -1

* added rxroi metadata in master file

* added rxroifromshm, not yet in detector

* rx roi in gui with box, also for gap pixels (gappixels for jungfrau mess)

* fix for segfault in gui with detaching roi box in gui

* wip

* m3 gui: slave timing modes should be discarded when squashing

* fixed m3 virtual data, and fixed counters in gui asthetics

* m3 roi works

* wip, g2

* wip

* handling g225um boards, and showing roi for gainplot as well

* udpate python functions

* fix for 1d and a2d roi written

* fixed actual roi written to file

* no virtual hdf5 when handling rx roi

* test

* minor

* binarie in
2022-05-16 12:35:06 +02:00
Dhanya Thattil
8d6b8d66cc size of shm needs to be only sometimes checked when opening shared memory (#443) 2022-05-16 12:27:48 +02:00
Dhanya Thattil
88649a00b6 M3vtrim min (#454)
* Remove the vtrim min 600 check when setting threshold energy. vth1-3:200 - 2400, others 0-2800

* compile fix
2022-05-12 11:41:05 +02:00
Dhanya Thattil
b122c2fbdf Revert "Remove the vtrim min 600 check when setting threshold energy. vth1-3:200 - 2400, others 0-2800 (#452)" (#453)
This reverts commit 7d574375b4.
2022-05-12 11:38:34 +02:00
Dhanya Thattil
7d574375b4 Remove the vtrim min 600 check when setting threshold energy. vth1-3:200 - 2400, others 0-2800 (#452) 2022-05-12 11:06:14 +02:00
Dhanya Thattil
52882cba20 M3: polarity, interpolation, pump probe (#421)
* wip, adding m3 functions: polarity, inerpolation, pumpprobe

* added interpol, polarity, pump probe, analog pulsing, digital pulsing

* tests

* binaries in

* update release

* added python polarity enum

* fixed python and minor readability in mythen3.c

* binarie sin

* added all the m3 funcs also in list.c and enablingall counters for enabling interpolation

* binarie sin
2022-04-08 15:18:01 +02:00
150d27cf95 removed copydetectorserver 2022-04-05 14:11:04 +02:00
Erik Fröjdh
e55e18d5e9 Refactoring of SharedMemory.h (#418)
Function names match Detector.h
Removed double print due to LOG then throw
file descriptor not kept as a member variable
2022-03-28 16:13:56 +02:00
2453390cc3 merge fix 2022-03-28 09:11:32 +02:00
9ff43efdc5 Merge branch 'developer' into numudp 2022-03-25 10:50:51 +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
c1895c4bc8 Merge branch 'developer' into rxacqIndices 2022-03-17 08:48:15 +01:00
7a39822813 fixes for set top, masterin api 2022-03-16 12:49:22 +01:00
34588356e8 added top 2022-02-28 17:05:24 +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
ef3df36e55 merge fix 2022-02-23 11:40:50 +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
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
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
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
Erik Frojdh
510d8717b5 interpolate vtrim for eiger 2022-02-03 15:21:18 +01:00
6c0356ff90 merge with developer 2022-01-24 11:39:13 +01:00
50c1056eb2 minor 2022-01-20 17:23:41 +01:00
14d10d2f8f fix for slow adcs and any other adcs that went to stop server, but needed control server for configuration of the adc 2022-01-20 17:21:37 +01:00
79affe1ea4 updated client and rxr, not tested 2022-01-06 18:46:14 +01:00
7772eb153d using const for getupdatemode 2021-11-22 15:08:58 +01:00
1c6e33064b minor typo 2021-11-18 15:39:34 +01:00
eb69d7cb69 update mode added. need to fix why udpatemode get and set not in allowed functions 2021-11-12 17:18:26 +01:00
32d664a77d actually writing the server binary from memory to file before linking, sycing, permissions etc 2021-11-10 17:48:18 +01:00
4a8c365447 typo 2021-11-10 17:25:37 +01:00
4b46091be2 python fix, server copy wrong filename 2021-11-10 16:40:14 +01:00
adc6cf214a fixed runtime error with module::sendprogram default servername value 2021-11-10 14:54:42 +01:00
15aa42d328 wip 2021-11-10 10:58:29 +01:00
d9168803ae nios kernel update takes time, simulating 2021-11-09 16:05:47 +01:00
7b4f8c118b client done 2021-11-08 14:26:53 +01:00
d438b53c68 wip 2021-11-04 19:18:10 +01:00
6e49b77b08 updating kernel like program fpga, execute command to print which module failed, unlinking temporary file while programming bug fix 2021-11-03 17:17:24 +01:00
eff64f99f2 addd kernel version 2021-11-03 11:46:46 +01:00
dde62f13d5 fixed bug. setting rx_hostname to none should not throw 2021-10-27 11:29:01 +02:00
146b012eff minor changes 2021-10-27 11:14:29 +02:00
76dc6db5c0 jungfrau: api changed from set/getFilterCell to set/getNumberOfFilterCells, storagecells command line changed to extrastoragecells, fixed wrong numberof arguments parsing message 2021-10-21 11:59:10 +02:00
469d4e5c7c print module number and hostname when tftp error 2021-10-19 10:29:25 +02:00
dac60ad76d added .cpp licenses 2021-10-15 15:47:04 +02:00
4bcc1a24f0 eiger passed 2021-10-08 15:06:09 +02:00
e3e3639829 binaries in and updated api versioning 2021-10-07 19:11:37 +02:00