froejdh_e
a90e532b21
removed extra sum after merge
Build on RHEL9 / buildh (push) Failing after 1m57s
2025-04-15 08:08:59 +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
3f753ec900
Some fixes (need more testing later) ( #159 )
...
Build on RHEL9 / buildh (push) Failing after 1m51s
- Change of pointer size caused out of bounds write
- UB to write to memory reserved by std::vector::reserver --> allocate
dummy clusters by using resize instead
- but now we can't reserve like we want to, need a fix.
- format string not working, fixed
2025-04-11 14:43:12 +02:00
Mazzoleni Alice Francesca
15e52565a9
dont convert to byte
2025-04-11 14:35:20 +02:00
froejdh_e
e71569b15e
resize before read
2025-04-11 13:38:33 +02:00
froejdh_e
92f5421481
np test
2025-04-10 16:58:47 +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
Mazzoleni Alice Francesca
a13affa4d3
changed template arguments added tests
2025-04-10 09:13:58 +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
froejdh_e
894065fe9c
added utility plot
Build on RHEL9 / buildh (push) Successful in 1m48s
2025-04-09 12:19:14 +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
20d1d02fda
function signature for push back ( #153 )
...
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 48s
This example now works:
```python
cl = Cluster3x3i(5,7,np.array((1,2,3,4,5,6,7,8,9), dtype = np.int32))
cv = ClusterVector_Cluster3x3i()
cv.push_back(cl)
```
2025-04-07 17:18:17 +02:00
froejdh_e
10e4e10431
function signature for push back
2025-04-07 15:33:37 +02:00
Mazzoleni Alice Francesca
017960d963
added push_back property
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 37s
2025-04-07 13:41:14 +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
e24ed68416
fixed include
2025-04-03 16:50:02 +02:00
Mazzoleni Alice Francesca
248d25486f
refactored python files
2025-04-03 16:38:12 +02:00
Erik Fröjdh
7db1ae4d94
Dev/gitea ci ( #151 )
...
Build on RHEL9 / buildh (push) Successful in 1m41s
Build and test on internal PSI gitea
2025-04-03 13:18:55 +02:00
Mazzoleni Alice Francesca
a24bbd9cf9
started to do python refactoring
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 44s
2025-04-03 11:56:25 +02:00
Mazzoleni Alice Francesca
d7ef9bb1d8
missed some refactoring of datatypes
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 49s
2025-04-03 11:36:15 +02:00
Mazzoleni Alice Francesca
de9fc16e89
generalize is_selected
2025-04-03 09:28:54 +02:00
Mazzoleni Alice Francesca
85a6b5b95e
suppress compiler warnings
2025-04-03 09:28:02 +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
98d2d6098e
refactored other cpp files
2025-04-02 16:00:46 +02:00
Mazzoleni Alice Francesca
61af1105a1
templated eta and updated test
2025-04-02 14:42:38 +02:00
Mazzoleni Alice Francesca
240960d3e7
generalized FindCluster to read in general cluster sizes - assuming that finding cluster center is equal for all clusters
2025-04-02 12:05:16 +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
froejdh_e
8cad7a50a6
fixed py
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 42s
2025-04-01 15:00:03 +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
Mazzoleni Alice Francesca
7e5f91c6ec
added benchmark to time generalize calculate_eta - twice as long so will keep specific version for 2x2 and 3x3 clusters
2025-03-31 17:04:57 +02:00
Mazzoleni Alice Francesca
ed9ef7c600
removed analyze_cluster function as not used anymore
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 52s
Build the package using cmake then documentation / deploy (push) Has been skipped
2025-03-31 12:26:29 +02:00
57bb6c71ae
ClusterSize should be larger than 1
Build the package using cmake then documentation / build (ubuntu-latest, 3.12) (push) Failing after 51s
Build the package using cmake then documentation / deploy (push) Has been skipped
2025-03-28 14:49:55 +01: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
