From cc1f3ab4f68439364e3f120eb1d2d18b32b1daf5 Mon Sep 17 00:00:00 2001 From: sakul-45 <81963567+sakul-45@users.noreply.github.com> Date: Mon, 2 Aug 2021 18:07:34 +0200 Subject: [PATCH] Fixed Temperature in fitting function. Now not always [0 0 0] at beginning. --- TR_EPR_script.m | 8 ++++---- simulation_TREPR.m | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TR_EPR_script.m b/TR_EPR_script.m index 5b813de..f4d8d89 100644 --- a/TR_EPR_script.m +++ b/TR_EPR_script.m @@ -4,11 +4,11 @@ close all %Script for calling the functions of TR-EPR toolbox %path to dataset -% datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\example_data.mat'; -% [raw_data,params] = load_matlab(datapath); +datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\example_data.mat'; +[raw_data,params] = load_matlab(datapath); -datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\pentacene_355nm_481pt.DSC'; -[raw_data,params] = load_bruker(datapath); +% datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\pentacene_355nm_481pt.DSC'; +% [raw_data,params] = load_bruker(datapath); [time_corr_data,params] = correct_time_baseline(raw_data,params); diff --git a/simulation_TREPR.m b/simulation_TREPR.m index 963bf4b..a01f35e 100644 --- a/simulation_TREPR.m +++ b/simulation_TREPR.m @@ -24,6 +24,7 @@ eventdata.manExp.CenterSweep = 0.1*[params.Field_Center params.Field_Sweep]; % m eventdata.manExp.Harmonic = 0; % zeroth harmonic eventdata.manExp.Temperature = params.Triplett_pop; eventdata.simSys = params.Manual_Sys; %initialize simulation parameters +eventdata.simSys.Temperature = params.Triplett_pop; eventdata.simExp = eventdata.manExp; eventdata.SaveStat = 0; %counter if save button was pushed @@ -329,7 +330,6 @@ uiwait(fig) Sys0 = eventdata.simSys; Exp0 = eventdata.simExp; %perform fit - Sys0.Temperature = [0 0 0]; [BestSys,BestSpc] = esfit('thyme',params.max_mean,Sys0,Vary,Exp0,[],FitOpt); plot(ax,0.1*params.Field_Vector,params.max_mean,'r',... 0.1*params.Field_Vector,BestSpc,'b','LineWidth',1.2)