da4dd0df7e
Formatting ( #742 )
2023-05-11 10:17:24 +02:00
4c6be26846
Jf rawdataprocess txtfile ( #732 )
...
* Fix ROI mapping
* Formatting
* Minor edit
* intial draft of cmake for jungfrau executables Makefile.rawdataprocess
* added the cmake file
* missed Makefile
* added libfmt
* Fix some compiler warnings
* Fix some compiler warnings
* Create filename usining fmt::format
* Rewrite command line parsing with std::string and fmt::format
* Fix file reading
* Fix root string extraction
* Fix ifstream file reading
* Clean up comments
* Add version of rawdataprocess with bash wildcards
* Add version of rawdataprocess that reads inputs from txt-file, still buggy
* intermediate
* fix file loop
* fix const
* Circumevent bug with stuck threads
* Fix mutex bug
* cleanup
---------
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2023-05-08 16:30:37 +02:00
74acbb15f5
enable fix g0 when in expert mode (when gain mode enabled and not just visible) ( #736 ) ( #741 )
2023-05-08 16:13:09 +02:00
d65825e9ef
Rx roi zmq ( #726 ) ( #740 )
...
adding rx_roi also in the zmq header for external guis to put the "yellow box".. sending full roi instead of -1, and sending for each zmq port. "(multiple yellow boxes)".
2023-05-08 16:03:48 +02:00
e757e25fa1
merge fix #721 PR (sync 7.0.2.rc) to developer ( #739 )
...
* merge fix from #721 PR (sync) 7.0.2.rc -> developer
* row and column for jungfrau mixed up
* multi module jungfrau sync must do slaves first then master for start acquisition and send software trigger, and master first and then slaves for stopacquisition
* non blocking to slaves first and only then blocking/nonblocking to the master for sending software trigger(jungfrau multi mod sync)
* fixed get/set timing jungfrau when sync enabled, getsync during blocking acquire (for trigger or stop) will get stuck as it should ask the stop server
* switching between 1 and 2 interfaces did not set gui/client zmq port properly. Resulted in dummy streaming forever. fixed
* formatting, refactoring: const & for positions, multi mod M3 stop first master first
* adding missing cstdint for gcc 13
* Refactoring handle sync out, handling synchronization also for softwaretrigger for m3, for start/sync/stop for g2/g1
---------
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
* fixed row and col for moench 2 interfaces
* fix moench getTiming and also allow moench to handle sync
---------
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2023-05-08 15:58:19 +02:00
Erik Fröjdh
14ec4cf1da
added missing initialization of pthread_mutex ( #728 )
...
* added missing initialization of pthread_mutex
* fixed cut and past error
2023-05-05 14:45:56 +02:00
Erik Fröjdh
ea4aaf743f
modified struct ( #729 )
2023-05-05 14:09:13 +02:00
Erik Fröjdh
61f290441e
Local loop indicies in analogDetector ( #709 )
...
* making ix and iy local variables in analogDetector
2023-05-03 09:18:09 +02:00
80fc7eb220
3 - Jf rawdataprocess wildcards ( #723 )
...
* Fix ROI mapping
* Formatting
* Minor edit
* intial draft of cmake for jungfrau executables Makefile.rawdataprocess
* added the cmake file
* missed Makefile
* added libfmt
* Fix some compiler warnings
* Fix some compiler warnings
* Create filename usining fmt::format
* Rewrite command line parsing with std::string and fmt::format
* Fix file reading
* Fix root string extraction
* Fix ifstream file reading
* Clean up comments
* Add version of rawdataprocess with bash wildcards
* Add version of rawdataprocess that reads inputs from txt-file, still buggy
* fixing missing cstdint
---------
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2023-05-03 09:10:53 +02:00
73a9c42f62
2 - Jf rawdataprocess makefile ( #724 )
...
* Fix ROI mapping
* Formatting
* Minor edit
* intial draft of cmake for jungfrau executables Makefile.rawdataprocess
* added the cmake file
* missed Makefile
* added libfmt
* Fix some compiler warnings
* Fix some compiler warnings
* Fix MAkefile for conda env pyclang_fmt
---------
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2023-05-03 08:50:24 +02:00
72c992bc74
2 - Jf rawdataprocess fmt ( #725 )
...
* Fix ROI mapping
* Formatting
* Minor edit
* intial draft of cmake for jungfrau executables Makefile.rawdataprocess
* added the cmake file
* missed Makefile
* added libfmt
* Fix some compiler warnings
* Fix some compiler warnings
* Create filename usining fmt::format
* Rewrite command line parsing with std::string and fmt::format
* Fix file reading
* Fix root string extraction
* Fix ifstream file reading
* Clean up comments
* Add requested changes to helper functions
* fix const&
---------
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2023-05-03 08:43:45 +02:00
f4e05f7a01
1 - Add cmake for jungfrauExecutables rawdataprocess ( #717 )
...
* Fix ROI mapping
* intial draft of cmake for jungfrau executables Makefile.rawdataprocess
* added the cmake file
* missed Makefile
* added libfmt
* Fix some compiler warnings
---------
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2023-04-27 13:59:13 +02:00
Dhanya Thattil
cb4f733350
formatting ( #716 )
...
* formatting
2023-04-12 15:30:34 +02:00
Dhanya Thattil
a5022ff0ee
Jf strixelmap with roi ( #715 )
...
* Fix ROI mapping, Formatting, Minor edit
---------
Co-authored-by: vhinger182 <viktoria.hinger@psi.ch>
Co-authored-by: vhinger182 <hinger_v@hv_home_lt1.localdomain>
2023-04-12 14:03:04 +02:00
Dhanya Thattil
cab2b335dc
Fix ctb slow adc fw ( #713 )
...
Firmware updated. spi moved to firmware. In Software, configuring, then a pulse to start, wait for done bit and convert the values read from a regiter.
2023-04-12 11:25:41 +02:00
b442b17415
Implement automatic strixel mapping according to rx_roi ( #710 )
...
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2023-03-31 17:14:35 +02:00
Erik Fröjdh
37e7471dc4
minor fixes ( #708 )
2023-03-31 11:56:09 +02:00
Erik Fröjdh
3b8c612103
Fixed build of the moenchZmqExecutables ( #706 )
...
* changed to pure virtual methods for Clone and setClusterSize
* added std::
* added moench to the github actions build
2023-03-29 15:01:22 +02:00
Erik Fröjdh
08c0c59a28
Added github actions for build and run unit tests ( #705 )
2023-03-28 16:27:01 +02:00
Dhanya Thattil
7e01095684
Fix tests ( #698 )
...
* fix firmwareversion to reqd version as fw version cannot be 0 for virtual
2023-03-28 15:22:36 +02:00
500442fd6b
modified ZMQonline display for stripsel usage. ( #699 )
...
* modified ZMQonline display for stripsel usage. modified dataprocessor to overwrite header.detspec1 with ROI in case of ROI.
* Removing changes to the slsReceiver, moved to branch jf_zeromq_display_rxroi
2023-03-22 14:25:02 +01:00
Dhanya Thattil
b67c6dea08
ensuring no duplicate rx hostname port combo ( #604 )
...
* rx_hostname and port combo to one, or hostname to all, or a vector of hostnames and ports, ignoring none or empty, then verifying no duplicates for the host port combo including from shared memory
* extracted function for rx_hostname (#694 )
* c++14 revert
* unique hostname-port combo for port, hostname, rx_tcpport (#696 )
* verify unique combo for rx_port as well
* check unique hostname-port combo also when setting control port, hostname, rx_hostname and rx_tcpport
---------
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
2023-03-20 12:30:12 +01:00
Dhanya Thattil
c9215a6d9b
fix old server version in 64 bits ( #697 )
...
* check server version before initial checks, catch old server version exception, get old server version as 64 bit and print it alon gwith exception
2023-03-20 10:31:27 +01:00
1bdf83e101
Resolve merge conflict in jungfrauExecutables
2023-03-17 16:43:08 +01:00
1bd813d620
Fix bug to allow larger clusters
2023-03-17 15:34:08 +01:00
943a85cbd5
Update data structures and eta functions for JF strixels
2023-03-17 15:33:01 +01:00
fc24558314
formatting
2023-03-17 14:42:11 +01:00
Dhanya Thattil
d23722a4b7
Eiger: add hardware version ( #688 )
...
* eiger: hardwareversion, fix firmware version unable to read version scenarios, check to see if febl, febr and beb have same fw version
* feb versions can be picked up only after feb initialization
2023-03-16 11:59:06 +01:00
Dhanya Thattil
bc46d0f6ab
rx_arping handle sigchld ( #691 )
...
* rx_arping pclose gave -1 due to sigchld being ignored, fixed with sig handler doing a wait
2023-03-16 11:57:30 +01:00
Dhanya Thattil
532f76ed4f
fix hdf5 compilation using det spec fields in header ( #693 )
...
* fix hdf5 compilation using det spec fields in header
2023-03-16 09:23:27 +01:00
21db57dd89
binaries in
2023-02-24 10:44:17 +01:00
dc5db905d4
merge from 7.0.0
2023-02-24 10:39:51 +01:00
Dhanya Thattil
48a684b95f
dev:Eiger febl febr ( #601 )
...
* eiger: get febl and febr versions in versions command, also added in python
2023-02-24 10:06:11 +01:00
Dhanya Thattil
276dc52196
dev:removed storage cells for moench ( #603 )
...
* removed storage cells for moench
* rxr: also setting moench like jungfrau in implementation of ports
2023-02-24 10:00:31 +01:00
e942678139
Merge branch 'main' into 7.0.0.rc
2023-02-24 09:48:22 +01:00
Dhanya Thattil
72a028eaf3
Update README.md
2023-02-23 17:30:47 +01:00
907257891d
updated readme
2023-02-23 17:24:23 +01:00
0a79ae523b
updating documentation
2023-02-23 16:52:04 +01:00
90496bcee8
updated release date and lib api date
2023-02-23 16:38:10 +01:00
Dhanya Thattil
ed2894dafd
python additions ( #686 )
...
* python: fixed versions when no receiver, added clearbusy, serialnumber and readoutspeedlist. commandline: modified versions to look like python versions
* python: added clkphase, fixed clkdiv, maxphase
* python added adcvpp
* gaincaps for python
---------
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2023-02-23 16:29:54 +01:00
Dhanya Thattil
a74c9498e2
m3, individual chip index back in for hw 1.2, need the linux drivers for chipdac0-9 ( #685 )
2023-02-23 09:13:31 +01:00
Erik Frojdh
403989e2f8
trigger, blockingtrigger in python and m3 timefix
2023-02-22 18:01:46 +01:00
7e8d11098a
release date
2023-02-22 17:15:51 +01:00
f9c9a53c8c
fix python compare script from g to sls_detector_get
2023-02-22 17:09:47 +01:00
90b1b97ffa
release notes
2023-02-22 16:30:41 +01:00
50003cbc08
release notes
2023-02-22 16:30:27 +01:00
a799c4d2e2
minor
2023-02-22 15:37:13 +01:00
700f532b5a
examples udp before rx_hostame
2023-02-22 15:16:00 +01:00
a098bc4674
fixes for tests for m3
2023-02-22 14:34:01 +01:00
13bbd54a21
formatting
2023-02-22 11:42:06 +01:00
