Skip to content
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

Jump to bottom

Improve data scripts output and update analysis default settings #165

Merged
merged 32 commits into from
Feb 16, 2022
Merged

Improve data scripts output and update analysis default settings #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
de78148
Update event_preparer.py
HealthyPear Sep 29, 2021
24eeb6e
Update data_training.py
HealthyPear Sep 29, 2021
8c699df
Update write_dl2.py
HealthyPear Sep 29, 2021
8a4ef45
Update analysis.yaml
HealthyPear Sep 29, 2021
3f7c7a3
Update test_config_analysis_north.yaml
HealthyPear Sep 29, 2021
5d8d467
Update test_config_analysis_south.yaml
HealthyPear Sep 29, 2021
48470f3
revert dev change in test file north
HealthyPear Sep 29, 2021
3862fa7
revert dev change in test file south
HealthyPear Sep 29, 2021
7fe897d
Update analysis.yaml
HealthyPear Oct 11, 2021
dbc7344
Update event_preparer.py
HealthyPear Oct 11, 2021
e7ce4b2
Update image_cleaning.py
HealthyPear Oct 11, 2021
f4b0fd2
Merge branch 'master' into feature-improve_data_scripts_output
HealthyPear Feb 11, 2022
ea4ecd2
Update .gitignore
HealthyPear Feb 11, 2022
9634310
Update dependencies
HealthyPear Feb 11, 2022
8b05447
Update analysis.yaml
HealthyPear Feb 11, 2022
a4759c8
Update event_preparer
HealthyPear Feb 11, 2022
0cd2740
Update the rest of protopipe.pipeline
HealthyPear Feb 11, 2022
2fc2e8b
Update TRAINING and DL2 scripts
HealthyPear Feb 11, 2022
da82f46
Update performance stage
HealthyPear Feb 11, 2022
2ba9c49
Update __init__.py with PEP8 formatting
HealthyPear Feb 11, 2022
6ea24c9
Update integration testing pipeline
HealthyPear Feb 11, 2022
01f6b95
Update docs and latest results (Prod3b only)
HealthyPear Feb 11, 2022
7c54ae3
Fix conda pip syntax
HealthyPear Feb 11, 2022
0d1a3c2
Test install env with pyirf 0.5.0
HealthyPear Feb 11, 2022
273a014
Test install env with pandas>=1.0.0
HealthyPear Feb 11, 2022
560e763
Require pandas>=1.0.0 in setup.py
HealthyPear Feb 11, 2022
7fc0180
Test min python 3.7
HealthyPear Feb 11, 2022
95a9037
Update performance CLI
HealthyPear Feb 12, 2022
5846249
Update tests
HealthyPear Feb 12, 2022
e8c43cc
Remove stale comments from performance.yaml
HealthyPear Feb 14, 2022
501df0a
Update docs
HealthyPear Feb 14, 2022
1142c09
Model diagnostics migrate to benchmarks.plot
HealthyPear Feb 14, 2022
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
15 changes: 8 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
.pytest_cache

.DS_Store

# Compiled files
.pytest_cache
*.py[co]
*.pyc
*.a
Expand All @@ -23,24 +20,27 @@ protopipe/_version.py
htmlcov
.coverage
MANIFEST
**/.hypothesis

# Sphinx
docs/api
docs/_build

# Benchmark plots
plots/
**/plots

# IDEs / CODE EDITORS

# Eclipse editor project files
.project
.pydevproject
.settings

# Pycharm editor project files
.idea

# KDevelop editor project files
*kdev4
# VSCODE
**/.vscode

# Packages/installer info
*.egg
Expand Down Expand Up @@ -80,6 +80,7 @@ distribute-*.tar.gz
.sonarlint

# output files (should not be stored in git)
*.log
*.h5
*.hdf5
*.fits
Expand Down
58 changes: 29 additions & 29 deletions docs/contribute/beforepushing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,22 @@ Benchmarks
.. toctree::
:hidden:

benchmarks/TRAINING/benchmarks_DL1_calibration
benchmarks/TRAINING/benchmarks_DL1_image-cleaning
benchmarks/TRAINING/benchmarks_DL1_image-cleaning-with-true-phes
benchmarks/TRAINING/benchmarks_DL1_DirectionLUT
benchmarks/TRAINING/benchmarks_DL2_direction-reconstruction
benchmarks/TRAINING/benchmarks_DL2_to_energy-estimation
benchmarks/TRAINING/benchmarks_DL2_EnergyLUT
benchmarks/TRAINING/benchmarks_DL2_to_classification
benchmarks/MODELS/benchmarks_MODELS_energy
benchmarks/MODELS/benchmarks_MODELS_classification
benchmarks/DL2/benchmarks_DL2_particle-classification
benchmarks/DL2/benchmarks_DL2_direction-reconstruction
benchmarks/DL3/benchmarks_DL3_cuts_optimization
benchmarks/DL3/benchmarks_DL3_IRFs_and_sensitivity
benchmarks/DL3/overall_performance_plot_CTA

benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_calibration
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_image-cleaning
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_image_intensity_resolution
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_DirectionLUT
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_direction-reconstruction
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_to_energy-estimation
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_EnergyLUT
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_to_classification
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/result_benchmarks_MODELS_energy
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/result_benchmarks_MODELS_classification
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/result_benchmarks_MODELS_tuning
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL2/result_benchmarks_DL2_particle-classification
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL2/result_benchmarks_DL2_direction-reconstruction
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL3/benchmarks_DL3_IRFs_and_sensitivity
benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL3/overall_performance_plot_CTA
This documentation hosts a series of notebooks used for benchmarking.

Their contents follow the development triggered by the ongoing
Expand Down Expand Up @@ -203,14 +203,14 @@ The benchmarks are organised as follows,

- TRAINING

* `Calibration <benchmarks/TRAINING/benchmarks_DL1_calibration.ipynb>`__ | *benchmarks_DL1_calibration.ipynb*
* `Image cleaning <benchmarks/TRAINING/benchmarks_DL1_image-cleaning.ipynb>`__ | *benchmarks_DL1_image-cleaning.ipynb*
* `Parameters vs true information <benchmarks/TRAINING/benchmarks_DL1_image-cleaning-with-true-phes.ipynb>`__ | *benchmarks_DL1_image-cleaning-with-true-phes.ipynb*
* `Direction Look-Up Tables <benchmarks/TRAINING/benchmarks_DL1_DirectionLUT.ipynb>`__ | *benchmarks_DL1_DirectionLUT.ipynb*
* `Direction reconstruction <benchmarks/TRAINING/benchmarks_DL2_direction-reconstruction.ipynb>`__ | *benchmarks_DL2_direction-reconstruction.ipynb*
* `to energy estimator <benchmarks/TRAINING/benchmarks_DL2_to_energy-estimation.ipynb>`__ | *benchmarks_DL2_to_energy-estimation.ipynb*
* `Energy Look-Up Tables <benchmarks/TRAINING/benchmarks_DL2_EnergyLUT.ipynb>`__ | *benchmarks_DL2_EnergyLUT.ipynb*
* `to classifier <benchmarks/TRAINING/benchmarks_DL2_to_classification.ipynb>`__ | *benchmarks_DL2_to_classification.ipynb*
* `Calibration <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_calibration.ipynb>`__ | *benchmarks_DL1_calibration.ipynb*
* `Image cleaning <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_image-cleaning.ipynb>`__ | *benchmarks_DL1_image-cleaning.ipynb*
* `Image intensity resolution <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_image_intensity_resolution.ipynb>`__ | *benchmarks_DL1_image-cleaning.ipynb*
* `Direction Look-Up Tables <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL1_DirectionLUT.ipynb>`__ | *benchmarks_DL1_DirectionLUT.ipynb*
* `Direction reconstruction <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_direction-reconstruction.ipynb>`__ | *benchmarks_DL2_direction-reconstruction.ipynb*
* `to energy estimator <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_to_energy-estimation.ipynb>`__ | *benchmarks_DL2_to_energy-estimation.ipynb*
* `Energy Look-Up Tables <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_EnergyLUT.ipynb>`__ | *benchmarks_DL2_EnergyLUT.ipynb*
* `to classifier <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/TRAINING/result_benchmarks_DL2_to_classification.ipynb>`__ | *benchmarks_DL2_to_classification.ipynb*

In particular:

Expand All @@ -224,17 +224,17 @@ In particular:

These performances are obtained from a *test* portion of the TRAINING data,

* `Energy <benchmarks/MODELS/benchmarks_MODELS_energy.ipynb>`__ | *benchmarks_MODELS_energy.ipynb*
* `Particle type <benchmarks/MODELS/benchmarks_MODELS_classification.ipynb>`__ | *benchmarks_MODELS_classification.ipynb*
* `Energy <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/benchmarks_MODELS_energy.ipynb>`__ | *benchmarks_MODELS_energy.ipynb*
* `Particle type <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/benchmarks_MODELS_classification.ipynb>`__ | *benchmarks_MODELS_classification.ipynb*
* `Tuning <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/MODELS/benchmarks_MODELS_tuning.ipynb>`__ | *benchmarks_MODELS_energy.ipynb*

- DL2

* `Particle classification <benchmarks/DL2/benchmarks_DL2_particle-classification.ipynb>`__ | *benchmarks_DL2_particle-classification.ipynb*
* `Direction reconstruction <benchmarks/DL2/benchmarks_DL2_direction-reconstruction.ipynb>`__ | *benchmarks_DL2_direction-reconstruction.ipynb*
* `Particle classification <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL2/benchmarks_DL2_particle-classification.ipynb>`__ | *benchmarks_DL2_particle-classification.ipynb*
* `Direction reconstruction <benchmarks_latest_results/Prod3b/CTAN_Zd20_AzSouth_NSB1x_baseline_pointsource/DL2/benchmarks_DL2_direction-reconstruction.ipynb>`__ | *benchmarks_DL2_direction-reconstruction.ipynb*

- DL3

* `Cuts optimization <benchmarks/DL3/benchmarks_DL3_cuts_optimization.ipynb>`__ | *benchmarks_DL3_cuts_optimization.ipynb*
* `Instrument Response Functions and sensitivity (internal) <https://forge.in2p3.fr/projects/benchmarks-reference-analysis/wiki/Protopipe_performance_data>`__ | *benchmarks_DL3_IRFs_and_sensitivity*
* `Performance poster (internal) <https://forge.in2p3.fr/projects/benchmarks-reference-analysis/wiki/Protopipe_performance_data>`__ | *overall_performance_plot_CTA.ipynb*

Expand Down
569 changes: 0 additions & 569 deletions docs/contribute/benchmarks/DL2/benchmarks_DL2_direction-reconstruction.ipynb
View file
Open in desktop

This file was deleted.

Loading