detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-07-25 23:22:51 +02:00
Code Issues Actions Packages Releases Activity
8,933 Commits 44 Branches 103 Tags
b4e06eb62b8fa38b6af8befdb6ff60a4615be759
Commit Graph
8933 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergamaschi b4e06eb62b new moench data structure for offline processing 2023-08-28 12:25:11 +02:00
bergamaschi c7c672ccde Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2023-07-13 17:47:07 +02:00
maliakal_d d74661a375 updated fw versions for moench 2023-07-10 16:15:28 +02:00
maliakal_dandGitHub 054e733cd5 Voltage and slow adc naming (#772) 
* voltages in python 

* added voltage values in cmd line, added voltagelist in detector class

* voltage values in python

* slow adc list
 2023-07-10 16:10:23 +02:00
maliakal_dandGitHub fe4db54eb6 moench settings (#774) 
* moench settings

* default value for asic ctrl reg for moench
 2023-07-10 15:21:48 +02:00
maliakal_dandGitHub 5be503c1bd moench speeds (#776) 
* added other speeds and updated readoutspeedlist, test, gui
 2023-07-10 15:09:51 +02:00
maliakal_dandGitHub 58cdb5bd20 added patfname command to save the file the last pttern was loaded from (#770) 
* added patfname command to save the file the last pttern was loaded from
 2023-06-22 09:08:48 +02:00
heymes_jandGitHub e18c191247 Added pyat files as input, auto legend bug without wait and loop fixed (#769) 2023-06-20 12:28:14 +02:00
maliakal_dandGitHub 1a338346d5 2. Ctb fname voltage (#768) 
* power and sense returning dac indices instead of int in Detector class

* power -> voltage, sense -> slowadc
 2023-06-19 16:05:30 +02:00
maliakal_dandGitHub d3d98db7e9 1. Ctb powerindices (#767) 
* power and sense returning dac indices instead of int in Detector class
 2023-06-19 15:19:50 +02:00
maliakal_dandGitHub 3f9ec695db 2. Patioctrl uint64 t (#766) 
* when dbit list is enabled, the size of data in zmq stream is changed to only the digital bits enabled size. now fixed to also include analog size

* allowing to set 0xffffffffffffffff to pat io control. prevously was used to do a get. fixed also for pat bit mask and pat mask
 2023-06-15 09:30:52 +02:00
maliakal_dGitHubErik Fröjdh
 		6f50707cfb when dbit list is enabled, the size of data in zmq stream is changed to only the digital bits enabled size. now fixed to also include analog size (#764) 
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
 2023-06-15 09:19:01 +02:00
maliakal_dandGitHub a5f26252b8 ctb v_limit dac tristate (#761) 
* ctb: allowing dac to tristate (-100) even if v_limit is set

* binary in

* formatting
 2023-06-15 08:42:42 +02:00
maliakal_d d032f43f11 fixing tests to work and powername change bug fix from before 2023-06-14 17:19:37 +02:00
maliakal_d 0d53f83a2f backward compatibility of alias file 2023-06-14 11:40:30 +02:00
maliakal_dandGitHub a7dcfe4b31 Ctb sense power signal names (#759) 
*  adc names

* added python functions in src

*  signal, power, sense names

* fix tests
 2023-06-07 17:06:41 +02:00
maliakal_dGitHubErik Fröjdh
 		b9a346a396 ctb adc names (#757) 
* first draft of adc names

* fixed tests

* formatting

* added python functions in src

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
 2023-05-31 21:07:07 +02:00
maliakal_d 225e5490d2 formatting 2023-05-30 15:46:30 +02:00
maliakal_d 95d89522d8 formatting 2023-05-25 12:10:46 +02:00
maliakal_dandGitHub 6fcb880538 Merge fix from 7.0.2 (#756) 
- start acq list: mixup with master pos #743 : fix that only master starts second and not all (for start acq), typo with pos and masters list
- synced master status running when setting to slave  #747: synced master status running when setting to slave
 2023-05-25 11:20:41 +02:00
maliakal_dandGitHub 65b8c9c5c1 Moench rw3 (#745) 
* moench, removed chip version, filter resistor, filter cells, currentsoures, gain mode, setttings(modes), dbitphase, maxdbitphase, autocompdisable, comparatordisabletime, made acq start and stop a pulse, removed unused registers

* added parallel command

* remove gain plot for moench

* moench: updated adc invert val

* moench: update adcoffset to 0xf and adcphase to 140 degrees

* removed sync clock in moench

* updated min fw version

* removing config file in moench server
 2023-05-25 11:00:23 +02:00
maliakal_dandGitHub 0a7fd0a51a set bit and clear bit only verifies that bit (#746) 2023-05-25 10:35:17 +02:00
maliakal_dandGitHub 6834294437 2. Fix ctb ro to receiver (#755) 
* fix for incorrect readout mode from detector to updating receiver (rx_hostname command)
 2023-05-25 08:55:36 +02:00
maliakal_dandGitHub afee45790f 1. allow 1gbe non blocking acquire by creating another thread (#753) 
* allow 1gbe non blocking acquire by creating another thread

* removed unnnecessary print out in ctb
 2023-05-24 13:39:40 +02:00
bergamaschi 18cdd6a2f7 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2023-05-23 12:11:59 +02:00
bergamaschi 799903dddb new rct structure for moench03 2023-05-23 12:11:52 +02:00
maliakal_dandGitHub f0c789dc91 Revert "Ctb: allow adc mask enable to be 0 for 1 and 10GbE", and better error message (#751) 
* Revert "Ctb: allow adc mask enable to be 0 for 1 and 10GbE (#750)"

This reverts commit a0f250a487.

* better error message about setting adc mask to 0. Cannot set it to 0 due to ram allocation
 2023-05-22 12:26:07 +02:00
maliakal_dandGitHub a0f250a487 Ctb: allow adc mask enable to be 0 for 1 and 10GbE (#750) 
* ctb: allow adc mask enable to be 0 for 1 and 10GbE
 2023-05-22 11:26:57 +02:00
maliakal_dGitHubErik Fröjdh
 		fb25a01db5 Automate virtual test (#714) 
* using argparse for parsing command line arguments

* added command line option to specify which servers to run

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
 2023-05-11 12:15:22 +02:00
maliakal_dandGitHub da4dd0df7e Formatting (#742) 2023-05-11 10:17:24 +02:00
hinger_vGitHubvhinger182maliakal_dErik Fröjdh
 		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
maliakal_dandGitHub 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
maliakal_dandGitHub 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
maliakal_dGitHubErik Frojdh
 		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öjdhandGitHub 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öjdhandGitHub ea4aaf743f modified struct (#729) 2023-05-05 14:09:13 +02:00
Erik FröjdhandGitHub 61f290441e Local loop indicies in analogDetector (#709) 
* making ix and iy local variables in analogDetector
 2023-05-03 09:18:09 +02:00
hinger_vGitHubvhinger182maliakal_dErik Fröjdh
 		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
hinger_vGitHubvhinger182maliakal_dErik Fröjdh
 		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
hinger_vGitHubvhinger182maliakal_d
 		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
hinger_vGitHubvhinger182maliakal_d
 		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 ThattilandGitHub cb4f733350 formatting (#716) 
* formatting
 2023-04-12 15:30:34 +02:00
Dhanya ThattilGitHubhinger_vvhinger182
 		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 ThattilandGitHub 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
hinger_vGitHubErik Fröjdh
 		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öjdhandGitHub 37e7471dc4 minor fixes (#708) 2023-03-31 11:56:09 +02:00
Erik FröjdhandGitHub 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öjdhandGitHub 08c0c59a28 Added github actions for build and run unit tests (#705) 2023-03-28 16:27:01 +02:00
Dhanya ThattilandGitHub 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
mozzanicaandGitHub 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