|
f47e1bbb88
|
Update addmask.py
|
2025-05-19 19:30:33 +02:00 |
|
|
1585a1b4a4
|
Update addmask.py
|
2025-05-19 19:27:12 +02:00 |
|
|
0793d4e298
|
Update addmask.py
|
2025-05-19 17:54:46 +02:00 |
|
|
e596def451
|
renamed JF06T08V06 -> JF06T08V07
|
2025-01-22 19:28:05 +01:00 |
|
|
9ae4464086
|
generalized "SPI analysis" from 2 to N ROIs (incl. N=0)
|
2024-12-05 12:23:26 +01:00 |
|
|
b245387d79
|
renamed: JF06T08V05 -> JF06T08V06
|
2024-11-19 14:05:01 +01:00 |
|
|
4027fcbc67
|
Merge branch 'refactor' into 'main'
refactor
See merge request sf-daq/dap!1
|
2024-10-12 17:09:09 +02:00 |
|
|
7a57201ca3
|
fixed dtype of "roi_intensities_normalised" if threshold_value != "NaN"
|
2024-10-03 12:13:39 +02:00 |
|
|
98bbe76936
|
typo: vmin instead of vmax
|
2024-10-03 11:50:49 +02:00 |
|
|
df17ae536c
|
numpy arrays do not like to be treated as booleans
|
2024-10-03 11:03:55 +02:00 |
|
|
5bf58d1193
|
fixed dtype of "roi_intensities"
|
2024-10-03 11:02:24 +02:00 |
|
|
05905d183c
|
bumped version of JF06 (4 -> 5)
|
2024-09-11 21:36:14 +02:00 |
|
|
f18af38dc6
|
reordered operations
|
2024-09-04 17:30:43 +02:00 |
|
|
35c50b472f
|
split updating nmax and checking readiness
|
2024-08-30 18:01:13 +02:00 |
|
|
a65553e13a
|
removed apply_aggregation check [aggregator cannot be ready if apply_aggregation is False]
|
2024-08-30 17:38:16 +02:00 |
|
|
7a05d8f095
|
moved aggregator.reset() [this now also resets if aggregation_max wasnt given]
|
2024-08-30 15:56:27 +02:00 |
|
|
4db7f4f8cd
|
moved "not ready" due to missing aggregation_max into Aggregator
|
2024-08-30 14:53:05 +02:00 |
|
|
7d57d6c5e0
|
removed unused data argument and numpy import
|
2024-08-30 11:54:10 +02:00 |
|
|
1350093d5a
|
removed apply_threshold check from calc_aggregation_ready as these are independent operations
|
2024-08-30 11:52:35 +02:00 |
|
|
470aa52ff9
|
use the proper check from JU [this includes checking for the gain now, which probably was ommitted before since the gain file rarely changes and always exists]
|
2024-08-29 10:56:46 +02:00 |
|
|
cc0113507b
|
removed unreachable special case for raw data (uint16) reaching aggregation [adapter.process calls handler.process with conversion=handler.can_convert(), which checks if gain and pedestal are truthy; with conversion, the dtype is float32 or int32; if handler.pedestal_file is falsy, the image is skipped upon receive -> special case can never trigger]
|
2024-08-29 10:37:04 +02:00 |
|
|
cb79be0a3e
|
added/use Aggregator.is_ready
|
2024-08-28 10:53:21 +02:00 |
|
|
1e6af40d56
|
moved calc_apply_threshold out of calc_data, removed special case check
|
2024-08-28 10:39:01 +02:00 |
|
|
b99a32d9d7
|
renamed raw_data -> raw_image
|
2024-08-28 10:21:32 +02:00 |
|
|
8981eab522
|
renamed pfdata -> pfimage
|
2024-08-28 10:19:01 +02:00 |
|
|
6ca0ebf945
|
renamed data -> image
|
2024-08-28 10:16:30 +02:00 |
|
|
f2f871c880
|
renamed image -> raw_data
|
2024-08-28 10:13:21 +02:00 |
|
|
d0c1621109
|
consistency: removed special case that sends the raw data image instead of the processed image data [special case triggered if apply_aggregation and apply_threshold are off, but both can still be not applied if the respective parameters (aggregation_max, threshold_min, threshold_max) are not given, which would send data ]
|
2024-08-28 10:08:18 +02:00 |
|
|
b1f104a71d
|
disentangle
|
2024-08-21 15:55:23 +02:00 |
|
|
18d6dd0b7b
|
consistent naming with the other algos
|
2024-08-20 22:23:36 +02:00 |
|
|
4b01cb0dca
|
naming; switch order
|
2024-08-20 22:17:56 +02:00 |
|
|
547b2b7fb1
|
disentangle
|
2024-08-20 22:11:16 +02:00 |
|
|
d3ac74835e
|
simplified
|
2024-08-19 13:02:36 +02:00 |
|
|
52e7260fb1
|
added (commented) an alternative idea
|
2024-08-19 12:59:07 +02:00 |
|
|
cea2b0c741
|
moved random skip logic into separate file, added some comments on how it works
|
2024-08-19 12:41:49 +02:00 |
|
|
17e2aa1096
|
tried to make logic self-explanatory
|
2024-08-19 12:24:21 +02:00 |
|
|
faa774e4dc
|
de morgan
|
2024-08-15 10:07:50 +02:00 |
|
|
c8d9473271
|
breaking this apart a bit more
|
2024-08-15 10:00:02 +02:00 |
|
|
fd2345c611
|
aggregator changes are in-place
|
2024-08-13 13:48:45 +02:00 |
|
|
e0e9cf02d7
|
added ignore list
|
2024-08-13 09:52:38 +02:00 |
|
|
d8b4931a28
|
added/use Aggregator to encapsulate data_summed and n_aggregated_images
|
2024-08-13 09:52:24 +02:00 |
|
|
a8c73bab0f
|
count correctly: 1, 1, 2, 3, ... -> 0, 1, 2, 3, ...
|
2024-08-12 10:04:10 +02:00 |
|
|
2acf116709
|
re-use thresh function
|
2024-08-09 19:48:48 +02:00 |
|
|
dcdacf4bdb
|
re-use function
|
2024-08-09 19:18:06 +02:00 |
|
|
34eb466622
|
fixed inconsistent returns
|
2024-08-09 17:10:00 +02:00 |
|
|
442a7dab28
|
moved comments out
|
2024-08-09 15:57:17 +02:00 |
|
|
5f055c8718
|
flatten the code; early exit
|
2024-08-09 15:54:54 +02:00 |
|
|
2103583aca
|
moved calc_apply_threshold out of calc_radial_integration
|
2024-08-09 15:41:46 +02:00 |
|
|
48c6bbe7c7
|
zero is zero
|
2024-08-09 15:04:22 +02:00 |
|
|
f12a736355
|
simpler logic
|
2024-08-09 14:54:30 +02:00 |
|