Skip to content

Update to the BufferHandler #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f6c33e6
fix group_name error
zain-sohail Jul 2, 2024
30e7447
bring back old behavior
zain-sohail Jul 2, 2024
49d93e9
minor changes
zain-sohail Jul 2, 2024
d830e8c
use concat for faster join
zain-sohail Jul 3, 2024
c48a6ec
try saving both
zain-sohail Jul 3, 2024
4d11d7a
change fill section
zain-sohail Jul 4, 2024
88f0e9c
parallel processing
zain-sohail Jul 4, 2024
f6a45e5
change paths config to hold raw and processed keys
zain-sohail Jul 4, 2024
a8632ab
change filehandling of buffer files as it's more complicated now, and…
zain-sohail Jul 4, 2024
53ea8fd
add dtype handler, make more changes to filepath handler
zain-sohail Jul 6, 2024
e436397
update methods and tests
zain-sohail Jul 7, 2024
1b2e788
sxp test fixes
zain-sohail Jul 7, 2024
7ed0962
processor test fixes
zain-sohail Jul 7, 2024
7d1262b
sxp test fixes
zain-sohail Jul 7, 2024
5b6f940
remove 0 vals from all pulse channels
zain-sohail Jul 8, 2024
4b682a5
Merge branch 'v1_feature_branch' into fix-459
rettigl Jul 9, 2024
b325ba6
update paths
rettigl Jul 9, 2024
852ce8e
revert the benchmarking
zain-sohail Jul 10, 2024
2de5243
update aux channel handling
zain-sohail Jul 15, 2024
770af0d
index sorting
zain-sohail Jul 17, 2024
7944043
roll back the buffer_handler with small changes
zain-sohail Jul 17, 2024
adfd335
fix some test issues
zain-sohail Jul 17, 2024
dc74566
Merge remote-tracking branch 'origin/v1_feature_branch' into fix-459
rettigl Jul 18, 2024
4d35e54
some metadata changes
zain-sohail Jul 18, 2024
b9bef4f
Merge branch 'fix-459' into flash-minor-changes
zain-sohail Jul 18, 2024
0aab5c4
use correct lock
zain-sohail Jul 18, 2024
1966ac4
roll back to iterations
zain-sohail Jul 18, 2024
d09e715
add aux alias and subchannels argument
zain-sohail Jul 23, 2024
b0471f2
change name and return of the run method
zain-sohail Jul 23, 2024
85c1315
Merge pull request #479 from OpenCOMPES/flash-minor-changes
zain-sohail Jul 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 37 additions & 13 deletions sed/config/flash_example_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ core:
# provided, the loader will try to find the data based on year beamtimeID etc
paths:
# location of the raw data.
data_raw_dir: ""
raw: ""
# location of the intermediate parquet files.
data_parquet_dir: ""
processed: ""

binning:
# Histogram computation mode to use.
Expand Down Expand Up @@ -66,6 +66,10 @@ dataframe:
corrected_tof_column: "tm"
# the time stamp column
time_stamp_alias: timeStamp
# auxiliary channel alias
aux_alias: dldAux
# aux subchannels alias
aux_subchannels_alias: dldAuxChannels
# time length of a base time-of-flight bin in seconds
tof_binwidth: 2.0576131995767355E-11
# binning parameter for time-of-flight data.
Expand Down Expand Up @@ -100,10 +104,17 @@ dataframe:

# The channels to load.
# channels have the following structure:
# channelAlias:
# <channelAlias>:
# format: per_pulse/per_electron/per_train
# group_name: the hdf5 group path
# slice: if the group contains multidimensional data, where to slice
# index_key: the hdf5 index key
# dataset_key: the hdf5 dataset key
# slice: int to slice a multidimensional data along axis=1. If not defined, there is no slicing
# dtype: the datatype of the data
# subChannels: further aliases for if the data is multidimensional and needs to be split in different cols
# used currently for the auxiliary channel
# <subChannelAlias>:
# slice: int to slice a multidimensional data along axis=1. Must be defined
# dtype: the datatype of the data

channels:
# The timestamp
Expand All @@ -118,20 +129,23 @@ dataframe:
index_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/index"
dataset_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/value"
slice: 2
dtype: uint16

# detector x position
dldPosX:
format: per_electron
index_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/index"
dataset_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/value"
slice: 1
dtype: uint16

# detector y position
dldPosY:
format: per_electron
index_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/index"
dataset_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/value"
slice: 0
dtype: uint16

# Detector time-of-flight channel
# if split_sector_id_from_dld_time is set to True, This this will generate
Expand All @@ -141,6 +155,7 @@ dataframe:
index_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/index"
dataset_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/value"
slice: 3
dtype: uint32

# The auxiliary channel has a special structure where the group further contains
# a multidimensional structure so further aliases are defined below
Expand All @@ -149,14 +164,23 @@ dataframe:
index_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/index"
dataset_key: "/uncategorised/FLASH.EXP/HEXTOF.DAQ/DLD1/value"
slice: 4
dldAuxChannels:
sampleBias: 0
tofVoltage: 1
extractorVoltage: 2
extractorCurrent: 3
cryoTemperature: 4
sampleTemperature: 5
dldTimeBinSize: 15
subChannels:
sampleBias:
slice: 0
dtype: float32
tofVoltage:
slice: 1
dtype: float64
extractorVoltage:
slice: 2
extractorCurrent:
slice: 3
cryoTemperature:
slice: 4
sampleTemperature:
slice: 5
dldTimeBinSize:
slice: 15

# ADC containing the pulser sign (1: value approx. 35000, 0: 33000)
pulserSignAdc:
Expand Down
Loading