froejdh_e
d1292a4c1e
Merge branch 'developer' into fit_scurve
2025-04-25 12:33:14 +02:00
d5226909fe
Api cluster vector ( #147 )
...
Cluster is newly templated on ClusterSize, Cluster data type and cluster coordinate type, accepting arbitrary cluster sizes.
2025-04-25 12:29:39 +02:00
mazzol_a
eb6862ff99
changed name of GainMap to InvertedGainMap
Build on RHEL9 / build (push) Successful in 2m16s
Build on RHEL8 / build (push) Failing after 2m34s
2025-04-25 12:03:59 +02:00
froejdh_e
a871a7e7f6
fixed number of parameters
2025-04-25 12:00:29 +02:00
mazzol_a
f06e722dce
changes from PR review
2025-04-25 11:38:56 +02:00
froejdh_e
78406dc881
merged developer
2025-04-25 11:05:09 +02:00
Erik Fröjdh
2e0424254c
removed uneccecary codna numpy variants ( #165 )
...
With numpy 2.0 we no longer need to build against every supported numpy
version. This way we can save up to 6 builds.
- https://numpy.org/doc/stable/dev/depending_on_numpy.html
-
https://conda-forge.org/docs/maintainer/knowledge_base/#building-against-numpy
2025-04-25 10:31:40 +02:00
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
froejdh_e
129e7e9f9d
Merge branch 'developer' of github.com:slsdetectorgroup/aare into developer
Build on RHEL9 / build (push) Successful in 1m59s
Build on RHEL8 / build (push) Successful in 2m29s
2025-04-22 16:24:32 +02:00
froejdh_e
58c934d9cf
added mpl to conda specs
2025-04-22 16:24:15 +02:00
Erik Fröjdh
4088b0889d
Merge branch 'main' into developer
2025-04-22 16:18:48 +02:00
mazzol_a
d5f8daf194
removed debug option in CMakelist
Build on RHEL9 / buildh (push) Successful in 2m36s
2025-04-22 16:16:31 +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
Erik Fröjdh
84aafa75f6
Building wheels and uploading to pypi ( #160 )
...
Build on RHEL9 / build (push) Successful in 1m56s
Build on RHEL8 / build (push) Successful in 2m13s
Still to be resolved in another PR:
- Consistent versioning across compiled code, conda and pypi
2025-04-22 08:36:34 +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
14211047ff
added function warpper around ClusterFinderMT and ClusterCollector to construct object
2025-04-16 14:22:44 +02:00
Mazzoleni Alice Francesca
acd9d5d487
moved parts of ClusterFile implementation into declaration
Build on RHEL9 / buildh (push) Successful in 1m55s
2025-04-15 15:15:34 +02:00
Mazzoleni Alice Francesca
d4050ec557
enum is now enum class
2025-04-15 14:57:25 +02:00
Mazzoleni Alice Francesca
fca9d5d2fa
replaced extract template parameters
2025-04-15 14:40:09 +02:00
Mazzoleni Alice Francesca
1174f7f434
fixed calculate eta
2025-04-15 13:18:25 +02:00
2bb7d360bf
Adding more tests, fixing hitmap and reading with cuts ( #161 )
...
- Fix for hitmap
- Fix for reading clusters with cut
- Added more tests around eta
- Added factory function for creating the cluster finder
2025-04-15 12:25:01 +02:00
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
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
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
Erik Fröjdh
6e4db45b57
Activated RH8 build on PSI gitea ( #155 )
Build on RHEL8 / build (push) Successful in 1m56s
Build on RHEL9 / build (push) Successful in 1m44s
2025-04-10 10:17:16 +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
