detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-07 12:52:28 +02:00
Code Issues Actions Packages Releases Activity
9,573 Commits 55 Branches 103 Tags
dev/fix-pattern-generator
Commit Graph
9573 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhanya ThattilandGitHub 4230517e69 pybind documentation (update) (#563) 
* document pybind11 update and included in package

* updatng doc for pybind11
 2022-10-27 10:50:00 +02:00
bergamaschi 4f21ad5122 Corrected mistake for compiling moench04 with digital bits 2022-10-25 09:55:11 +02:00
heymes_j 2696b95014 Removed an extra bracket in slsDetectorCalibration/singlePhotonDetector.h wrongfully inserted in previous commit 2022-10-24 14:22:07 +02:00
bergamaschi bb0201385f fixed issue with cluster finder 2022-10-24 12:39:37 +02:00
bergamaschi 22b16de6b5 added binary for moench04 and gain bits 2022-10-24 12:36:24 +02:00
heymes_j 9232776577 Merge branch 'developer' of https://github.com/slsdetectorgroup/slsDetectorPackage into developer 2022-10-24 12:11:27 +02:00
bergamaschi 5096119ac3 some changes for JF with LGADs 2022-10-24 12:09:52 +02:00
heymes_j 876977392b Modified moench04CtbZmq10GbData.h for analog digital mode 2022-10-24 12:08:42 +02:00
bergamaschi 9efb19a9b5 some changes for JF with LGADs 2022-10-24 12:07:26 +02:00
maliakal_d a8b37e3932 ensure eiger hot fix server version stays the same 2022-10-24 10:54:48 +02:00
maliakal_d 0883c73e88 not updating the client versions for 'server only hot fix' 2022-10-24 10:51:50 +02:00
maliakal_d ef7e9d73a5 eiger server fixes: 
- removed feb reset in stop acquisition as it caused processing bit to randomly not go high (leads to infinite loop waiting for it to go high). This is anyway done at prepare acquisition and set trimbits.
- left AND right registers monitored for processing bit done
- febProcessinginprogress returns STATUS_IDLE and not IDLE
- In feb stop acquisition, if processing bit is running forever, checks for 1 s, then if acq done bit is high, returns ok, else throws
- feb stop acquisition returns 1 if success and fucntion in list calling it compares properly instead of STATUS_IDLE (no effect, but incorrect logic)
- chipsignals to trimquad should only monitor right fpga (not both as it will throw)
- fixed error messages of readregister inconsistent values
- setmodule and read frame was returning fail without setting error messages (leading to broken tcp connection due to no error message)
-
 2022-10-21 16:31:17 +02:00
maliakal_d 65ad0bae51 update release notes 2022-10-20 13:52:29 +02:00
heymes_j 71c50e5f66 CtbGui (Root) removed printout of pixel value on draw 2022-10-20 12:06:03 +02:00
Dhanya ThattilandGitHub 3fa3e05bfd Adcvpp2 (#567) 
* fix for adcvpp p
 2022-10-20 11:53:23 +02:00
Heymes Julian Brice Dominique f9f485c99e moench04CtbZmq10GbData.h aoff guess (l. 115 or 116) 2022-10-20 11:07:44 +02:00
Dhanya ThattilandGitHub b7cdfbb4d2 Adcvpp (#566) 
* added api in detector class for adcvpp, taken out of dac list
 2022-10-20 10:58:56 +02:00
Dhanya ThattilandGitHub af300e0276 fix compiler warning for ctb gui for moench getGain: aoff not declared (#565) 2022-10-20 10:50:31 +02:00
maliakal_d a84fcd2c82 pybind11 release update 2022-10-18 17:24:47 +02:00
maliakal_d 6fc43fa06a binaries in 2022-10-18 15:52:05 +02:00
Dhanya ThattilandGitHub e7879ee365 g2 and m3 round robin (#559) 
* g2 and m3: round robin
 2022-10-18 15:51:23 +02:00
Dhanya ThattilandGitHub 46bb9bc2d7 nios temp (#557) 
* fixed temp read nios

* divide for eiger and dont print
 2022-10-18 15:47:23 +02:00
Dhanya ThattilandGitHub 4a7cd051c1 Gainzoom (#556) 
* gain plot: dont allow zoom, only zoom on main plot

* fixed gain plot zooming

* fixing panning for gainplots
 2022-10-18 15:27:44 +02:00
Dhanya ThattilandGitHub d2c4827b31 increasing default rx tcp port (#562) 
* increasing rx tcp port by default when creating shm
 2022-10-18 15:24:04 +02:00
Dhanya ThattilandGitHub d9e34e1657 Pllreset (#560) 
* ctb, moench and jungfrau: pll reset at start not happening as no defines
 2022-09-29 14:03:26 +02:00
Dhanya ThattilandGitHub bac32dcba9 ctb 1g non blocking acquire (#555) 
* allowing ctb and moench 1g to have non blocking acquisition also send data, refactoring wait for acquisition finished for all others
 2022-09-16 17:45:51 +02:00
Dhanya ThattilandGitHub e385618d09 gui crash qtimer (#551) 
* locks when qtimer runs out same time as acquisitionfinished

* fix for newer gcc
 2022-09-16 17:02:03 +02:00
Dhanya ThattilandGitHub 1df4aba8ec updated g2 version for new fw (#554) 
* updated g2 version for new fw
 2022-09-12 15:04:11 +02:00
Erik FröjdhandGitHub fdfdfd9f43 Option to install slsdet python extension in the install tree (#553) 
* added option to install python ext
 2022-09-09 13:47:27 +02:00
Erik FröjdhGitHubmaliakal_d
 		c0c8c8e21a Hardcopy of pybind11 instead of using git submodules (#552) 
* removed pybind as submodule
* added hardcopy of pybind11 2.10.0
* rename pybind11 folder to avoid conflicts when changing branch

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
 2022-09-09 10:42:43 +02:00
Erik FröjdhandGitHub 236f00c810 only get dacnames if modules are attached (#550) 2022-09-08 13:48:05 +02:00
Erik Frojdh afff85b44b fix for broken build of zmq and ctb 2022-09-07 11:58:26 +02:00
Dhanya ThattilandGitHub 1425382dbb G2clkdiv (#547) 
* g2 changing clkdivs 2 3 4 to defaults for burst and cw mode
 2022-09-05 17:00:01 +02:00
Dhanya ThattilandGitHub 76c18f3303 setting rx_hostname (or udp_dstip with rx_hostname not none) will always set udp_dstmac. solves problem of chaing udp_dstip and udp_dstmac stays the same (#544) 2022-09-05 16:57:54 +02:00
Dhanya ThattilandGitHub 7de6f157b5 M3badchannels (#526) 
* badchannels for m3 and modify for g2 (file from single and multi)

* m3: invert polarity of bit 7 and 11 signals from setmodule, allow commas in bad channel file

* badchannel file can take commas, colons and comments (also taking care of spaces at the end of channel numbers)

* tests 'badchannels' and 'Channel file reading' added, removing duplicates in badchannel list, defining macro for num counters in client side

* fix segfault when list from file is empty, 

* fix tests assertion for ctbconfig (adding message) for c++11

* fixed badchannels in m3server (clocking in trimming) 

* badchannel tests can be run from any folder (finds the file)
 2022-09-01 15:30:04 +02:00
Dhanya ThattilandGitHub 02322bb3c2 jungfrau reset core and usleep (fix for 6.1.1 now fixed in firmware) removed (#545) 2022-09-01 15:05:41 +02:00
Dhanya ThattilandGitHub 4913c9c0b0 incorrect check for fwrite fail (#541) 2022-08-31 15:53:24 +02:00
Dhanya ThattilandGitHub d73d8994c0 g2 hdi type tolerance changed from 5 to 10 (#542) 2022-08-30 15:54:32 +02:00
maliakal_d aeb3e222c6 format 2022-08-30 15:31:38 +02:00
Erik FröjdhandGitHub 045a28b5de Nanosecond times in Python (#522) 
* initital implementation

* datetime replaces with sls::Duration in Python C bindings

* using custom type caster

* fix for conversion to seconds

* added set_count in python

* common header for pybind11 includes

authored-by: Erik Frojdh <erik.frojdh@psi.ch>
 2022-08-26 11:48:40 +02:00
Erik FröjdhGitHubErik Frojdh
 		3970ed2560 Suppress -Wdeprecated-declarations for gcc (#536) 
* Supress gcc warning from rapidjson include

Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
 2022-08-26 09:23:05 +02:00
Dhanya ThattilandGitHub 5a22e8b926 ctb and moench fw fixed to work with pattern length so pattern command works (#535) 2022-08-25 15:01:59 +02:00
Dhanya ThattilandGitHub 4638bf7cf8 Jungfrausync (#519) 
* jungfrau sync
 2022-08-23 10:29:16 +02:00
Dhanya ThattilandGitHub da16c1101c G2 hdi id (#521) 
* g2: hdi value in fpga is 3 bits, so using appropriate enum for it

* hdi id bits are determined

* fw date changed (g2)
 2022-08-23 08:02:11 +02:00
Dhanya ThattilandGitHub 67eea7ac36 Patdefault (#524) 
* m3, ctb, moench set wait and loop addresses to 0x1fff

* update default pattern file for moench
 2022-08-23 07:59:39 +02:00
maliakal_d c8e31ae6d7 formatting 2022-08-16 09:53:09 +02:00
Dhanya ThattilandGitHub 809b0bdeb8 Jungfraumaster (#518) 
* set jungfrau master only from client
* added tests, fixed a bug in ctb and moench (infinite recursion) that will never happen atm
 2022-08-16 09:51:18 +02:00
Dhanya ThattilandGitHub 01696ca89b Jungfrautrigger (#516) 
* jungfrau trigger added
* added blocking trigger
 2022-08-16 09:41:47 +02:00
Dhanya ThattilandGitHub 1bc4994be6 G2parallel (#514) 
* g2: non parallel added
 2022-08-16 09:35:39 +02:00
Dhanya ThattilandGitHub 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