Skip to content

Move patches location #128

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
alecandido merged 9 commits into from
Feb 17, 2022
Merged

Move patches location #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39ada7f
Move patches in the mg5 scope
alecandido Feb 11, 2022
8e1f6d9
Update mg5 specific paths
alecandido Feb 11, 2022
2c34644
Update pineappl github url, to skip auth
alecandido Feb 11, 2022
2454856
Update yadism version
alecandido Feb 11, 2022
65f9f6f
Update pineappl to v0.5
alecandido Feb 14, 2022
3820275
Fix paths modules names
alecandido Feb 16, 2022
80ea398
Merge branch 'master' into mg5-patches
alecandido Feb 16, 2022
cd82ef5
Upgrade pre-commit
alecandido Feb 16, 2022
0b1f2a5
Exclude patches from pre-commit
alecandido Feb 16, 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
19 changes: 16 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: '^.*\.patch$'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-toml
- id: check-merge-conflict
- id: debug-statements
- id: fix-encoding-pragma
- repo: https://github.com/psf/black
rev: 21.6b0
rev: 22.1.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
hooks:
- id: blacken-docs
- repo: https://github.com/pycqa/isort
rev: 5.9.1
rev: 5.10.1
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
hooks:
- id: pyupgrade
1 change: 1 addition & 0 deletions docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/ATLAS_TTB_13TEV_TOT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/ATLAS_TTB_7TEV_TOT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/ATLAS_TTB_8TEV_2L_TTRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
6 changes: 3 additions & 3 deletions nnpdf31_proc/ATLAS_TTB_8TEV_LJ_TPT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -40,7 +40,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision p(0:4,nexternal)
double precision wgts(*)
double precision pt_t

pt_t = dsqrt(p(1,3)**2 + p(2,3)**2)

call HwU_fill(1,pt_t,wgts)
Expand All @@ -50,7 +50,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
call HwU_fill(5,pt_t,wgts)
call HwU_fill(6,pt_t,wgts)

999 return
999 return
end

ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
8 changes: 4 additions & 4 deletions nnpdf31_proc/ATLAS_TTB_8TEV_LJ_TRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -36,13 +36,13 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision wgts(*)
double precision yt, getrapidity
external getrapidity

yt = abs(getrapidity(p(0,3), p(3,3)))

call HwU_fill(1,yt,wgts)
call HwU_fill(2,yt,wgts)

999 return
999 return
end

ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -59,7 +59,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
8 changes: 4 additions & 4 deletions nnpdf31_proc/ATLAS_TTB_8TEV_LJ_TTM/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -46,9 +46,9 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
do i=0,3
pttx(i)=p(i,3)+p(i,4)
enddo

mtt = dsqrt(dot(pttx, pttx))

call HwU_fill(1,mtt,wgts)
call HwU_fill(2,mtt,wgts)
call HwU_fill(3,mtt,wgts)
Expand All @@ -57,7 +57,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
call HwU_fill(6,mtt,wgts)
call HwU_fill(7,mtt,wgts)

999 return
999 return
end

ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
8 changes: 4 additions & 4 deletions nnpdf31_proc/ATLAS_TTB_8TEV_LJ_TTRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -31,7 +31,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
include 'nexternal.inc'
integer istatus(nexternal)
integer iPDG(nexternal)
integer ibody
integer ibody
integer i
double precision p(0:4,nexternal)
double precision wgts(*)
Expand All @@ -48,7 +48,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
call HwU_fill(2,yttx,wgts)
call HwU_fill(3,yttx,wgts)

999 return
999 return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand All @@ -65,7 +65,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/ATLAS_TTB_8TEV_TOT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ subroutine analysis_end(dummy)
implicit none
double precision dummy
call HwU_write_file
return
return
end

cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/CMS_TTB_13TEV_2L_TPT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision p(0:4,nexternal)
double precision wgts(*)
double precision pt_t

pt_t = dsqrt(p(1,3)**2 + p(2,3)**2)

call HwU_fill(1,pt_t,wgts)
Expand Down
4 changes: 2 additions & 2 deletions nnpdf31_proc/CMS_TTB_13TEV_2L_TRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision wgts(*)
double precision yt, getrapidity
external getrapidity

yt = getrapidity(p(0,3), p(3,3))

call HwU_fill(1,yt,wgts)
Expand All @@ -61,7 +61,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/CMS_TTB_13TEV_2L_TTRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/CMS_TTB_13TEV_LJ_TPT/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision p(0:4,nexternal)
double precision wgts(*)
double precision pt_t

pt_t = dsqrt(p(1,3)**2 + p(2,3)**2)

call HwU_fill(1,pt_t,wgts)
Expand Down
4 changes: 2 additions & 2 deletions nnpdf31_proc/CMS_TTB_13TEV_LJ_TRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody)
double precision wgts(*)
double precision yt, getrapidity
external getrapidity

yt = abs(getrapidity(p(0,3), p(3,3)))

call HwU_fill(1,yt,wgts)
Expand All @@ -59,7 +59,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
2 changes: 1 addition & 1 deletion nnpdf31_proc/CMS_TTB_13TEV_LJ_TTRAP/analysis.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function getrapidity(en,pl)
else
y=sign(1.d0,pl)*1.d8
endif
else
else
y=sign(1.d0,pl)*1.d8
endif
getrapidity=y
Expand Down
Loading