Skip to content

Commit

Permalink
Minor update
Browse files Browse the repository at this point in the history 
-> Fixed PEARL dataloader; now loads in XPSSpectrum and MultiRegionScans
  • Loading branch information
@c0deta1ker
c0deta1ker committed Nov 9, 2022
1 parent 35fb348 commit 2c9327f
Show file tree
Hide file tree
Showing 24 changed files with 639 additions and 125 deletions.
1 change: 1 addition & 0 deletions ADRESSTools_Dionysus/MATools_Skyfall_VNS/ARPESView/ARPESView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ function LoadFile(handles,FullName)
pos1=strfind(Note,'ADef = '); pos2=strfind(Note,'dt'); eval(['aDef=' Note(pos1+9:pos2-2) ';']);
if length(aDef)>1; aDef=[]; aDefAdd=0; else aDefAdd=aDef; end
end
if isempty(aDef); aDefAdd=0; end
% adding up tltM and aDef if scalars, otherwise empty
tltM=tltM+aDef;
% adding scalar tltM and aDef to Scan
Expand Down
Binary file modified ADRESSTools_Dionysus/PESTools_PCC/Examples/Example_021-022_PES_Data_Fitting.mlx
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions ...SSTools_Dionysus/PESTools_PCC/F000 - job file generators/ADRESS_JobFileGenerator_CLvsHV.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ function ADRESS_JobFileGenerator_CLvsHV()
slit_samp = '1';
dt_samp = '0.1';
pol_samp = 'LV';
mode_samp = 'LAD';
mode_samp = 'MAM';
Ep_samp = '100';
%% (C) Set the Fermi-level REFERENCE position
use_ref = 1; % Set whether you want to use a reference; 1 = True, 0 = False
% - REFERENCE POSITION
x_ref = '1.00';
x_ref = x_samp;
y_ref = y_samp;
z_ref = '1.00';
z_ref = z_samp;
tilt_ref = tilt_samp;
theta_ref = theta_samp;
phi_ref = phi_samp;
ADef_ref = ADef_samp;
% - REFERENCE ACQUISITION SETTINGS
name_ref = 'AuEF'; % name_ref = 'Au4d';
name_ref = 'EF'; % name_ref = 'AuEF'; % name_ref = 'Au4d';
Eb_ref = '-2'; % Eb_ref = '-88:0.02:-80';
slit_ref = '20'; % slit_ref = '1';
dt_ref = '30'; % dt_ref = '0.1';
dt_ref = '20'; % dt_ref = '0.1';
pol_ref = pol_samp;
mode_ref = mode_samp;
Ep_ref = Ep_samp;
Expand Down
6 changes: 3 additions & 3 deletions ...STools_Dionysus/PESTools_PCC/F000 - job file generators/ADRESS_JobFileGenerator_CLvsPOS.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function ADRESS_JobFileGenerator_CLvsPOS()
slit_samp = '1';
dt_samp = '0.1';
pol_samp = 'LV';
mode_samp = 'LAD';
mode_samp = 'MAM';
Ep_samp = '100';
%% (C) Set the Fermi-level REFERENCE position
use_ref = 1; % Set whether you want to use a reference; 1 = True, 0 = False
Expand All @@ -36,10 +36,10 @@ function ADRESS_JobFileGenerator_CLvsPOS()
phi_ref = phi_samp;
ADef_ref = ADef_samp;
% - REFERENCE ACQUISITION SETTINGS
name_ref = 'AuEF'; % name_ref = 'Au4d';
name_ref = 'EF'; % name_ref = 'AuEF'; % name_ref = 'Au4d';
Eb_ref = '-2'; % Eb_ref = '-88:0.02:-80';
slit_ref = '20'; % slit_ref = '1';
dt_ref = '30'; % dt_ref = '0.1';
dt_ref = '20'; % dt_ref = '0.1';
pol_ref = pol_samp;
mode_ref = mode_samp;
Ep_ref = Ep_samp;
Expand Down
10 changes: 5 additions & 5 deletions ...Tools_Dionysus/PESTools_PCC/F000 - job file generators/ADRESS_JobFileGenerator_CLvsTIME.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ function ADRESS_JobFileGenerator_CLvsTIME()
slit_samp = '1';
dt_samp = '0.1';
pol_samp = 'LV';
mode_samp = 'LAD';
mode_samp = 'MAM';
Ep_samp = '100';
%% (C) Set the Fermi-level REFERENCE position
use_ref = 1; % Set whether you want to use a reference; 1 = True, 0 = False
% - REFERENCE POSITION
x_ref = '1.00';
x_ref = x_samp;
y_ref = y_samp;
z_ref = '1.00';
z_ref = z_samp;
tilt_ref = tilt_samp;
theta_ref = theta_samp;
phi_ref = phi_samp;
ADef_ref = ADef_samp;
% - REFERENCE ACQUISITION SETTINGS
name_ref = 'AuEF'; % name_ref = 'Au4d';
name_ref = 'EF'; % name_ref = 'AuEF'; % name_ref = 'Au4d';
Eb_ref = '-2'; % Eb_ref = '-88:0.02:-80';
slit_ref = '20'; % slit_ref = '1';
dt_ref = '30'; % dt_ref = '0.1';
dt_ref = '20'; % dt_ref = '0.1';
pol_ref = pol_samp;
mode_ref = mode_samp;
Ep_ref = Ep_samp;
Expand Down
8 changes: 4 additions & 4 deletions ADRESSTools_Dionysus/PESTools_PCC/F003 - model curves/pes background curves/BgrndPoly.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
if nargin < 3; polyOrder = 1; end
if nargin < 4; lhsVal = mean(xdat(:)) - abs(0.25*range(xdat(:))); end
if nargin < 5; rhsVal = mean(xdat(:)) + abs(0.25*range(xdat(:))); end
if nargin < 6; lhsWin = abs(0.05*range(xdat(:))); end
if nargin < 7; rhsWin = abs(0.05*range(xdat(:))); end
if nargin < 6; lhsWin = abs(0.02*range(xdat(:))); end
if nargin < 7; rhsWin = abs(0.02*range(xdat(:))); end
if nargin < 8; plot_result = 0; end
if isempty(polyOrder); polyOrder = 1; end
if isempty(lhsVal); lhsVal = mean(xdat(:)) - abs(0.25*range(xdat(:))); end
if isempty(rhsVal); rhsVal = mean(xdat(:)) + abs(0.25*range(xdat(:))); end
if isempty(lhsWin); lhsWin = abs(0.05*range(xdat(:))); end
if isempty(rhsWin); rhsWin = abs(0.05*range(xdat(:))); end
if isempty(lhsWin); lhsWin = abs(0.02*range(xdat(:))); end
if isempty(rhsWin); rhsWin = abs(0.02*range(xdat(:))); end
if isempty(plot_result); plot_result = 0; end
%% Validity checks on the input parameters
% -- Making sure that the polynomial order is an integer value
Expand Down
8 changes: 4 additions & 4 deletions ADRESSTools_Dionysus/PESTools_PCC/F003 - model curves/pes background curves/BgrndShirley.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
% - Setting the default conditions
if nargin < 3; lhsVal = mean(xdat(:)) - abs(0.25*range(xdat(:))); end
if nargin < 4; rhsVal = mean(xdat(:)) + abs(0.25*range(xdat(:))); end
if nargin < 5; lhsWin = abs(0.05*range(xdat(:))); end
if nargin < 6; rhsWin = abs(0.05*range(xdat(:))); end
if nargin < 5; lhsWin = abs(0.02*range(xdat(:))); end
if nargin < 6; rhsWin = abs(0.02*range(xdat(:))); end
if nargin < 7; plot_result = 0; end
if isempty(lhsVal); lhsVal = mean(xdat(:)) - abs(0.25*range(xdat(:))); end
if isempty(rhsVal); rhsVal = mean(xdat(:)) + abs(0.25*range(xdat(:))); end
if isempty(lhsWin); lhsWin = abs(0.05*range(xdat(:))); end
if isempty(rhsWin); rhsWin = abs(0.05*range(xdat(:))); end
if isempty(lhsWin); lhsWin = abs(0.02*range(xdat(:))); end
if isempty(rhsWin); rhsWin = abs(0.02*range(xdat(:))); end
if isempty(plot_result); plot_result = 0; end
%% Validity checks on the input parameters
% -- If a vector / array of the LHS and RHS are entered, only select the first value
Expand Down
12 changes: 7 additions & 5 deletions ADRESSTools_Dionysus/PESTools_PCC/F006 - data saveloaders/create_arpes_data.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@
% analysing ARPES data. The fields can be filled in, after which the user
% can then use the data structure within all the processing / fitting
% tools.
% - Assigning file information
arpesStr = struct();
arpesStr.FileName = '';
arpesStr.H5file = '';
arpesStr.TimeStamp = datetime;
arpesStr.Type = "Eb(k)";
arpesStr.index = 1;
% - Assigning the meta data
arpesStr.meta = struct();
arpesStr.raw_data = [];
arpesStr.raw_tht = [];
arpesStr.raw_eb = [];
arpesStr.deb = [];
% - Assinging experimental parameters
arpesStr.hv = [];
arpesStr.dhv = [];
arpesStr.tltM = [];
arpesStr.tltE = [];
arpesStr.thtM = [];
arpesStr.Temp = [];
% - Assinging the main experimental variables
arpesStr.raw_data = [];
arpesStr.raw_tht = [];
arpesStr.raw_eb = [];
end
Loading

0 comments on commit 2c9327f

Please sign in to comment.