Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
91 changes: 72 additions & 19 deletions examples/postprocessing.ipynb

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ledsa/analysis/ExtinctionCoefficients.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ def set_all_member_variables(self) -> None:
"""
if len(self.distances_per_led_and_layer) == 0:
self.distances_per_led_and_layer = self.calc_distance_array()
np.savetxt(f'distances_per_led_and_layer.txt', self.distances_per_led_and_layer)
file_name = f'led_array_{self.experiment.led_array}_distances_per_layer.txt'
np.savetxt(file_name, self.distances_per_led_and_layer)
if self.calculated_img_data.empty:
self.load_img_data()
if self.ref_intensities.shape[0] == 0:
Expand Down
6 changes: 4 additions & 2 deletions ledsa/postprocessing/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ def _get_extco_df_from_path(self):
file_df = pd.read_csv(file, skiprows=4)
channel = int(file.split('channel_')[1].split('_')[0])
led_array = int(file.split('array_')[1].split('.')[0])
n_layers = len(file_df.columns)
# For backwards compatibility, check if Experiment_Time[s] is already in the dataframe
if 'Experiment_Time[s]' not in file_df.columns:
if '# Experiment_Time[s]' not in file_df.columns:
time = self.image_info_df['Experiment_Time[s]'].astype(int)
file_df = file_df.merge(time, left_index=True, right_index=True)
else:
file_df.rename(columns={'# Experiment_Time[s]': 'Experiment_Time[s]'}, inplace=True) # TODO: this is just a workaround, do better...
file_df.set_index('Experiment_Time[s]', inplace=True)
n_layers = len(file_df.columns)
iterables = [[channel], [led_array], [i for i in range(0, n_layers)]]
file_df.columns = pd.MultiIndex.from_product(iterables, names=["Channel", "LED Array", "Layer"])
extco_list.append(file_df)
Expand Down
Loading