Fixed Temperature in fitting function. Now not always [0 0 0] at
beginning.
This commit is contained in:
		
							parent
							
								
									dda28fdf6d
								
							
						
					
					
						commit
						cc1f3ab4f6
					
				| @ -4,11 +4,11 @@ close all | |||||||
| %Script for calling the functions of TR-EPR toolbox | %Script for calling the functions of TR-EPR toolbox | ||||||
| 
 | 
 | ||||||
| %path to dataset | %path to dataset | ||||||
| % datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\example_data.mat'; | datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\example_data.mat'; | ||||||
| % [raw_data,params] = load_matlab(datapath); | [raw_data,params] = load_matlab(datapath); | ||||||
| 
 | 
 | ||||||
| datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\pentacene_355nm_481pt.DSC'; | % datapath = 'C:\Users\lukas\Nextcloud\Uni\Bachelorarbeit\tr-epr-simulation\pentacene_355nm_481pt.DSC'; | ||||||
| [raw_data,params] = load_bruker(datapath); | % [raw_data,params] = load_bruker(datapath); | ||||||
| 
 | 
 | ||||||
| [time_corr_data,params] = correct_time_baseline(raw_data,params); | [time_corr_data,params] = correct_time_baseline(raw_data,params); | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -24,6 +24,7 @@ eventdata.manExp.CenterSweep = 0.1*[params.Field_Center params.Field_Sweep]; % m | |||||||
| eventdata.manExp.Harmonic = 0; % zeroth harmonic | eventdata.manExp.Harmonic = 0; % zeroth harmonic | ||||||
| eventdata.manExp.Temperature = params.Triplett_pop; | eventdata.manExp.Temperature = params.Triplett_pop; | ||||||
| eventdata.simSys = params.Manual_Sys; %initialize simulation parameters | eventdata.simSys = params.Manual_Sys; %initialize simulation parameters | ||||||
|  | eventdata.simSys.Temperature = params.Triplett_pop; | ||||||
| eventdata.simExp = eventdata.manExp; | eventdata.simExp = eventdata.manExp; | ||||||
| eventdata.SaveStat = 0; %counter if save button was pushed | eventdata.SaveStat = 0; %counter if save button was pushed | ||||||
| 
 | 
 | ||||||
| @ -329,7 +330,6 @@ uiwait(fig) | |||||||
|         Sys0 = eventdata.simSys; |         Sys0 = eventdata.simSys; | ||||||
|         Exp0 = eventdata.simExp; |         Exp0 = eventdata.simExp; | ||||||
|         %perform fit |         %perform fit | ||||||
|         Sys0.Temperature = [0 0 0]; |  | ||||||
|         [BestSys,BestSpc] = esfit('thyme',params.max_mean,Sys0,Vary,Exp0,[],FitOpt); |         [BestSys,BestSpc] = esfit('thyme',params.max_mean,Sys0,Vary,Exp0,[],FitOpt); | ||||||
|         plot(ax,0.1*params.Field_Vector,params.max_mean,'r',... |         plot(ax,0.1*params.Field_Vector,params.max_mean,'r',... | ||||||
|                 0.1*params.Field_Vector,BestSpc,'b','LineWidth',1.2) |                 0.1*params.Field_Vector,BestSpc,'b','LineWidth',1.2) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user