diff --git a/Data-Analyzer/extractQuantities.m b/Data-Analyzer/extractQuantities.m
index 248de98..f75a9b7 100644
--- a/Data-Analyzer/extractQuantities.m
+++ b/Data-Analyzer/extractQuantities.m
@@ -94,25 +94,100 @@ end
 %%  Plotting heatmap of mean_max_g2_values
 
 N_x = length(options.scan_groups);
-N_y = length(results_all) / N_x;
+N_y = length(results_all);
+
+BFields = [2.35, 2.15, 2.0, 1.85, 1.7, 1.55, 1.4, 1.35];
 
 % Preallocate
 g2_matrix = zeros(N_y, N_x);
-angle_matrix = zeros(N_y, N_x);
 
-for i = 1:length(results_all)
-    row = ceil(i / N_x); % outer parameter (e.g., date)
-    col = mod(i-1, N_x) + 1; % inner scan parameter
-    g2_matrix(row, col) = results_all(i).mean_max_g2_values(col);
-    angle_matrix(row, col) = results_all(i).mean_max_g2_angle(col);
+for i = 1:N_y
+    for j = 1:N_x
+        g2_matrix(i, j)    = results_all(i).mean_max_g2_values(j);
+    end
 end
 
 % Plot heatmap
-figure;
-imagesc(options.scan_groups, 1:N_y, g2_matrix);
-xlabel('Scan Parameter (e.g. Angle)');
-ylabel('Scan Set Index');
-title('Mean g_2 Value Heatmap');
+
+font                        = 'Bahnschrift';
+
+figure(1)
+clf
+set(gcf,'Position',[50 50 950 750])
+imagesc(options.scan_groups, BFields, g2_matrix);
+colormap(sky);
+clim([0, 1])
+set(gca, 'FontSize', 14, 'YDir', 'normal');
+hXLabel = xlabel('\alpha (degrees)', 'Interpreter', 'tex');
+hYLabel = ylabel('BField (G)', 'Interpreter', 'tex');
+hTitle  = title('$\mathrm{max}[g^{(2)}_{[50,70]}(\delta\theta)]$', 'Interpreter', 'latex');
+set([hXLabel, hYLabel], 'FontSize', 14)
+set(hTitle, 'FontSize', 16, 'FontWeight', 'bold');  % Set font and size for title
 colorbar;
 
+%% HEat map of angular spectral weight
 
+N_x = length(options.scan_groups);
+N_y = length(results_all);
+
+BFields = [2.35, 2.15, 2.0, 1.85, 1.7, 1.55, 1.4, 1.35];
+
+% Preallocate
+angular_spectral_weight_matrix = zeros(N_y, N_x);
+
+for i = 1:N_y
+    for j = 1:N_x
+        angular_spectral_weight_matrix(i, j)    = results_all(i).angular_spectral_weight(j);
+    end
+end
+
+% Plot heatmap
+
+font                        = 'Bahnschrift';
+
+figure(2)
+clf
+set(gcf,'Position',[50 50 950 750])
+imagesc(options.scan_groups, BFields, angular_spectral_weight_matrix);
+colormap(sky);
+set(gca, 'FontSize', 14, 'YDir', 'normal');
+hXLabel = xlabel('\alpha (degrees)', 'Interpreter', 'tex');
+hYLabel = ylabel('BField (G)', 'Interpreter', 'tex');
+hTitle  = title('Angular Spectral Weight');
+set([hXLabel, hYLabel], 'FontSize', 14)
+set(hTitle, 'FontName', font, 'FontSize', 16, 'FontWeight', 'bold');  % Set font and size for title
+colorbar;
+
+%% HEat map of radial spectral contrast
+
+N_x = length(options.scan_groups);
+N_y = length(results_all);
+
+BFields = [2.35, 2.15, 2.0, 1.85, 1.7, 1.55, 1.4, 1.35];
+
+% Preallocate
+radial_spectral_contrast_matrix = zeros(N_y, N_x);
+
+for i = 1:N_y
+    for j = 1:N_x
+        radial_spectral_contrast_matrix(i, j)    = results_all(i).radial_spectral_contrast(j);
+    end
+end
+
+% Plot heatmap
+
+font                        = 'Bahnschrift';
+
+figure(2)
+clf
+set(gcf,'Position',[50 50 950 750])
+imagesc(options.scan_groups, BFields, radial_spectral_contrast_matrix);
+colormap(sky);
+clim([0 0.005])
+set(gca, 'FontSize', 14, 'YDir', 'normal');
+hXLabel = xlabel('\alpha (degrees)', 'Interpreter', 'tex');
+hYLabel = ylabel('BField (G)', 'Interpreter', 'tex');
+hTitle  = title('Radial Spectral Contrast');
+set([hXLabel, hYLabel], 'FontSize', 14)
+set(hTitle, 'FontName', font, 'FontSize', 16, 'FontWeight', 'bold');  % Set font and size for title
+colorbar;
diff --git a/Data-Analyzer/plotImages.m b/Data-Analyzer/plotImages.m
index e445517..5a5ea3e 100644
--- a/Data-Analyzer/plotImages.m
+++ b/Data-Analyzer/plotImages.m
@@ -4,9 +4,9 @@ groupList      = ["/images/MOT_3D_Camera/in_situ_absorption", "/images/ODT_1_Axi
                   "/images/ODT_2_Axis_Camera/in_situ_absorption", "/images/Horizontal_Axis_Camera/in_situ_absorption", ...
                   "/images/Vertical_Axis_Camera/in_situ_absorption"];
 
-folderPath     = "//DyLabNAS/Data/TwoDGas/2025/04/01/";
+folderPath     = "//DyLabNAS/Data/TwoDGas/2025/04/02/";
 
-run            = '0059';
+run            = '0007';
 
 folderPath     = strcat(folderPath, run);