262 Commits

Author SHA1 Message Date
297c3752e3
Dev/remove gotthard i (#1108)
* slsSupportLib done, at receiver rooting out in implementation

* removed from receiver and client

* removed everywhere except gui, python and client(commands.yaml and Detector.h)

* updated python

* fixed autocomplete to print what the issue is if there is one with ToString when running the autocomplete script to generate fixed.json. updated readme.md in generator folder

* formatting

* removed enums for dacs

* udpating autocomplete and generating commands

* removed gotthard from docs and release notes

* removed dac test

* bug from removing g1

* fixed virtual test for xilinx, was minor. so in this PR

* gui done

* binary in merge fix

* formatting and removing enums

* updated fixed and dump.json

* bash autocomplete

* updated doc on command line generation

* removing increments in dac enums for backward compatibility. Not required

* removed ROI from rxParameters  (only in g1), not needed to be backward compatible

* removed the phase shift option from det server staruip
2025-03-10 14:24:33 +01:00
aad1ab0cf4
file from Anna: could be reduce print out in zmq processing when using energy threshold (#1113) 2025-02-21 12:49:33 +01:00
e848293916
Dev/zmq stream all ipv6 adn remove rx_zmqip (#958)
* enable ipv6 in zmq socket

* removed rx_zmqip API and field in gui, changed client updaterxrzip to updateclientzmqip to have the rx_hostname ip if 0. 

* updated command line for rx_zmqip to give a warning. 

* Replaced 'depreciated' to 'deprecated' everywhere

* switching from * to 0.0.0.0 works for rebinding zmq sockets

* fixed help in command line for rx_zmqip * to 0.0.0.0 and removed cmd in python

* remove publisher zmq socket ip also for moench post processing

* fixed tests

* publisher zmq ip macros to be reused
2024-09-10 15:19:08 +02:00
anberga
15e8c0d9f1
Moench mess from developer (#953)
* new moench data structure for offline processing
2024-09-05 15:32:20 +02:00
de33aff077
developer: moench empty data callback (#936)
* moench (feature to wait for post processing to be done in new sls_detector_acquire_zmq executable)

READOUT_ACTION_ZMQ added to action enums
sls_detector_acquire_zmq added to executables
empty data call back so that client listens to last dummy zmq packet from moench post processor
processor: remove NEWZMQ ifdefs and remove connect for zmq publisher socket

* fix to compile

* cmds generated and parsed
2024-08-13 11:27:06 +02:00
anberga
aa40128965
Moench v8 (#892)
* new rct structure for moench03

* new moench data structure for offline processing

* meonch raw data and zmq process files updated to 7.0.3 version

* implemented config file for Zmq file

* raw data and zmq work with config file, but only with one file/interface

* zmq config change

* added config examples for zmq and rawdata
2024-01-12 14:01:06 +01:00
c9dfa408db
Fix strixel mapping and interpolation (#787) 2023-07-20 16:49:31 +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
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
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
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
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
4ee4d66977
Jf zeromq display (#644)
* modified ZmqSocket to expose the SO_RCVBUF and SO_SENDBUF parameters. Modified DataStreamer.cpp to change the SENDBUF to 1MB when HWL is <10. Modified Datastreamer.cpp so that when HWL is changed, socket is unbind/rebind. Added rebind to ZmqSocket.cpp.
Changed slot UpdatePlot() in qdrawplot.h from privat tto public, added plot->UpdatePlot() after every axis range change, so the plots are updated immediatly and not at the next image.
Added onlinedisp_zmq program which connects to the receiver ZMQ port and show images and histos. Compiled against  ROOT 6.22/02. Added examples files.

* added setbuffer size also for gui, moved hardcoded values to a macro, removed unnecessary return of ok or success, added actual zmq exception message to could not create sockets error

* zmq: changing buffer size done within hwm

---------

Co-authored-by: mozzanica <l_mozzanica@mpc2012.psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2023-02-09 17:24:28 +01:00
2d6cb52dfa Modified moenchZmqProcess.cpp to reflect changes made to the detector header (bunchId -> detSpec1; debug -> detSpec3; roundRnumber -> detSpec4) 2022-11-23 10:58:55 +01:00
f0c0f07701 changed JF structures and tiff writer for rectangular detectors 2022-11-08 11:27:31 +01:00
4f21ad5122 Corrected mistake for compiling moench04 with digital bits 2022-10-25 09:55:11 +02:00
2696b95014 Removed an extra bracket in slsDetectorCalibration/singlePhotonDetector.h wrongfully inserted in previous commit 2022-10-24 14:22:07 +02:00
bb0201385f fixed issue with cluster finder 2022-10-24 12:39:37 +02:00
22b16de6b5 added binary for moench04 and gain bits 2022-10-24 12:36:24 +02:00
9232776577 Merge branch 'developer' of https://github.com/slsdetectorgroup/slsDetectorPackage into developer 2022-10-24 12:11:27 +02:00
5096119ac3 some changes for JF with LGADs 2022-10-24 12:09:52 +02:00
876977392b Modified moench04CtbZmq10GbData.h for analog digital mode 2022-10-24 12:08:42 +02:00
9efb19a9b5 some changes for JF with LGADs 2022-10-24 12:07:26 +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
af300e0276
fix compiler warning for ctb gui for moench getGain: aoff not declared (#565) 2022-10-20 10:50:31 +02:00
Erik Frojdh
afff85b44b fix for broken build of zmq and ctb 2022-09-07 11:58:26 +02:00
81fbc45488 moench04CtbZmq10GbData.h corrected 2022-08-15 12:57:55 +02:00
Bergamaschi Anna
3b9df5868e Added JF strixels cluster finder and gain bit for Moench04 2022-07-14 12:18:34 +02:00
9ecafbf8d5 some updates to the moench data processing 2022-06-13 16:50:30 +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
redford_s
ea1222ac5b Solved problem in photon finder 2022-03-25 18:20:32 +01:00
6793f5e530 fixed virtual function problem in slsDetectorCalibration 2022-02-01 12:01:53 +01:00
Erik Fröjdh
328279d315
Moenchstuff (#358)
* using standard header in moench03T1Receiver
* restructure slsDetectorData added override to moench03T1ReceiverDataNew
* removed unused function
2022-01-31 11:55:12 +01:00
Erik Fröjdh
f6e76145c1
Make a library for writing and reading tiff, added tests (#347)
* removed Makefile for moench and integrated the build in CMake
* broke out tiff reading and writing to its own library
* moved tiff includes to include/sls
* moved tiffio source to src
* removed incorrectly used bps
* cleanup and tests for tiffio
* removed using namespace std from header
* some fixing for moench04
* Program for offline processing renamed

Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2022-01-27 10:24:02 +01:00
Erik Frojdh
c554bbb2d3 formatted slsDetectorCalibration 2022-01-24 11:26:56 +01:00
Erik Frojdh
623b1de8a0 added f suffix 2022-01-24 11:19:38 +01:00
Erik Frojdh
02174f79d1 changed deprecated uint32 declaration to uint32_t 2022-01-24 09:01:44 +01:00
5403656e79 Fixed some stuff for the Zmq process 2022-01-19 14:56:44 +01:00