Erik Fröjdh
6f291e3d4e
Merge branch 'developer' into fit_scurve
Build on RHEL9 / build (push) Successful in 2m17s
Build on RHEL8 / build (push) Failing after 2m33s
2025-04-25 15:54:00 +02:00
Erik Fröjdh
12ae1424fb
consistent use of ssize_t instead of int64_t ( #167 )
...
Build on RHEL9 / build (push) Successful in 2m10s
Build on RHEL8 / build (push) Failing after 2m33s
- Consistent use of ssize_t to avoid issues on 32 bit platforms and also
mac with (long long int as ssize_t)
2025-04-25 15:52:02 +02:00
froejdh_e
d1292a4c1e
Merge branch 'developer' into fit_scurve
2025-04-25 12:33:14 +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
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
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
c6e8e5f6a1
inverted gain map
2025-04-22 16:16:27 +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
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
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
e71569b15e
resize before read
2025-04-11 13:38:33 +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
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
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
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
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
6e7e81b36b
complete mess but need to install RedHat 9
2025-03-21 16:32:54 +01:00
