Commit Graph

8674 Commits

Author SHA1 Message Date
Dhanya Thattil bf3333b97b show fpga temp in developer tab in gui, virtual servers just show warning if no temperature file in /tmp to read (dont throw exception) (#573) 2022-11-11 17:15:15 +01:00
Dhanya Thattil 38cd10d4e6 Qt5 built in qwt (#570)
- qt4->qt5
- in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake
- made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr.
- qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms
 - docking option enabled by default, removed option to disable docking feature from "Mode"
- added qVersionResolve utility functions to handle compatibility before and after qt5.12
- qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks
- ensure gain plots have no zooming of z axis in 2d and y axis in 1d
- removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope)
- tab order
Servers:
- fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
2022-11-11 15:15:10 +01:00
Dhanya Thattil 05f657c106 Versioning (#568)
- removed getClientServerAPIVersion in server (not used)
- removed rxr side (clientversion compatibility check), removed enum as well as it is now done on the client side.
- versionAPI.h
   - GITBRANCH changed to RELEASE
   - dates for all API changed to "sem_version date". Scripts to compile servers modified for this. Empty "branch" name will end up with developer for sem_version.

- Version class with constructor taking in the long version (APILIB date). Other member functions including concise(to get sem_version for new releases and date for old releases), 
  
- bypassing initial tests, also now bypasses the client-rxr compatibility check (at rx_hostname command)

- previously, compatibility between client-det was ensuring both had the same detector API (eg. same APIJUNGFRAU)
   - Now, compatibility only checks APILIB (client side) and detector API(eg. APIJUNGFRAU) (detector side) have same major version. It only does backward compatibility test. Rest is upto user to ensure. 
   - If server is from an older release, it will compare dates like previous implementation (APIJUNGFRAU from both client and det)
 
- - previously, compatibility between client-rxr was ensuring both had the same APIRECEIVER
   - Now, compatibility only checks APILIB (client side) and APIRECEIVER (rxr side) have same major version. It only does backward compatibility test. Rest is upto user to ensure. 
   - If rxr is from an older release, it will compare dates like previous implementation (APIRECEIVER from both client and rxr)

- removed APIGUI, evalVersionVariables.sh, genVersionHeader.sh (not needed or not used)

- clientVersion, rxrversion and detectorserverversion all return strings and not integers (in hex) anymore. Depending if it has semantic versioning, it will print that or the date if it is too old.

- fixed in python (strings for versions)
- check_version function in detector server changed to "initial checks" as it only checks server-firmware compatibility and initial server checks. Client compatibilities are moved to client side.
- --version gives sem_version and date? Is date needed as well. The clientversion, detserverversion and rxrversion API gives only sem_version (no date)
- - formatting
2022-11-09 11:13:09 +01:00
bergamaschi b150db0fb3 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2022-11-08 11:27:54 +01:00
bergamaschi f0c0f07701 changed JF structures and tiff writer for rectangular detectors 2022-11-08 11:27:31 +01:00
maliakal_d 4a95ee8362 format 2022-11-08 10:25:12 +01:00
maliakal_d 16e9b272c7 release notes 2022-11-07 12:49:04 +01:00
Dhanya Thattil 615d66d493 eiger server workaround fix for fw stop done signal (#571)
- eiger server: fix for fw workaround where stop acquisition processing done signal does not come up, by removing reset in stop acquisition and waiting for2 seconds for feb done processing signal to go down, if it doesnt, throw if status is not idle.
- error messages not setup for some eiger server errors
- quad fix (chip signals to trim quad, both left and right registers can be different)
- minor logical error of no consequence (stop acquisition returns a different enum than expected)
2022-11-07 12:42:54 +01:00
Dhanya Thattil 9f906a779e M3clk (#548)
* m3: clock update, cannot set clk 4 and 5 anymore
* updated firmware version
2022-11-07 11:21:37 +01:00
Dhanya Thattil 3560f81d8e cpupower added (#569) 2022-10-27 11:55:09 +02:00
Dhanya Thattil 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 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 Thattil 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 Thattil b7cdfbb4d2 Adcvpp (#566)
* added api in detector class for adcvpp, taken out of dac list
2022-10-20 10:58:56 +02:00
Dhanya Thattil 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 Thattil e7879ee365 g2 and m3 round robin (#559)
* g2 and m3: round robin
2022-10-18 15:51:23 +02:00
Dhanya Thattil 46bb9bc2d7 nios temp (#557)
* fixed temp read nios

* divide for eiger and dont print
2022-10-18 15:47:23 +02:00
Dhanya Thattil 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 Thattil 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 Thattil 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 Thattil 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 Thattil 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 Thattil 1df4aba8ec updated g2 version for new fw (#554)
* updated g2 version for new fw
2022-09-12 15:04:11 +02:00
Erik Fröjdh 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öjdh 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öjdh 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 Thattil 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 Thattil 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 Thattil 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 Thattil 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 Thattil 4913c9c0b0 incorrect check for fwrite fail (#541) 2022-08-31 15:53:24 +02:00
Dhanya Thattil 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öjdh 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öjdh 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 Thattil 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 Thattil 4638bf7cf8 Jungfrausync (#519)
* jungfrau sync
2022-08-23 10:29:16 +02:00