Huge changes... LMFIT, better histogram filling logic, UI for doing the histogramming with parquet files #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deleted: src/fitter/background_fitter.rs modified: src/fitter/fit_handler.rs modified: src/fitter/fit_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/mod.rs deleted: src/fitter/models/double_exponential.rs deleted: src/fitter/models/exponential.rs modified: src/fitter/models/gaussian.rs modified: src/fitter/models/mod.rs deleted: src/fitter/models/polynomial.rs modified: src/histoer/histo1d/context_menu.rs modified: src/histoer/histo1d/histogram1d.rs modified: src/histoer/histo1d/keybinds.rs modified: src/histoer/histo1d/peak_finder.rs modified: src/histogram_scripter/manual_histogram_script.rs
modified: src/egui_plot_stuff/egui_line.rs new file: src/fitter/common.rs modified: src/fitter/fit_handler.rs modified: src/fitter/fit_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/mod.rs modified: src/fitter/models/gaussian.rs new file: src/fitter/models/linear.rs modified: src/fitter/models/mod.rs modified: src/histoer/histo1d/histogram1d.rs modified: src/histoer/histo1d/keybinds.rs
modified: src/fitter/common.rs modified: src/fitter/fit_handler.rs modified: src/fitter/fit_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/mod.rs new file: src/fitter/models/exponential.rs modified: src/fitter/models/linear.rs modified: src/fitter/models/mod.rs new file: src/fitter/models/powerlaw.rs new file: src/fitter/models/quadratic.rs modified: src/histoer/histo1d/histogram1d.rs
modified: src/egui_plot_stuff/colors.rs modified: src/fitter/fit_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/models/gaussian.rs modified: src/fitter/models/mod.rs modified: src/histoer/histo1d/histogram1d.rs modified: src/histogram_scripter/manual_histogram_script.rs
modified: src/egui_plot_stuff/egui_line.rs modified: src/fitter/common.rs modified: src/fitter/fit_handler.rs modified: src/fitter/fit_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/models/exponential.rs modified: src/fitter/models/gaussian.rs modified: src/fitter/models/linear.rs modified: src/fitter/models/mod.rs modified: src/fitter/models/powerlaw.rs modified: src/fitter/models/quadratic.rs modified: src/histoer/histo1d/histogram1d.rs modified: src/histogram_scripter/manual_histogram_script.rs renamed: lmfit_test.py -> tests/lmfit_test.py
modified: .github/workflows/rust.yml
new file: requirements.txt modified: src/histoer/histo1d/peak_finder.rs modified: src/histogram_scripter/manual_histogram_script.rs
modified: src/egui_plot_stuff/egui_plot_settings.rs modified: src/fitter/main_fitter.rs modified: src/fitter/models/exponential.rs modified: src/fitter/models/linear.rs modified: src/fitter/models/powerlaw.rs modified: src/fitter/models/quadratic.rs modified: src/histoer/histo1d/keybinds.rs modified: src/histoer/histo1d/peak_finder.rs modified: src/histoer/histo2d/projections.rs modified: src/histoer/histogrammer.rs
modified: src/histoer/tree.rs modified: src/histogram_scripter/manual_histogram_script.rs modified: src/util/processer.rs
modified: src/histoer/histogrammer.rs modified: src/histoer/tree.rs modified: src/histogram_scripter/histogram_script.rs modified: src/histogram_scripter/manual_histogram_script.rs modified: src/util/processer.rs
modified: src/histoer/histo1d/context_menu.rs modified: src/histoer/histogrammer.rs modified: src/histoer/tree.rs modified: src/histogram_scripter/manual_histogram_script.rs modified: src/ui/app.rs
modified: src/histoer/histo2d/statistics.rs modified: src/histoer/histogrammer.rs modified: src/histogram_scripter/manual_histogram_script.rs
…with a large dataset modified: Cargo.lock modified: Cargo.toml modified: src/histoer/histo1d/histogram1d.rs modified: src/histoer/histo1d/statistics.rs modified: src/histoer/histo2d/histogram2d.rs modified: src/histoer/histo2d/statistics.rs modified: src/histoer/histogrammer.rs deleted: src/histogram_scripter/configure_auxillary_detectors.rs modified: src/histogram_scripter/histogram_script.rs deleted: src/histogram_scripter/histogram_ui_elements.rs modified: src/histogram_scripter/manual_histogram_script.rs modified: src/histogram_scripter/mod.rs modified: src/util/processer.rs
deleted: assets/hist1d_fitting.gif deleted: assets/projection_example.gif modified: src/histoer/histo2d/histogram2d.rs modified: src/histoer/histogrammer.rs modified: src/histogram_scripter/histogram_script.rs renamed: src/histogram_scripter/manual_histogram_script.rs -> src/histogram_scripter/manual_histogram_scripts.rs modified: src/histogram_scripter/mod.rs modified: src/ui/app.rs modified: src/util/processer.rs
modified: Cargo.lock modified: Cargo.toml modified: src/histoer/histo1d/histogram1d.rs modified: src/histoer/histo2d/histogram2d.rs modified: src/histoer/histogrammer.rs modified: src/histogram_scripter/histogram_script.rs modified: src/util/processer.rs
modified: src/histogram_scripter/histogram_script.rs modified: src/histogram_scripter/manual_histogram_scripts.rs modified: src/ui/app.rs
modified: src/cutter/cuts.rs modified: src/egui_plot_stuff/colors.rs modified: src/egui_plot_stuff/egui_polygon.rs modified: src/histoer/histogrammer.rs deleted: src/histogram_scripter/configure_lazyframes.rs modified: src/histogram_scripter/histogram_script.rs modified: src/histogram_scripter/mod.rs modified: src/util/processer.rs
modified: src/egui_plot_stuff/egui_plot_settings.rs modified: src/histoer/histo1d/histogram1d.rs
modified: README.md modified: src/egui_plot_stuff/egui_horizontal_line.rs modified: src/egui_plot_stuff/egui_vertical_line.rs modified: src/histoer/histo1d/histogram1d.rs modified: src/histoer/histo1d/plot_settings.rs modified: src/histoer/histo2d/histogram2d.rs modified: src/histoer/histo2d/projections.rs modified: src/histoer/histogrammer.rs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changed all the Gaussian fitting to use pythons lmfit module. I did this since I felt like i was reinventing the wheel for a lot of the code. It makes the fitting a little slower but way easier for me to add stuff in the future. Also, we now fill row by row in parallel using the rayon crate. For large datasets, I would run out of memory however now we take chucks of the lazyframe, and performing the filling. Currently the chunks are set to 10 million rows. The total filling time also decreased drastically. Finally, the ui for adding histograms and added new columns to the data was completely reworked. Cuts can also be added to specific histograms.