Add vds generation #86
Conversation
jacob720
force-pushed
the
85_add_vds_generation
branch
from
d1684f5 to
371e9a0
Compare
| bit_depth_image: AttrR[int] | ||
| compression: AttrRW[str] | ||
| trigger_mode: AttrR[str] | ||
| nimages: AttrR[int] |
There was a problem hiding this comment.
May be better to get this out of OD.FP.frames?
GDYendell
left a comment
GDYendell
left a comment
There was a problem hiding this comment.
This looks pretty good! Something I should have mentioned is that we need to create multiple virtual datasets. This should be easy enough, it will just need a bit of re-ordering to avoid repeating the calculations.
I think there should be a for loop over dataset_names (now passed in) inside the with File block where all creation of v_source and v_layout is done, with pre-computation of frame layouts done before if possible.
| create_interleave_vds( | ||
| path=Path(self.OD.file_path.get()), | ||
| prefix=self.OD.file_prefix.get(), | ||
| frame_count=self.detector.nimages.get(), |
There was a problem hiding this comment.
This should probably be OD.FP.frames
| prefix=self.OD.file_prefix.get(), | ||
| frame_count=self.detector.nimages.get(), | ||
| frames_per_block=self.OD.block_size.get(), | ||
| blocks_per_file=self.OD.FP.process_blocks_per_file.get(), |
There was a problem hiding this comment.
process_blocks_per_file needs adding to the EigerFrameProcessorPlugin
There was a problem hiding this comment.
DiamondLightSource/fastcs-odin#98
Have added this and the other attributes here
| frame_shape=( | ||
| self.detector.x_pixels_in_detector.get(), | ||
| self.detector.y_pixels_in_detector.get(), | ||
| ), |
There was a problem hiding this comment.
This should be OD.FP.data_dims_0/1. These probably don't change if it is in ROI mode.
| dtype=dtype, | ||
| ) | ||
|
|
||
| for file_writer_idx, n_frames in enumerate(frame_count_per_file_writer): |
There was a problem hiding this comment.
I am not sure that you need to iterate over file writer index and then its local file
index. I think it should just iterate over the global file index and the number of writers
only affects the stride of the layout slice.
There was a problem hiding this comment.
I think when calculating the frame distribution, it is useful to iterate over the file writer index, as the total number of files is dependant on the number of file writers, the frame count and block size. And for each file, knowing which file writer wrote it and the number of writers is needed to calculate the start value.
|
Where can I get the dataset names from? Couldn't find them anywhere in the Phoebus screens but I probably missed them |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## top-level-attributes #86 +/- ##
========================================================
+ Coverage 82.00% 83.72% +1.72%
========================================================
Files 14 15 +1
Lines 450 510 +60
========================================================
+ Hits 369 427 +58
- Misses 81 83 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
2 participants
Fixes #85
Requires DiamondLightSource/fastcs-odin#98