562 Commits

Author SHA1 Message Date
Dhanya Thattil
22b9562629
G2hdi (#510)
* g2: new hdi values, write hdi value to reg, set slave/master to reg, able to set master from server config file, server command line and client

* print versions for virtual as well
2022-08-16 09:31:13 +02:00
Dhanya Thattil
6bf9dbf6d3
Format (#506)
Formatted package
2022-08-05 15:39:34 +02:00
Dhanya Thattil
8fcec81a67
Pattern 6 levels (#493)
* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* python working

* import fix

* changed fw version for ctb and moench. binaries in

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2022-07-14 12:00:07 +02:00
Dhanya Thattil
b6db097800
udp_cleardst in fpga (#490)
* set number of destination in fpga as well when using udp_cleardst

* ensures fpga destinations are also cleared up

* binaries in
2022-07-05 16:09:41 +02:00
Dhanya Thattil
365ac835eb
Get trimbits (#462)
* added the possibility to save settings file for m3 and eiger

* added save trimbits to gui

* update release notes

* python wip

* moved location of trimbits save option in gui

* python works

* updating getModule with all its parameters in the server side

* updating binaries
2022-05-24 11:08:08 +02:00
Dhanya Thattil
73a45e1b5c
nCe made high before programming blackfin to ensure seamless programming (#460) 2022-05-18 12:17:44 +02:00
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
afeee5501c
Fixpositions (#436)
* 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

* pointer bug

* comment to define test_mod_geometry define
2022-04-28 16:32:26 +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
191cfa0abe binaries in 2022-04-04 12:46:14 +02:00
b875a95bd5 binaries in 2022-04-04 12:44:03 +02:00
f0448b3cec binaries in 2022-04-04 12:36:47 +02:00
2453390cc3 merge fix 2022-03-28 09:11:32 +02:00
5fe10c19a1 binarie sin 2022-03-24 09:26:29 +01:00
f538b8b10b binaries in 2022-03-21 15:52:19 +01:00
89395bd990 merge fix 2022-03-18 12:11:40 +01:00
bbfe3b278f binaries in 2022-03-18 12:07:47 +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
fc6c6985e6 binary in 2022-03-16 13:26:28 +01:00
14c63810d6 minor 2022-03-16 13:23:23 +01:00
6f0eebfbb8 fix 2022-03-16 13:18:59 +01:00
c8bed64b91 Merge branch 'setmaster' of github.com:slsdetectorgroup/slsDetectorPackage into setmaster 2022-03-16 13:16:31 +01:00
e1762605e8 fix for eiger server actual detector 2022-03-16 13:16:25 +01:00
62fff64d87 eiger binary in 2022-03-16 12:51:53 +01:00
7a39822813 fixes for set top, masterin api 2022-03-16 12:49:22 +01:00
9e050060f3 eiger binary in 2022-03-15 17:18:56 +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
dd8aebb0ab eiger server binaries 2022-02-28 14:56:40 +01:00
261ac78743 wip 2022-02-28 14:49:02 +01:00
0437bd0584 Wip 2022-02-28 12:28:03 +01:00
5566cfd24f configuing master from command lineg 2022-02-25 16:03:11 +01:00
5869c25658 wip, top, master command line 2022-02-24 17:06:10 +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
219318a52e wip, removed extra virutal server binaries for eiger, --ignore-config for command line 2022-02-23 17:31:46 +01:00
89edf58f41 wip, setmaster 2022-02-23 12:26:37 +01:00
ef3df36e55 merge fix 2022-02-23 11:40:50 +01:00
6695b10354 binaries in 2022-02-23 10:30:05 +01:00
94adba72bf bugfix for 12bit to 16 bit expansion in server 2022-02-23 10:26:37 +01:00
1063e8b929 warnings 2022-02-23 10:09:06 +01:00
c9abeace8f warnings 2022-02-23 10:08:50 +01:00
5bfdbf59a2 warnings 2022-02-23 10:07:00 +01:00
1cd347a54d minor printing 2022-02-23 10:03:23 +01:00
76eb09eb04 binaries in 2022-02-23 09:59:41 +01:00
a936cc26cc bugfix, always 12 dr 2022-02-23 09:58:55 +01:00
543eb7bb60 merge fixed 2022-02-23 09:23:00 +01:00