tyler/flares
2
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 12 Wiki Activity

crash and documentation fixes

Browse Source
This commit is contained in:
tyler
2026-01-15 12:04:55 -08:00
parent 2ecd357aca
commit 9779a63a9c
3 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
flares.py
View File

@@ -2578,7 +2578,10 @@ def plot_fir_model_results(df, raw_haemo, dm, selected_event, l_bound, u_bound):
dm_cols_activity = np.where([f"{selected_event}" in c for c in dm.columns])[0]
dm = dm[[dm.columns[i] for i in dm_cols_activity]]
lme = smf.mixedlm("theta ~ -1 + delay:TidyCond:Chroma", df, groups=df["ID"]).fit()
try:
lme = smf.mixedlm("theta ~ -1 + delay:TidyCond:Chroma", df, groups=df["ID"]).fit()
except:
lme = smf.ols("theta ~ -1 + delay:TidyCond:Chroma", df, groups=df["ID"]).fit() # type: ignore
df_sum = statsmodels_to_results(lme)
df_sum["delay"] = [int(n) for n in df_sum["delay"]]
@@ -3516,21 +3519,21 @@ def process_participant(file_path, progress_callback=None):
if progress_callback: progress_callback(19)
logger.info("19")
# Step 16: Plot GLM results
# Step 20: Generate GLM Results
fig_glm_result = plot_glm_results(file_path, raw_haemo, glm_est, design_matrix)
for name, fig in fig_glm_result:
fig_individual[f"GLM {name}"] = fig
if progress_callback: progress_callback(21)
logger.info("21")
if progress_callback: progress_callback(20)
logger.info("20")
# Step 17: Plot channel significance
# Step 21: Generate Channel Significance
fig_significance = individual_significance(raw_haemo, glm_est)
for name, fig in fig_significance:
fig_individual[f"Significance {name}"] = fig
if progress_callback: progress_callback(22)
logger.info("22")
if progress_callback: progress_callback(21)
logger.info("21")
# Step 18: cha, con, roi
# Step 22: Generate Channel, Region of Interest, and Contrast Results
cha = glm_est.to_dataframe()
# HACK: Comment out line 588 (self._renderer.show()) in _brain.py from MNE
@@ -3583,10 +3586,10 @@ def process_participant(file_path, progress_callback=None):
contrast_dict[condition] = contrast_vector
if progress_callback: progress_callback(23)
logger.info("23")
if progress_callback: progress_callback(22)
logger.info("22")
# Compute contrast results
# Step 23: Compute Contrast Results
contrast_results = {}
for cond, contrast_vector in contrast_dict.items():
@@ -3597,10 +3600,10 @@ def process_participant(file_path, progress_callback=None):
cha["ID"] = file_path
if progress_callback: progress_callback(24)
logger.info("24")
if progress_callback: progress_callback(23)
logger.info("23")
# Step 24: Finishing Up
fig_bytes = convert_fig_dict_to_png_bytes(fig_individual)
sanitize_paths_for_pickle(raw_haemo, epochs)