Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
510 commits
Select commit Hold shift + click to select a range
d2e0622
Remove positivity sets from available_datasets
Zaharid Apr 10, 2019
53f395e
Cleanup
Apr 10, 2019
db75d62
Renamed HIGGSPOS->POSHIGGS for consistency
Apr 10, 2019
e7861ad
Renamed HIGGSPOS->POSHIGGS
Apr 10, 2019
005b044
Remove deprecated file
Zaharid Apr 10, 2019
0a337c1
Merge branch 'fix_CI'
Zaharid Apr 10, 2019
491a6ca
Fix bug in different cuts
Zaharid Apr 3, 2019
a383747
fixing conlfflicts
scarrazza Apr 10, 2019
1004ab0
fixing connflicts
scarrazza Apr 10, 2019
aa583b2
Merge pull request #420 from NNPDF/SINGLETOP
scarrazza Apr 11, 2019
097b43c
Added single top differential distributions
Apr 11, 2019
35a9831
Added plotting files for singletop differential
Apr 12, 2019
dbbd034
Merge pull request #424 from NNPDF/fixdcutts
Zaharid Apr 12, 2019
3d090dd
Removed POSHIGGS (former HIGGSPOS) data set
Apr 12, 2019
566c6b2
Merge pull request #429 from NNPDF/POSHIGGS
Zaharid Apr 12, 2019
c6578fa
Added mising PLOTTING files for normalised distrs. and corrected fb->pb
Apr 12, 2019
a743406
style decorations
Apr 12, 2019
817f66c
Fixed PLOTTING data files
Apr 12, 2019
128d412
Added ATLAS single top diff distr 8 TeV
Apr 13, 2019
720e278
Added PLOTTING files for ATLAS single top diff distr 8 TeV
Apr 13, 2019
f71accb
Rename line_only_pdfs as pdfs_noband
voisey Apr 15, 2019
5515902
Add check for pdfs_noband that allows pdfs_noband to be specified by …
voisey Apr 15, 2019
4931df9
Allow pdfs_noband to have zero length
voisey Apr 15, 2019
41bf4ae
Return list of PDF objects rather than list of PDF names
voisey Apr 15, 2019
8570bb3
Simplify pdfs_noband option in pdfplots.py
voisey Apr 15, 2019
a78e99b
Add error if pdfs_noband contains elements that aren't str or int
voisey Apr 15, 2019
d6c9154
Make error CheckError rather than RuntimeError
voisey Apr 15, 2019
4164398
Added QCD K factors for single(anti)top ATLAS diff distrs at 7 TeV
Apr 15, 2019
c0d9851
Add email mentions to validphys index
Zaharid Apr 15, 2019
729e425
Add documentation on email index
Zaharid Apr 15, 2019
a5e57fd
Added K factors for ATLAS single(anti)top differential distributions …
Apr 15, 2019
f146c8a
Updated registeredcfactors
Apr 15, 2019
88dbc5f
Add info on pdfs_noband to docstring of plot_pdfs
voisey Apr 15, 2019
468cdaf
Fixed ATLAS singletop data 7 TeV
Apr 15, 2019
ed33b68
Corrected ATLAS singletop diff data 8 TeV
Apr 15, 2019
55ffa8b
Fixed residual K factors
Apr 15, 2019
65379ad
Fix positioning of error messages and edit messages
voisey Apr 16, 2019
06427a2
Remove for loops
voisey Apr 16, 2019
16c1053
Merge branch 'master' into lineonlyband
voisey Apr 16, 2019
364929b
changed logic in config.py for producing fitthcovmat, only booleans a…
wilsonmr Apr 16, 2019
47ada54
Require user to specify use_theorycovmat=False if no fit is provided
wilsonmr Apr 16, 2019
7604f26
Merge pull request #423 from NNPDF/lineonlyband
Zaharid Apr 16, 2019
dc0a250
changed runcard flag to use_thcovmat_if_present
wilsonmr Apr 16, 2019
fd93601
Merge pull request #436 from NNPDF/configthcov
Zaharid Apr 17, 2019
6d3bcfb
Merge pull request #434 from NNPDF/SINGLETOP_DIFF
scarrazza Apr 17, 2019
cd87337
fixed small bug in the implementation of the ATLAS single top differe…
Apr 20, 2019
4eebadc
Merge branch 'Symm_fix' of https://github.com/NNPDF/nnpdf into Symm_fix
Apr 24, 2019
fb45871
Merge branch 'master' into Symm_fix
enocera Apr 24, 2019
189c6bd
Merge branch 'Symm_fix' of https://github.com/NNPDF/nnpdf into Symm_fix
Apr 24, 2019
5c1a820
extremely primitive version of grouping datasets by experiment label …
wilsonmr Apr 10, 2019
865d33b
Added necessary providers for experiments by plotting plots to exist in
wilsonmr Apr 12, 2019
8f01a54
fixed fits_chi2_table for totals to work, added warning about future …
wilsonmr Apr 12, 2019
08524d6
deprecated/changed old experiments functions to use new behaviour
wilsonmr Apr 12, 2019
13ceab3
attempt to get tests working
wilsonmr Apr 12, 2019
0cb17f8
included t0set option in covariance_matrix
wilsonmr Apr 12, 2019
d03edeb
added labels to vp-comparefits tables and plots to indicate th covmat…
wilsonmr Apr 15, 2019
3c6c7bd
added rudimentary checks for loaded th covmat, added vp-comparefits s…
wilsonmr Apr 16, 2019
685e466
change default value of use_thcovmat_if_present to be False
wilsonmr Apr 24, 2019
a9eb4d5
Fixed registeredCfactors
Apr 24, 2019
d7a0901
Merge pull request #440 from NNPDF/singletopfix
scarrazza Apr 24, 2019
16bfaa3
Merge branch 'master' into Symm_fix
scarrazza Apr 26, 2019
baf5865
changed produce_fitthcovmat to be more readable including extra varia…
wilsonmr Apr 26, 2019
1d2dc7a
added documentation for running fit and report with th covmat
wilsonmr Apr 26, 2019
7a08692
Addressing Luca's comments
Apr 29, 2019
78da3ac
adding docstrings for qr, gs, svd choice
Apr 29, 2019
e7a9abb
updated guide, changed boolean flags for vp-comparefits to work, smal…
wilsonmr Apr 29, 2019
c53728d
update docstring
RosalynLP Apr 30, 2019
09aab3e
moved some of the api components to the api module, add functionality…
wilsonmr Feb 12, 2019
7bcd7b4
minor changes
wilsonmr Feb 21, 2019
150357a
moved api changes up to reportengine, added api class to App module, …
wilsonmr Mar 4, 2019
9553738
accomodated changes in report engine to api class - Config and Enviro…
wilsonmr Mar 27, 2019
a158d5d
added environment_class back into reportengine.app.App subclass
wilsonmr Apr 1, 2019
6d39a0b
first iteration of api documentation
wilsonmr Apr 10, 2019
fa8430b
improved wording of docs, added note on creating figures in validphys…
wilsonmr Apr 16, 2019
f964903
improved first example to be an action which exists
wilsonmr Apr 16, 2019
380a0d9
Merge pull request #430 from NNPDF/emailindex
Zaharid May 2, 2019
5c9bcfc
Add python markers to code samples
Zaharid May 2, 2019
3d36c83
escape backslash so that tex gets parsed correctly from yaml file
wilsonmr May 2, 2019
53445d0
Minor clarifications to documentation
Zaharid May 2, 2019
97cea6c
fix conflict
May 3, 2019
4b54d49
Merge pull request #445 from NNPDF/fixplotlabel
enocera May 3, 2019
b468626
removed subclassing of API in validphys.app
wilsonmr May 3, 2019
a7ecf11
changed production rule names, small fixes to formatting of documenta…
wilsonmr May 4, 2019
f87854e
fixing conflicts in construction.py
May 5, 2019
18e629d
changes to plots requested by Juan
May 6, 2019
527d75e
fixing conflict in construction.py
May 6, 2019
ede5052
adding fivetheories dependency to fix error
May 6, 2019
962df17
Update tests.py
RosalynLP May 6, 2019
c5531be
addressing pylint
May 6, 2019
d5ee293
fix conflict
May 6, 2019
2c26731
new theorycovarianceutils
May 6, 2019
46cd86e
add new line at end of file
RosalynLP May 6, 2019
5b44c8d
Merge pull request #427 from NNPDF/expbyplotlabel
Zaharid May 7, 2019
b49ca68
Bump reportengine requirement
Zaharid May 7, 2019
934b6dc
Merge pull request #375 from NNPDF/api
Zaharid May 7, 2019
066a892
Add .pylintrc
Zaharid Mar 18, 2019
48fc14f
Add information on python tools to docs
Zaharid May 7, 2019
79d932d
Merge pull request #401 from NNPDF/pylint
Zaharid May 7, 2019
6042c5a
adding cos angle function
May 8, 2019
f6165e4
Merge branch 'master' into covmat_tests
RosalynLP May 8, 2019
a420bad
Merge pull request #405 from NNPDF/covmat_tests
scarrazza May 9, 2019
5e7c56b
adding theta calculation and changing line on plot
May 10, 2019
8c5093a
Update tests.py
RosalynLP May 10, 2019
490b86c
Merge pull request #452 from NNPDF/plotlinechange
RosalynLP May 10, 2019
a44e882
Corrected correspondence in the ATLAS top diff SF data sets
May 13, 2019
a5028d1
Merge branch 'Symm_fix' of https://github.com/NNPDF/nnpdf into Symm_fix
May 13, 2019
f9de3cc
Removed useless data
May 13, 2019
e7a29b3
Merge branch 'master' into Symm_fix
enocera May 13, 2019
6ae69be
fixing bug in theta dependencies
May 14, 2019
94415fc
Merge pull request #455 from NNPDF/theta_correct
RosalynLP May 14, 2019
148ebd6
updating plot labels in line with PRL
May 14, 2019
67564af
fix plotlabel
May 14, 2019
391033a
added new table which has same format as experiment_result_table but …
wilsonmr May 3, 2019
51fa5db
used internal confidence interval calc for compatibility with all imp…
wilsonmr May 3, 2019
7be625c
fixed experiment_result_no_table to work with master
wilsonmr May 15, 2019
25e9f9e
fixed the various experiments cov mat functions to work with new covm…
wilsonmr May 15, 2019
3c58814
moved API class to seperate module, to avoid mpl backend issues
wilsonmr May 15, 2019
e327a07
Adding eigenvector plot
May 15, 2019
c9a1bb2
fixing title
May 15, 2019
27209d7
fixing xticks
May 15, 2019
606d118
fix bug in axes label
May 16, 2019
9cc1cab
added module docstring and comment explaining why we need a seperate …
wilsonmr May 16, 2019
a590d15
Merge pull request #398 from NNPDF/Symm_fix
enocera May 17, 2019
e820fd4
first commit of the n3fit fitting code
scarlehoff May 17, 2019
0106711
changed provider in vp_setupfit.py
wilsonmr May 17, 2019
9b547b7
Merge pull request #457 from NNPDF/apiimport
Zaharid May 17, 2019
65d473b
adding shift vector to evec plots
May 17, 2019
0ba9f4f
Merge pull request #462 from NNPDF/setupfit
Zaharid May 20, 2019
ea8eb19
Added missing PLOTTING file fro CMS total xsec at 5 TeV
May 20, 2019
62b17e9
passed the code through pylint, some warnings explicitly ignored: W12…
scarlehoff May 20, 2019
cdea7c4
changes to the yaml files
scarlehoff May 20, 2019
8fbcf74
a bit of pylint to the hyperopt files
scarlehoff May 20, 2019
aa709db
bugfix
scarlehoff May 20, 2019
9513fc7
passed black to the code
scarlehoff May 21, 2019
3513478
fixed output of test_t0sqrtcovmat to use t0 pdf, updated all tests to…
wilsonmr May 21, 2019
e128a7c
Merge pull request #466 from NNPDF/CMSTTBARTOT5TEV
Zaharid May 21, 2019
0b6bc0f
Merge pull request #447 from NNPDF/exp_res_tab
Zaharid May 21, 2019
e131016
Add proof of concept of image comparison tests
Zaharid Apr 9, 2019
23a91b9
changed import of API from app to api in plot pdfs test
wilsonmr May 22, 2019
bdca24b
using floatformatting to improve sig figs on evector plot
May 22, 2019
f9ebd8a
added image comparison test for plot_dataspecs_datasets_chi2
wilsonmr May 22, 2019
f409a51
Merge pull request #456 from NNPDF/plotlabelupdate
scarrazza May 22, 2019
f4aafea
adding diagonal/blockdiagonal functionalities
May 21, 2019
abef5dc
add png files to validphys setup for tests
wilsonmr May 22, 2019
65412e3
Merge pull request #426 from NNPDF/imgcomp
Zaharid May 22, 2019
f609a5a
Merge pull request #458 from NNPDF/evec_plot
Zaharid May 23, 2019
7be5073
minor changing to avoid pruction of unused table
May 24, 2019
4aaeb90
adding docstring and documentation
May 24, 2019
533c2ad
some basic instructions
scarrazza May 24, 2019
11bb8c1
Add info on conda infrastructure
Zaharid May 28, 2019
16745bc
Make minor style changes and add links
Zaharid May 28, 2019
4e70fda
Arrange the sections so they make (some) sense
Zaharid May 28, 2019
2033c02
Add info on DNS
Zaharid May 28, 2019
025d0d8
adjustments
scarrazza May 28, 2019
5afd390
Mention storage of the private key in travis
Zaharid May 28, 2019
33580c7
Mention password protected URLs
Zaharid May 28, 2019
ba660b3
Describe options in the docs and format code
Zaharid May 31, 2019
aadae6b
updating plot labels in line with PRL
May 14, 2019
293f464
fix plotlabel
May 14, 2019
6c1457a
Add proof of concept of image comparison tests
Zaharid Apr 9, 2019
a47451c
changed import of API from app to api in plot pdfs test
wilsonmr May 22, 2019
7d65e1a
added image comparison test for plot_dataspecs_datasets_chi2
wilsonmr May 22, 2019
ef844d2
add png files to validphys setup for tests
wilsonmr May 22, 2019
968b619
Adding eigenvector plot
May 15, 2019
8f8905b
fixing title
May 15, 2019
d25e8a1
fixing xticks
May 15, 2019
d87a1da
fix bug in axes label
May 16, 2019
d578d60
adding shift vector to evec plots
May 17, 2019
f95a4ce
using floatformatting to improve sig figs on evector plot
May 22, 2019
4ce1b00
enforcing dataset order
May 21, 2019
51964c8
document production rule
RosalynLP May 22, 2019
2832be1
Use NNPDF servers to upload packages
Zaharid May 24, 2019
8f22875
Fix dataspecs typo
voisey May 31, 2019
a2447c0
Fix channels in travis
Zaharid May 31, 2019
b8accf1
Update guide.md
scarrazza Jun 3, 2019
bab8dcf
Merge branch 'master' into serverdoc
scarrazza Jun 3, 2019
cd2c521
Merge pull request #469 from NNPDF/serverdoc
scarrazza Jun 3, 2019
7065d29
fixing formatting errors
Jun 4, 2019
b1de699
Merge pull request #467 from NNPDF/diagonal_thcovmat
Zaharid Jun 4, 2019
36077ac
Rename theory_corrmat in tests
Zaharid Jun 5, 2019
95bdd9e
changed documentation to reflect buildmaster cmake file change
wilsonmr Jun 6, 2019
234ed45
Merge pull request #478 from NNPDF/cmakedoc
Zaharid Jun 6, 2019
db2f2b0
added first draft of mpl test docs
wilsonmr Jun 6, 2019
d1cb214
changed regressions and weights tests to use API
wilsonmr Jun 6, 2019
8a3b53e
remove test dependency list from vp guide
wilsonmr Jun 7, 2019
a48965c
expanded comment on test_predictions to explain why we deconstruct an…
wilsonmr Jun 7, 2019
a8ba9b7
Merge pull request #479 from NNPDF/mpltestdoc
Zaharid Jun 7, 2019
fdb9135
got rid of mass duplications in conftest
wilsonmr Jun 7, 2019
059af16
removed unneccessary imports from results
wilsonmr Jun 7, 2019
f9ce230
Merge pull request #480 from NNPDF/teststoapi
Zaharid Jun 11, 2019
88919a9
modified conda package to nnpdf-tf with the dependencies for n3fit
scarlehoff Jun 19, 2019
eef953c
Add pure Python FK parser
Zaharid Mar 19, 2019
f52e00d
Use pandas for parsing
Zaharid Mar 20, 2019
68a8656
Add support for DIS tables
Zaharid Mar 21, 2019
c693fb1
Improve parsing
Zaharid Mar 21, 2019
2b6b242
Add dataclasses dependency for python 3.6
Zaharid Mar 21, 2019
b935b18
Add support for cfactors
Zaharid Mar 26, 2019
7284452
Add some documentation
Zaharid Mar 26, 2019
cf0a7f2
first commit of the n3fit fitting code
scarlehoff May 17, 2019
5deb21a
passed the code through pylint, some warnings explicitly ignored: W12…
scarlehoff May 20, 2019
f875f50
changes to the yaml files
scarlehoff May 20, 2019
182d07c
a bit of pylint to the hyperopt files
scarlehoff May 20, 2019
4476bb5
bugfix
scarlehoff May 20, 2019
cd831a4
passed black to the code
scarlehoff May 21, 2019
acbb257
modified conda package to nnpdf-tf with the dependencies for n3fit
scarlehoff Jun 19, 2019
88ff633
only god knows
scarlehoff Jun 19, 2019
6093bab
creating Makefile
Jun 19, 2019
08d3362
new makefile
Jun 19, 2019
77ee198
adding autogenerated files
Jun 19, 2019
7ef822e
changing theme
Jun 19, 2019
7c0df75
adding markdown parser
Jun 19, 2019
a373538
updating readme
Jun 19, 2019
95ddb2f
changing syntax for markdown parser
Jun 19, 2019
450fba3
removing commented lines
Jun 19, 2019
443f374
correcting typo in README
Jun 19, 2019
caa1489
create setuptool package
scarlehoff Jun 22, 2019
023d3e3
added setup.py
scarlehoff Jun 22, 2019
e5554db
reorganize a bit the code and make the hyperopt plotting into its own…
scarlehoff Jun 21, 2019
b44d1f1
added sphinx-like documentation
scarlehoff Jun 21, 2019
935edf8
fix typo
scarlehoff Jun 21, 2019
4403bfa
fixed a few typos and added documentation for the root folder and io …
scarlehoff Jun 21, 2019
19104d8
added documentation for layers module
scarlehoff Jun 22, 2019
60955ce
readd example runcards
scarlehoff Jun 22, 2019
aed2dcf
added documentation to backends
scarlehoff Jun 22, 2019
e01ac3e
reorganize the folders back to n3fit, everything should be ready now …
scarlehoff Jun 22, 2019
cc75797
deleted forgotten file
scarlehoff Jun 23, 2019
4c1f1bc
adding doc string documentation
Jun 19, 2019
3fd0788
Merge pull request #484 from NNPDF/sphinx_docs
Zaharid Jun 24, 2019
43cc7c8
Added folder structure
Jun 25, 2019
b70fc85
Added new folders
Jun 25, 2019
30183c2
Merge branch 'master' into n3fit
scarlehoff Jun 25, 2019
da7a765
attempt failed
Jun 26, 2019
6029dc1
typo fix
scarlehoff Jun 26, 2019
7b12f6f
fixing index issue
Jun 26, 2019
0f73044
removing module files
Jun 26, 2019
0a9b1ac
cleaning branch
Jun 26, 2019
64c651f
tweaking index file
Jun 26, 2019
971a526
Merge branch 'doc_folders' into n3fit
scarlehoff Jun 26, 2019
92ddd41
adding new index
Jun 26, 2019
6201ae5
Merge branch 'doc_folders' into n3fit
scarlehoff Jun 26, 2019
5988408
correcting module structure
Jun 26, 2019
46dfcfa
Merge branch 'doc_folders' into n3fit
scarlehoff Jun 26, 2019
0a14814
fixing path append
Jun 26, 2019
d5c3ee4
added n3fit documentation to the nnpdf documentation folder
scarlehoff Jun 26, 2019
dc623d6
Merge branch 'doc_folders' into n3fit
scarlehoff Jun 26, 2019
a6edc21
adding index.rst for vp
Jun 26, 2019
ef8afab
Merge branch 'doc_folders' into n3fit
scarlehoff Jun 26, 2019
8c3eda0
added cmake instructions for evolve3fit and n3fit
scarlehoff Jun 27, 2019
b117a55
now conda build SHOULD be working
scarlehoff Jun 27, 2019
ba88538
changed the folder structure to be similar to vp and the name of the …
scarlehoff Jun 27, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .ciscripts/build-deploy-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -v
echo "$NETRC_FILE" | base64 --decode > ~/.netrc

#Build package
conda build -q conda-recipe
CONDA_PY=$CONDA_PY conda build -q conda-recipe
if [ $? != 0 ]; then
echo failed to build
exit 1
Expand All @@ -27,14 +27,14 @@ fi
#This seems to be needed for "artifacts" to work.
cp /root/miniconda3/conda-bld/linux-64/*.tar.bz2 .

echo "Uploading package to zigzah"
echo "Uploading package to the NNPDF server"
KEY=$( mktemp )
#This is defined in the Travis environment variables.
echo "$ZIGZAH_SSH_KEY" | base64 --decode > "$KEY"
echo "$NNPDF_SSH_KEY" | base64 --decode > "$KEY"

scp -i "$KEY" -o StrictHostKeyChecking=no\
/root/miniconda3/conda-bld/linux-64/*.tar.bz2 \
dummy@zigzah.com:~/conda-pkgs-private/linux-64
dummy@packages.nnpdf.science:~/packages/conda-private/linux-64

if [ $? == 0 ]; then
echo "Upload suceeded"
Expand Down
6 changes: 3 additions & 3 deletions .ciscripts/build-deploy-osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ set the UPLOAD_NON_MASTER variable."
exit 0
fi

echo "Uploading package to zigzah"
echo "Uploading package to the NNPDF server"
#Idiotic mac mktemp
KEY=$( mktemp "${TMPDIR:-/tmp}/key.XXXXXXXXX" )
#This is defined in the Gitlab variables, under the Settings Menu.
echo "$ZIGZAH_SSH_KEY" | base64 --decode > "$KEY"
echo "$NNPDF_SSH_KEY" | base64 --decode > "$KEY"

scp -i "$KEY" -o StrictHostKeyChecking=no\
${CONDAPATH}/conda-bld/${OUTPUT_ARCH}/*.tar.bz2 \
dummy@zigzah.com:~/${OUTPUT_CHANNEL}/${OUTPUT_ARCH}
dummy@packages.nnpdf.science:~/packages/${OUTPUT_CHANNEL}/${OUTPUT_ARCH}

if [ $? == 0 ]; then
echo "Upload suceeded"
Expand Down
Loading