Skip to content

LEO fits tweaks for large data sets when every possibility will occur. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rcjackson merged 7 commits into from
May 5, 2026
Merged

LEO fits tweaks for large data sets when every possibility will occur. #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2cce987
check that the max position is roughly in the place
johbackm Mar 27, 2026
92d36e4
boundary for leo_EndPos_ch0
johbackm Mar 27, 2026
07ca3c2
more restraints for all possible errors
johbackm Mar 27, 2026
b356c1e
no sliding window beyond the amount of data
johbackm Mar 30, 2026
88eeaff
no sliding window beyond the amount of data
johbackm Mar 30, 2026
4f3def1
forgot log scale bin adjustment for leo fits
johbackm Apr 1, 2026
dfcc0c5
Merge branch 'ARM-DOE:main' into dev
johbackm May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions pysp2/util/leo_fit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,14 @@ def beam_shape(my_binary, beam_position_from='split point', Globals=None,

#moving average of the beam shape with a window of moving_average_window
moving_ch0_profile_window = np.lib.stride_tricks.sliding_window_view(my_ch0_profiles,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch0)),
axis=0)
moving_avg_ch0_profiles_ = np.nanmedian(moving_ch0_profile_window,axis=2)
moving_ch4_profile_window = np.lib.stride_tricks.sliding_window_view(my_ch4_profiles,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch4)),
axis=0)
moving_avg_ch4_profiles_ = np.nanmedian(moving_ch4_profile_window,axis=2)

moving_avg_ch0_profiles = np.zeros_like(moving_avg_ch0_profiles_) * np.nan
Expand All @@ -199,6 +203,8 @@ def beam_shape(my_binary, beam_position_from='split point', Globals=None,
for i in range(moving_avg_ch0_profiles_.shape[0]):
i_profile = moving_avg_ch0_profiles_[i,:]
i_max = np.nanargmax(i_profile)
if i_max < num_base_pts_2_avg:
continue
i_range = i_profile[i_max] - np.nanmin(i_profile[:i_max])
moving_avg_ch0_profiles[i,:] = (i_profile - np.nanmin(i_profile[:i_max])) / i_range
#interpolate here to get the exact position in fraction (not integer) :: which posiiton (float) is the 0.03 cross in
Expand All @@ -212,6 +218,8 @@ def beam_shape(my_binary, beam_position_from='split point', Globals=None,
for i in range(moving_avg_ch4_profiles_.shape[0]):
i_profile = moving_avg_ch4_profiles_[i,:]
i_max = np.nanargmax(i_profile)
if i_max < num_base_pts_2_avg:
continue
i_range = i_profile[i_max] - np.nanmin(i_profile[:i_max])
moving_avg_ch4_profiles[i,:] = (i_profile - np.nanmin(i_profile[:i_max])) / i_range
#interpolate here to get the exact position in fraction (not integer) :: which posiiton (float) is the 0.03 cross in
Expand Down Expand Up @@ -239,17 +247,21 @@ def beam_shape(my_binary, beam_position_from='split point', Globals=None,

#moving average of beam width
moving_ch0_beam_width = np.lib.stride_tricks.sliding_window_view(my_ch0_scatterers['PkFWHM_ch0'].values,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch0)), axis=0)
moving_ch4_beam_width = np.lib.stride_tricks.sliding_window_view(my_ch4_scatterers['PkFWHM_ch4'].values,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch4)), axis=0)
moving_median_ch0_beam_width = np.nanmedian(moving_ch0_beam_width,axis=1)
moving_median_ch4_beam_width = np.nanmedian(moving_ch4_beam_width,axis=1)

#Moving cross to centre (c2c)
moving_ch0_c2c = np.lib.stride_tricks.sliding_window_view(ch0_c2c,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch0)), axis=0)
moving_ch4_c2c = np.lib.stride_tricks.sliding_window_view(ch4_c2c,
moving_average_window, axis=0)
min(moving_average_window,
np.sum(only_scattering_ch4)), axis=0)

moving_median_ch0_c2c = np.nanmedian(moving_ch0_c2c,axis=1)
moving_median_ch4_c2c = np.nanmedian(moving_ch4_c2c,axis=1)
Expand Down Expand Up @@ -317,6 +329,10 @@ def beam_shape(my_binary, beam_position_from='split point', Globals=None,
np.nan, output_ds['leo_EndPos_ch0'].values)
output_ds['leo_EndPos_ch4'].values = np.where(output_ds['leo_EndPos_ch4'].values < num_base_pts_2_avg,
np.nan, output_ds['leo_EndPos_ch4'].values)
output_ds['leo_EndPos_ch0'].values = np.where(output_ds['leo_EndPos_ch0'].values > Globals.ScatMaxPeakPos,
np.nan, output_ds['leo_EndPos_ch0'].values)
output_ds['leo_EndPos_ch4'].values = np.where(output_ds['leo_EndPos_ch4'].values > Globals.ScatMaxPeakPos,
np.nan, output_ds['leo_EndPos_ch4'].values)

output_ds['leo_PkFWHM_ch0'] = output_ds['leo_PkFWHM_ch0'].interpolate_na(dim="event_index",
method="nearest", fill_value="extrapolate")
Expand Down
5 changes: 4 additions & 1 deletion pysp2/util/particle_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,10 @@ def process_psds(particle_ds, hk_ds, config, deltaSize=0.005, num_bins=199,
SizeIncandOnly[the_particles], side='right')

#axis 0 = time, axis 1 incandesence, axis 2 leo size
np.add.at(leo_IncandScatNumEnsemble[t,:,:], (ind_incan,ind_leo), OneOfEvery[the_particles])
if deltaSize==0:
np.add.at(leo_IncandScatNumEnsemble[t,:,:], (ind_incan - 1,ind_leo - 1), OneOfEvery[the_particles])
else:
np.add.at(leo_IncandScatNumEnsemble[t,:,:], (ind_incan, ind_leo), OneOfEvery[the_particles])

scat_parts = np.logical_and(scatter_accept, parts_time)
incan_parts = np.logical_and(incand_accept, parts_time)
Expand Down
Loading