4ae2edf686
Compiles
2024-08-28 12:10:04 +02:00
69fb5876cb
almost compiles, error: undefined reference to vtable for jungfrauLGADStrixelsDataQuadH5
2024-08-26 18:50:56 +02:00
543b311c06
Merge branch 'developer' into jf_h5reader
2024-08-23 11:44:05 +02:00
669e5f3c7a
intermediate
2024-08-23 11:43:32 +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
a6a4ea7f21
first draft
2024-08-07 11:05:23 +02:00
76ee52a3ca
edit strixel mapping quad
2024-03-14 15:20:58 +01:00
c0cbccd7d4
minor
2024-02-26 16:41:58 +01:00
783b95b1f3
Merge branch 'developer' into jf_singlemodule
2024-02-01 16:45:46 +01:00
d8e3e38c33
Compile strixel quad in cluster finder
2024-02-01 16:41:57 +01:00
7a03e56f09
Data structures
2024-02-01 16:38:26 +01: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
9bc20ab9b4
modify RawDataProcess_filetxt
2023-10-06 12:29:48 +02:00
95b7be6842
modify RawDataProcess
2023-10-06 12:18:33 +02:00
51d34063ac
create single chip data map
2023-10-06 12:08:26 +02:00
2b93ef4565
minor
2023-10-06 11:55:20 +02:00
78cbe8e660
fix jungfrauModuleData empty if statement
2023-08-04 16:12:27 +02:00
0ee54be252
rx_roi for module data
2023-08-04 15:31:30 +02:00
f90a9b7520
Read rx_ROI from json master
2023-08-03 18:25:43 +02:00
c9dfa408db
Fix strixel mapping and interpolation ( #787 )
2023-07-20 16:49:31 +02:00
6d6b6b98df
Fix strixel mapping and interpolation
2023-07-20 11:12:13 +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
