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

Intermediate merge of Aron's stuff #1775

Merged
merged 158 commits into from
Jul 17, 2023
Merged

Intermediate merge of Aron's stuff #1775

merged 158 commits into from
Jul 17, 2023

Conversation

goord
Copy link
Collaborator

@goord goord commented Jul 17, 2023

No description provided.

niclaurenti and others added 30 commits May 22, 2023 11:49
@niclaurenti
Add theories 398 397 to theory.db
cf8afeb
@APJansen
Name input layer xgrids
6b40d90
@APJansen
Rename and simplify dense_me -> neural_network
57f6552
@APJansen
Rename i->i_replica and layer_seed->replica_seed
d81814d
@APJansen
Rename preprocessing -> prefactor
557b14c
@APJansen
Create apply_prefactor layer (can't name yet as it is created twice r…
e087a38 
…ather than reused, in the sumrule)
@APJansen
Merge msr.py into layers/msr_normalization.py
ca187e4
@APJansen
Turn msr_impose into class method
97d7409
@APJansen
Use MSR_Normalization class attributes
e0fb2f5
@APJansen
Create integration grid in MSR_Normalizations init
c8e7e63
@APJansen
Renamings
c5551f1
@APJansen
Prepare call method in MSR_Normalization
6241614
@APJansen
Share more layers, add names
4ecb1ba
@APJansen
Create named layers in msr_normalization
767977b
@APJansen
Add pdf_integrated step
d6ed37c
@APJansen
Move computation of xdivided to init, move integration into call
396fc6f
@APJansen
remove tempcall
472abed
@APJansen
Fix bug introduced after renaming preprocessing to prefactor
08c8876
@APJansen
Join neural network layers into their own NN_i model
5337d18
@APJansen
Clarify layer names
ed85389
@APJansen
Revert all changes to MSR
6bc651f
@APJansen
Rewrite msr into a model that takes as inputs the pdf, pdf on integra…
96328a2 
…tion grid and the integration grid, and outputs normalized pdf
@APJansen
Set shape of integration grid to (None, 1) rather than (2000, 1) to d…
82cf95b 
…isplay shapes in model summary and plot
@APJansen
Revert renaming of Preprocessing to Prefactor (now use PreprocessingF…
7b475ba 
…actor for clarity and consistency)
@APJansen
Clean up model creation code
7153e93
@APJansen
Reorganize input options, keeping effect the same
dfb4eed
@APJansen
Make preprocessing layers dependent on which option is used (scaling,…
9dc1384 
… adding logs)
@APJansen
Fix msr with scaling
7c6d8ae
@APJansen
Fix msr with scaling, shape of integration grid
cbce181
@APJansen
Set shape of x=1 input to None so tensorflow displays proper shapes
3296aa4
APJansen and others added 27 commits July 5, 2023 10:14
@APJansen @RoyStegeman
Remove duplicate imports
6617da2 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@APJansen @RoyStegeman
Remove duplicate imports
5aa72fc 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@APJansen
Add link to plot_model documentation
a80a77e
@APJansen
Move photon integrals down to final loop
f82b407
@andreab1997
Add theoryids for alpha variation but same thcovmat
abf98bc
@andreab1997
Add theory database with new theories
78d83d6
@andreab1997
Merge pull request #1768 from NNPDF/thunc_alphavar
4847c56 
Alpha variation but same thcovmat
@APJansen
Simplify numpy_to_input, removing unused no_reshape and setting gridp…
80ef5d7 
…oints to None in shape always
@APJansen
Merge branch 'master' into model_refactor
ccfb7ce
@APJansen
Improve numpy_to_input documentation
0a4d684
@RoyStegeman
remove mention that vp-comparefit doesn't always have to be the first…
94d6e80 
… step
@APJansen
Implement FkRotation as subclass of Rotation by rewriting using a rot…
883cb19 
…ation tensor
@APJansen
Change 8 to 9 in docstring
e7a9140
@APJansen
Apply black and isort to all affected files
0518c7c
@RoyStegeman
Merge pull request #1771 from NNPDF/update_fitting_docs
3954197 
remove mention that vp-setupfit doesn't always have to be the first step
@APJansen @scarlehoff
Update n3fit/src/n3fit/backends/keras_backend/operations.py
e92b706 
formatting

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
@APJansen
Restore comments in scaler
5bcf169
@APJansen
Merge pull request #1772 from NNPDF/rotation_matrix
915d2d6 
Implement FkRotation as subclass of Rotation by rewriting using a rotation tensor
@APJansen
Add Optional type hint for arguments that can be None
1a9ce30
@APJansen
Use numpy.typing
9b6a675
@APJansen
Raise error from original error
8566728
@APJansen
Fix error when not imposing sumrule
27f9357
@Zaharid
Fix consistency of lumy plot label
52ddc1d 
Make the absolute value bars both double.
@niclaurenti
Change fiatlux_dis_F{2,L} -> FIATLUX_DIS_F{2,L}
f13a506
@niclaurenti
Merge pull request #1774 from NNPDF/rename_fiatlux_dis
4395179 
Change fiatlux_dis_F{2,L} -> FIATLUX_DIS_F{2,L}
@APJansen
Merge branch 'master' into model_refactor
694417d
@APJansen
Merge pull request #1734 from NNPDF/model_refactor
6ddab6e 
Refactoring model creation code
@goord goord merged commit 49404d1 into trvl-mask-layers Jul 17, 2023
4 checks passed
@Radonirinaunimi
Copy link
Member

Is this going to completely scratch #1661?

@niclaurenti niclaurenti mentioned this pull request Jul 17, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@goord @Radonirinaunimi @niclaurenti @APJansen @scarlehoff @Zaharid @andreab1997 @enocera @RoyStegeman