fr/tmp_optifik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify finds_peak

Browse source
This commit is contained in:
François Boulogne 2025-05-21 14:05:08 +02:00
parent 022966608a
commit 56aac01151
6 changed files with 66 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

53
optifik/analysis.py
View file

@ -48,14 +48,7 @@ def plot_xy(file_path, plot=True):
def finds_peak(filename, min_peak_prominence, min_peak_distance=10, plot=None):
def finds_peak(lambdas, intensities, min_peak_prominence, min_peak_distance=10, plot=None):
"""
Charge un fichier .xy et affiche les données avec les extrema détectés (minima et maxima).
@ -68,10 +61,11 @@ def finds_peak(filename, min_peak_prominence, min_peak_distance=10, plot=None):
min_peak_distance : float
Distance minimale entre les pics.
"""
# Charger et lisser les données
lambdas, intensities = load_spectrum(filename, lambda_min=450)
WIN_SIZE = 11
smoothed_intensities = savgol_filter(intensities, WIN_SIZE, 3)
smoothed_intensities = intensities
# Trouver les maxima et minima sur le signal lissé
peaks_max, _ = find_peaks(smoothed_intensities, prominence=min_peak_prominence, distance=min_peak_distance)
peaks_min, _ = find_peaks(-smoothed_intensities, prominence=min_peak_prominence, distance=min_peak_distance)
@ -84,50 +78,29 @@ def finds_peak(filename, min_peak_prominence, min_peak_distance=10, plot=None):
plt.xlabel(r'$\lambda$ (nm)')
plt.ylabel(r'$I^*$')
plt.legend()
plt.tight_layout()
plt.tight_layout()
plt.show()
# Nombre total d’extremums
total_extrema = len(peaks_max) + len(peaks_min)
if total_extrema >=15:
if total_extrema >= 15:
print('Number of extrema', total_extrema,'.')
print('FFT method')
if total_extrema <=15 and total_extrema >4:
if total_extrema <= 15 and total_extrema > 4:
print('Number of extrema', total_extrema,'.')
print('OOSpectro method')
if total_extrema <=4:
if total_extrema <= 4:
print('Number of extrema', total_extrema,'.')
print('Scheludko method')
return total_extrema, smoothed_intensities, intensities, lambdas, peaks_min, peaks_max
return total_extrema, peaks_min, peaks_max
def Data_Smoothed(filename):
"""
Charge un fichier .xy et affiche les données avec les extrema détectés (minima et maxima).
Parameters
----------
filename : str
Chemin vers le fichier .xy (2 colonnes : lambda et intensité).
min_peak_prominence : float
Importance minimale des pics.
min_peak_distance : float
Distance minimale entre les pics.
"""
# Charger et lisser les données
lambdas, intensities = load_spectrum(filename, lambda_min=450)
def smooth_intensities(intensities):
WIN_SIZE = 11
smoothed_intensities = savgol_filter(intensities, WIN_SIZE, 3)
return smoothed_intensities, intensities, lambdas
return smoothed_intensities

12
optifik/auto.py
View file

@ -10,11 +10,13 @@ def auto(DATA_FOLDER, FILE_NAME, plot=None):
##### Affichage du spectre brut et récupération des Intesités brutes#####
raw_intensities = load_spectrum(spectre_file)
lambdas, raw_intensities = load_spectrum(spectre_file, lambda_min=450)
##### Affichage du spectre lissé #####
smoothed_intensities, intensities, lambdas = Data_Smoothed(spectre_file)
#smoothed_intensities, intensities, lambdas = Data_Smoothed(spectre_file)
smoothed_intensities = smooth_intensities(raw_intensities)
##### Indice Optique en fonction de Lambda #####
@ -30,9 +32,9 @@ def auto(DATA_FOLDER, FILE_NAME, plot=None):
prominence = 0.03
##### Find Peak #####
total_extrema, smoothed_intensities, raw_intensities, lambdas, peaks_min, peaks_max = finds_peak(spectre_file,
min_peak_prominence=prominence,
plot=plot)
total_extrema, peaks_min, peaks_max = finds_peak(lambdas, smoothed_intensities,
min_peak_prominence=prominence,
plot=plot)
##### Epaisseur selon la methode #####