8600 Commits

Author SHA1 Message Date
Erik Fröjdh
3d3e70c718
added defines for python (#498) 2022-07-14 10:07:26 +02:00
Dhanya Thattil
f1051246ad
Configfree (#492)
* prevent mem size check before Detector constructed (for loading config files), allowing freeing shm for submodules

* back to not allowing free submodules - consistency issues
2022-07-12 11:01:44 +02:00
Dhanya Thattil
0fc76a81b0
Zmqhint (#495)
* sorted the arguments of cmk.sh

* sorted arguments

* sorting arguments

* added q for zmq hint
2022-07-12 11:01:00 +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.06.dev0
2022-07-05 16:09:41 +02:00
c414d92b86 help script to update submodule 2022-07-05 14:52:23 +02:00
0358838dfb fixed ctb gui for namespace fix 2022-07-05 11:29:23 +02:00
aa93aed4ed updated client versioning 2022-06-09 13:50:41 +02:00
Dhanya Thattil
5490daa0a1
storagecells not updated in rx and allowing it in idle mode (#485) 2022-06-09 13:42:18 +02:00
Dhanya Thattil
8ca8185d41
H5 one dataset name (#484)
* rename all datasets in hdf5 files to just 'data'

* removing the global qualifier H5

* update release notes
2022-06-09 12:35:33 +02:00
Dhanya Thattil
89aa0760c6
Hdf5fix (#483)
* hdf5 fix for string reference

* fix hdf5 compilation after namespace change
2022-06-09 11:42:32 +02:00
Dhanya Thattil
3cee36a3db
gui hv moved to settings tab from developer tab, allowed also for eiger (#482) 2022-06-08 17:06:08 +02:00
Dhanya Thattil
364e0c6268
Udp srcip auto (#480)
* able to set udp_srcip and udp_srcip2 to auto

* minor

* minor
2022-06-08 12:26:49 +02:00
Dhanya Thattil
728cb35c37
rxMemsize (#479)
* changing fifo header size to 16 to fix the rxr header (112) to be a power of 2 to make it more efficient and reduce packet loss

* release notes
2022-06-08 12:03:13 +02:00
Dhanya Thattil
1fb90ab98c
M3threshold (#475)
* vicin default changed to 800, only setting vthx directly allows to set dac even if counter disabled, else disable counter, setallthresholdenergy if an energy is -1, get module value, fix that reg was repaced by isettings

* vth3 disabled for interpolation enable, interpolation disable sets counter mask to what it was before (updating old mask whn setting counter mask except for setting all counters for interpolation enable) and enabling vth3 if counter was enabled

* refactor and test for previous commit

* pump probe only has vth2 enabled, handles both pump probe mode and interpolation mode as well

* wip

* refactored pump probe and interpolation and added to setmodule

* check dacs and trimbits out of range for setmodule (not just threshold)

* binaries in

* m3: pump probe and interpolation mutually exclusive

* minor
2022.06.07.dev0
2022-06-07 16:55:33 +02:00
Dhanya Thattil
25b5b02302
m3 and g2: change in system clock (clkdiv2) should also change the time settings(exptime, period, gate delay etc.), g2: sys freq same irrespective of external or internal timing source (#470) 2022-06-02 11:02:10 +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
d61741c28b
tests add to namespace sls (#466)
* tests add to namespace sls

* fixed for tests

* finish up namespace sls for tests
2022-05-23 16:17:32 +02:00
Dhanya Thattil
8656eeec25
Revert "tests add to namespace sls (#464)" (#465)
This reverts commit f5745fcf18ae9c6953227a0cd3fe03b9b157ae9e.
2022-05-20 15:43:48 +02:00
Dhanya Thattil
f5745fcf18
tests add to namespace sls (#464) 2022-05-20 15:41:37 +02:00
c7ba79644a minor 2022-05-20 12:01:42 +02:00
Dhanya Thattil
70aed474dc
fedora cant compile as make_unique in Implementation points to std and not sls namespace, but it compiles for DetectorImpl (#463) 2022-05-20 12:00:24 +02:00
Dhanya Thattil
f3edd4dc56
Not allowing / or spaces in file name prefix (#461) 2022-05-18 12:37:44 +02:00
a4bd2f1be7 updated release 2022-05-18 12:19:32 +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
4259363169
rxr sls namespace (#457)
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
2022-05-18 11:48:38 +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
9808376207 release notes 2022-05-16 12:33:07 +02:00
Dhanya Thattil
be617577c9
always enable gap pixels if they exist for detector in gui (#450) 2022-05-16 12:31:46 +02:00
Dhanya Thattil
e30ee445a1
m3 gui: slave timing modes should be discarded when squashing (#449) 2022-05-16 12:29:17 +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.dev0 2022.05.22.dev0
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 7d574375b425763eeb5a79bd260270e01373bfea.
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
466d431081 update release notes 2022-05-10 15:35:44 +02:00
Dhanya Thattil
cd4520b051
not validating settings for dacs temporarily (#447) 2022.05.10.dev1 2022-05-10 15:30:34 +02:00
Dhanya Thattil
0129c2c686
M3: master starts twice (non blocking) part 2 (#445)
* slaves and master vectors empty means all positions included: fixing double acquisition in masters

* debug print out
2022-05-10 15:23:39 +02:00
Dhanya Thattil
f55bdd6eae
M3: master starts twice (non blocking) (#444)
* start acq for master m3 was sent twice (non blocking), removed redundant code, check that there is only one master

* m3 can have more than 1 master (when many master modules used independently)

* fix for singe mod m3 or other dets
2022.05.10.dev0
2022-05-10 14:27:40 +02:00
Erik Frojdh
36a1159f38 updated pybind11 from 2.6.2 to 2.9.2 2022-04-28 16:39:39 +02:00
Erik Frojdh
98e2ddbb74 indent 2022-04-28 16:37:52 +02:00
Erik Fröjdh
fa12ab2858
Support external builds of python bindings, gui, ctbgui and moench stuff (#440)
Use already installed version of the slsDetectorPackage. Assumes that the library has already been built and installed either on a system wide location or pointed to by CMAKE_PREFIX_PATH
2022-04-28 16:35:29 +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
Erik Frojdh
b7153fe3e0 cmake fix 2022-04-27 11:29:04 +02:00
Dhanya Thattil
2db2694660
m3 rxr: inconsistent generaldata default (#435)
* inconsistent copy with generalData and implementation members, especially for m3 (non default rxr generic values), issue caught on second configure with non m3 default values, eg tengiga 0

* removing test
2022-04-22 16:02:10 +02:00
Erik Frojdh
e1642cf37c bugfix cmake zeromq 2022-04-19 20:11:31 +02:00
Erik Fröjdh
086d22f1a3
Cleaning up the find zmq (#431) 2022-04-19 17:17:31 +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
Dhanya Thattil
27c7fd9a97
Merge pull request #423 from slsdetectorgroup/rmoldserver
copy detector server: rm old server
2022-04-08 14:56:50 +02:00
5d16ba7e16 update release 2022-04-08 11:10:15 +02:00
Erik Fröjdh
d8c6f9141d
Fixed crash on gendoc (#430)
Fixed by checking for help action before using the detector
added test that checks that for all helps this doesn't crash
Disabled Timer tests by default since they take ~2s
2022-04-07 16:20:54 +02:00
Erik Fröjdh
e9dc3d8c38
minor changes (#429)
Various small changes to the data processor
2022-04-07 14:39:26 +02:00