Erik Fröjdh
7b5e32a824
Api extra ( #166 )
...
Changes to be able to run the example notebooks:
- Invert gain map on setting (multiplication is faster but user supplies
ADU/energy)
- Cast after applying gain map not to loose precision (Important for
int32 clusters)
- "factor" for ClusterFileSink
- Cluster size available to be able to create the right file sink
2025-04-25 10:31:16 +02:00
froejdh_e
86d343f5f5
merged with developer
Build on RHEL9 / build (push) Successful in 2m9s
Build on RHEL8 / build (push) Failing after 2m32s
2025-04-23 11:45:04 +02:00
Erik Fröjdh
4088b0889d
Merge branch 'main' into developer
2025-04-22 16:18:48 +02:00
froejdh_e
c6e8e5f6a1
inverted gain map
2025-04-22 16:16:27 +02:00
froejdh_e
b501c31e38
added missed commit
2025-04-22 15:22:47 +02:00
Erik Fröjdh
326941e2b4
Custom base for decoding ADC data ( #163 )
...
New function apply_custom_weights (can we find a better name) that takes
a uint16 and a NDView<double,1> of bases for the conversion. For each
supplied weight it is used as base (instead of 2) to convert from bits
to a double.
---------
Co-authored-by: siebsi <sieb.patr@gmail.com>
2025-04-22 15:20:46 +02:00
mazzol_a
177459c98a
added multithreaded cluster finder test
Build on RHEL9 / buildh (push) Successful in 2m20s
2025-04-17 17:09:53 +02:00
Mazzoleni Alice Francesca
c49a2fdf8e
removed cluster_2x2 and cluster3x3 specializations
Build on RHEL9 / buildh (push) Successful in 1m58s
2025-04-16 16:40:42 +02:00
Mazzoleni Alice Francesca
d4050ec557
enum is now enum class
2025-04-15 14:57:25 +02:00
Mazzoleni Alice Francesca
1174f7f434
fixed calculate eta
2025-04-15 13:18:25 +02:00
froejdh_e
8d8182c632
qMerge branch 'testing_clusters' of github.com:slsdetectorgroup/aare into testing_clusters
2025-04-15 08:05:12 +02:00
froejdh_e
5f34ab6df1
minor comment
2025-04-15 08:05:05 +02:00
Erik Fröjdh
5c8a5099fd
Merge branch 'api_cluster_vector' into testing_clusters
2025-04-14 16:40:47 +02:00
froejdh_e
7c93632605
tests and fix
2025-04-14 16:38:25 +02:00
Mazzoleni Alice Francesca
54def26334
added ClusterFile tests fixed some bugs in ClusterFile
Build on RHEL9 / buildh (push) Successful in 1m55s
2025-04-14 15:48:09 +02:00
Erik Fröjdh
a59e9656be
Making RawSubFile usable from Python ( #158 )
...
Build on RHEL8 / build (push) Successful in 1m55s
Build on RHEL9 / build (push) Successful in 1m44s
- Removed a printout left from debugging
- return also header when reading
- added read_n
- check for error in ifstream
2025-04-11 16:54:21 +02:00
Mazzoleni Alice Francesca
15e52565a9
dont convert to byte
2025-04-11 14:35:20 +02:00
froejdh_e
113f34cc98
fixes
2025-04-10 16:50:04 +02:00
Mazzoleni Alice Francesca
53a90e197e
added additional tests
Build on RHEL9 / buildh (push) Successful in 1m52s
2025-04-10 10:41:58 +02:00
Mazzoleni Alice Francesca
76f050f69f
solved merge conflict
Build on RHEL9 / buildh (push) Failing after 1m22s
2025-04-10 09:21:50 +02:00
Erik Fröjdh
8b0eee1e66
fixed warnings and removed ambiguous read_frame ( #154 )
...
Build on RHEL9 / buildh (push) Successful in 1m47s
Fixed warnings:
- unused variable in Interpolator
- Narrowing conversions uint64-->int64
Removed an ambiguous function from JungfrauDataFile
- NDarry read_frame(header&=nullptr)
- Frame read_frame()
NDArray and NDView size() is now signed
2025-04-09 17:54:55 +02:00
Erik Fröjdh
f16273a566
Adding support for Jungfrau .dat files ( #152 )
...
Build on RHEL9 / buildh (push) Successful in 1m48s
closes #150
**Not addressed in this PR:**
- pixels_per_frame, bytes_per_frame and tell should be made cost in
FileInterface
2025-04-08 15:31:04 +02:00
Mazzoleni Alice Francesca
a12e43b176
underlying container of ClusterVcetor is now a std::vector
2025-04-07 12:27:44 +02:00
Mazzoleni Alice Francesca
9de84a7f87
added some python tests
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 41s
2025-04-04 17:19:15 +02:00
Mazzoleni Alice Francesca
885309d97c
fix build
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 43s
2025-04-03 17:14:28 +02:00
Mazzoleni Alice Francesca
de9fc16e89
generalize is_selected
2025-04-03 09:28:54 +02:00
Mazzoleni Alice Francesca
50eeba4005
restructured GainMap to have own class and generalized
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 40s
2025-04-02 17:58:26 +02:00
Mazzoleni Alice Francesca
61af1105a1
templated eta and updated test
2025-04-02 14:42:38 +02:00
Mazzoleni Alice Francesca
04728929cb
implemented sum_2x2() for general clusters, only one calculate_eta2 function for all clusters
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 37s
2025-04-01 18:29:08 +02:00
Mazzoleni Alice Francesca
3083d51699
merge conflict
2025-04-01 17:50:11 +02:00
Mazzoleni Alice Francesca
4240942cec
solved merge conflict
2025-04-01 17:48:48 +02:00
Mazzoleni Alice Francesca
745d09fbe9
changed push_back to take Cluster as input argument
2025-04-01 15:30:10 +02:00
Erik Fröjdh
e1533282f1
Cluster cuts ( #146 )
...
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 43s
Co-authored-by: Patrick <patrick.sieberer@psi.ch>
Co-authored-by: JulianHeymes <julian.heymes@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Xiangyu Xie <45243914+xiangyuxie@users.noreply.github.com>
Co-authored-by: xiangyu.xie <xiangyu.xie@psi.ch>
2025-04-01 15:15:54 +02:00
Erik Fröjdh
9d8e803474
Merge branch 'main' into developer
2025-04-01 14:35:27 +02:00
Erik Fröjdh
a42c0d645b
added roi, noise and gain ( #143 )
...
- Moved definitions of Cluster_2x2 and Cluster_3x3 to it's own file
- Added optional members for ROI, noise_map and gain_map in ClusterFile
**API:**
After creating the ClusterFile the user can set one or all of: roi,
noise_map, gain_map
```python
f = ClusterFile(fname)
f.set_roi(roi) #aare.ROI
f.set_noise_map(noise_map) #numpy array
f.set_gain_map(gain_map) #numpy array
```
**When reading clusters they are evaluated in the order:**
1. If ROI is enabled check that the cluster is within the ROI
1. If noise_map is enabled check that the cluster meets one of the
conditions
- Center pixel above noise
- Highest 2x2 sum above 2x noise
- 3x3 sum above 3x noise
1. If gain_map is set apply the gain map before returning the clusters
(not used for noise cut)
**Open questions:**
1. Check for out of bounds access in noise and gain map?
closes #139
closes #135
closes #90
2025-04-01 14:31:25 +02:00
Mazzoleni Alice Francesca
508adf5016
refactoring of remaining files
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 40s
Build the package using cmake then documentation / deploy (push) Has been skipped
2025-04-01 10:01:23 +02:00
Mazzoleni Alice Francesca
e038bd1646
refactored and put calculate_eta function in seperate file
2025-03-31 17:35:39 +02:00
f8f98b6ec3
Generalized calculate_eta2 function to work with general cluster types
2025-03-28 14:29:20 +01:00
0876b6891a
cpp Cluster and ClusterVector and ClusterFile are templated now, they support generic cluster types
2025-03-25 21:42:50 +01:00
Erik Fröjdh
6ad76f63c1
Fixed reading clusters with ROI ( #142 )
...
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 9s
Fixed incorrect reading of clusters with ROI
closes #141
2025-03-24 14:28:10 +01:00
6e7e81b36b
complete mess but need to install RedHat 9
2025-03-21 16:32:54 +01:00
Erik Fröjdh
5d8ad27b21
Developer ( #138 )
...
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Successful in 1m45s
- Fully functioning variable size cluster finder
- Added interpolation
- Bit reordering for ADC SAR 05
---------
Co-authored-by: Patrick <patrick.sieberer@psi.ch>
Co-authored-by: JulianHeymes <julian.heymes@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: xiangyu.xie <xiangyu.xie@psi.ch>
2025-03-20 12:52:04 +01:00
Erik Fröjdh
11cd2ec654
Interpolate ( #137 )
...
- added eta based interpolation
2025-03-18 17:45:38 +01:00
froejdh_e
332bdeb02b
modified algo
2025-03-14 11:07:09 +01:00
froejdh_e
3a987319d4
WIP
2025-03-05 21:51:23 +01:00
froejdh_e
5614cb4673
WIP
2025-03-05 17:40:08 +01:00
froejdh_e
8ae6bb76f8
removed warnings added clang-tidy
2025-02-21 11:18:39 +01:00
Erik Fröjdh
b7a47576a1
Multi threaded fitting and returning chi2 ( #132 )
...
Co-authored-by: Patrick <patrick.sieberer@psi.ch>
Co-authored-by: JulianHeymes <julian.heymes@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2025-02-19 07:19:59 +01:00
Erik Fröjdh
fc1c9f35d6
Merge branch 'main' into developer
2025-02-18 21:52:20 +01:00
Erik Fröjdh
6a83988485
Added chi2 to fit results ( #131 )
...
- fit_gaus and fit_pol1 now return a dict
- calculate chi2 after fit
- cleaned up code
2025-02-18 21:13:27 +01:00
