File tree Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -217,8 +217,7 @@ dataframe:
217
217
218
218
# metadata collection from scicat
219
219
# metadata:
220
- # scicat_url: <URL>
221
- # scicat_token: <TOKEN>
220
+ # archiver_url: <URL>
222
221
223
222
# The nexus collection routine shall be finalized soon for both instruments
224
223
nexus :
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ dataframe:
102
102
# format: per_file
103
103
# dataset_key: "/uncategorised/FLASH.DIAG/TIMINGINFO/TIME1.BUNCH_FIRST_INDEX.1/time"
104
104
# event key
105
- numEvents :
105
+ index :
106
106
format : per_file
107
107
dataset_key : /DLD/NumOfEvents
108
108
# detector x position
@@ -156,11 +156,10 @@ dataframe:
156
156
157
157
# metadata collection from scicat
158
158
# metadata:
159
- # scicat_url: <URL>
160
- # scicat_token: <TOKEN>
159
+ # archiver_url: <URL>
161
160
162
161
# The nexus collection routine shall be finalized soon for both instruments
163
162
# nexus:
164
- # reader: "flash "
163
+ # reader: "mpes "
165
164
# definition: "NXmpes"
166
- # input_files: ["NXmpes_config_HEXTOF_light .json"]
165
+ # input_files: ["NXmpes_config-HEXTOF .json"]
Original file line number Diff line number Diff line change 14
14
import numpy as np
15
15
import pandas as pd
16
16
17
+ from sed .core .logging import setup_logging
17
18
from sed .loader .flash .utils import get_channels
18
19
from sed .loader .flash .utils import InvalidFileError
19
- from sed .core .logging import setup_logging
20
20
21
21
logger = setup_logging ("flash_dataframe_creator" )
22
22
@@ -434,7 +434,7 @@ def df_train(self) -> pd.DataFrame:
434
434
dataset = self .get_dataset_array (channel )
435
435
# Electron and pulse resolved MultiIndex is created. Since this is train data,
436
436
# the electron and pulse index is always 0
437
- index = np .cumsum ([0 , * self .get_dataset_array ("numEvents " )[:- 1 ]])
437
+ index = np .cumsum ([0 , * self .get_dataset_array ("index " )[:- 1 ]])
438
438
# Auxiliary dataset (which is stored in the same dataset as other DLD channels)
439
439
# contains multiple channels inside. Even though they are resolved per train,
440
440
# they come in pulse format, so the extra values are sliced and individual channels are
Original file line number Diff line number Diff line change @@ -58,9 +58,8 @@ def get_channels(
58
58
# Get the available channels excluding 'pulseId'.
59
59
available_channels = list (channel_dict .keys ())
60
60
# pulse alias is an index and should not be included in the list of channels.
61
- # Remove specified channels if they are present in available_channels.
62
- channels_to_remove = ["pulseId" , "numEvents" ]
63
- for channel in channels_to_remove :
61
+ # Remove index channels if they are present in available_channels.
62
+ for channel in index_list :
64
63
if channel in available_channels :
65
64
available_channels .remove (channel )
66
65
You can’t perform that action at this time.
0 commit comments