From 6af3d3bf25a9aef9fe1e104b5237221f0d25e510 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 15 Sep 2020 14:03:15 +0200 Subject: [PATCH 01/18] Add CDFZRAP dataset --- nnpdf31_proc/CDFZRAP/analysis.f | 82 +++++++++++++++++++++++++++++++++ nnpdf31_proc/CDFZRAP/launch.txt | 24 ++++++++++ nnpdf31_proc/CDFZRAP/output.txt | 7 +++ 3 files changed, 113 insertions(+) create mode 100644 nnpdf31_proc/CDFZRAP/analysis.f create mode 100644 nnpdf31_proc/CDFZRAP/launch.txt create mode 100644 nnpdf31_proc/CDFZRAP/output.txt diff --git a/nnpdf31_proc/CDFZRAP/analysis.f b/nnpdf31_proc/CDFZRAP/analysis.f new file mode 100644 index 00000000..ed399c89 --- /dev/null +++ b/nnpdf31_proc/CDFZRAP/analysis.f @@ -0,0 +1,82 @@ +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + subroutine analysis_begin(nwgt,weights_info) +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + implicit none + integer nwgt + character*(*) weights_info(*) + + call set_error_estimation(1) + call HwU_inithist(nwgt,weights_info) + call HwU_book(1,'rap', 27, 0.0d0, 2.7d0) + call HwU_book(2,'rap', 1, 2.7d0, 2.9d0) + return + end + +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + subroutine analysis_end(dummy) +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + implicit none + double precision dummy + call HwU_write_file + return + end + +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + subroutine analysis_fill(p,istatus,ipdg,wgts,ibody) +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + implicit none + include 'nexternal.inc' + include 'cuts.inc' + integer istatus(nexternal) + integer iPDG(nexternal) + integer ibody + integer i + integer j + double precision p(0:4,nexternal) + double precision wgts(*) + double precision ppl(0:3), pplb(0:3), ppv(0:3), xyll, getabsy + external getabsy + + double precision p_reco(0:4,nexternal) + integer iPDG_reco(nexternal) + + + + call recombine_momenta(rphreco, etaphreco, lepphreco, quarkphreco, + $ p, iPDG, p_reco, iPDG_reco) + + do j = nincoming+1, nexternal + if (iPDG_reco(j).eq.11) ppl(0:3)=p_reco(0:3,j) + if (iPDG_reco(j).eq.-11) pplb(0:3)=p_reco(0:3,j) + enddo + do i=0,3 + ppv(i)=ppl(i)+pplb(i) + enddo + + xyll=getabsy(ppv(0),ppv(3)) + + call HwU_fill(1,xyll,wgts) + call HwU_fill(2,xyll,wgts) + + 999 return + end + +cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + function getabsy(en,pl) + implicit none + real*8 getabsy,en,pl,tmp +c + tmp=pl/en + if(abs(tmp).lt.1d0)then + tmp=abs(atanh(tmp)) + else + write(*,*)'Attempt to compute atanh(x) with x > 1' + stop + endif + getabsy=tmp + return + end diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt new file mode 100644 index 00000000..0fbd07b9 --- /dev/null +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -0,0 +1,24 @@ +launch @OUTPUT@ +fixed_order = ON +set mz @MZ@ +set ymt @YMT@ +set ebeam1 980 +set ebeam2 980 +set lpp1 -1 +set pdlabel lhapdf +set lhaid 324900 +set fixed_ren_scale True +set fixed_fac_scale True +set mur_ref_fixed @MZ@ +set muf_ref_fixed @MZ@ +set reweight_scale True +set ptl = 20.0 +set etal = 2.8 +#user_defined_cut set yz = 2.9 +set mll_sf = 66 +#user_defined_cut set mmllmax = 116.0 +set rphreco = 0.1 +set req_acc_FO 0.01 +set iappl 1 +done +quit diff --git a/nnpdf31_proc/CDFZRAP/output.txt b/nnpdf31_proc/CDFZRAP/output.txt new file mode 100644 index 00000000..2f087638 --- /dev/null +++ b/nnpdf31_proc/CDFZRAP/output.txt @@ -0,0 +1,7 @@ +set complex_mass_scheme True +import model loop_qcd_qed_sm_Gmu +define p = p b b~ +define j = p +generate p p > e+ e- [QCD QED] +output @OUTPUT@ +quit From e0148fed002c61b1d44991a27d871348d536263a Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 16 Sep 2020 16:16:36 +0200 Subject: [PATCH 02/18] Add W-boson mass to parameter database --- run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run.sh b/run.sh index f9c3fff6..8a921227 100755 --- a/run.sh +++ b/run.sh @@ -79,6 +79,7 @@ main() { # being we create the file here, but in the future it should be read from the theory database cat > variables.txt < Date: Wed, 16 Sep 2020 19:05:19 +0200 Subject: [PATCH 03/18] Enable post-run scripts --- run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run.sh b/run.sh index 8a921227..343d6da4 100755 --- a/run.sh +++ b/run.sh @@ -166,6 +166,12 @@ EOF tee results.log rm results.mg5_aMC results.grid + + # if there is anything to do after the run, do it! + if [[ -x ../nnpdf31_proc/"${dataset}"/postrun.sh ]]; then + cp ../nnpdf31_proc/"${dataset}"/postrun.sh . + GRID=$grid ./postrun.sh + fi } check_args_and_cd_output "$@" From 1aa7ee94448f0a8e39ef45f62bcd8601b28da6b9 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 17 Sep 2020 17:48:54 +0200 Subject: [PATCH 04/18] Support latest mg5_aMC@NLO commit --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 343d6da4..a0bea1fd 100755 --- a/run.sh +++ b/run.sh @@ -130,7 +130,7 @@ EOF grid="${dataset}".pineappl # merge the final bins - "${pineappl}" merge "${grid}" $(ls -v "${dataset}"/Events/run_01*/amcblast_obs_*.root) + "${pineappl}" merge "${grid}" $(ls -v "${dataset}"/Events/run_01*/amcblast_obs_*.pineappl) lz4=$(which lz4 2> /dev/null || true) From 29471dd9769148a6ecd1b9991b993b132da08a40 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 21 Jan 2021 13:14:57 +0100 Subject: [PATCH 05/18] Change `set iappl 1` to `set pineappl True` --- nnpdf31_proc/CDFZRAP/launch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index 0fbd07b9..12fd6d39 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -19,6 +19,6 @@ set mll_sf = 66 #user_defined_cut set mmllmax = 116.0 set rphreco = 0.1 set req_acc_FO 0.01 -set iappl 1 +set pineappl True done quit From d7ee1afa570bb0d92ddb99ec50706d58806922ef Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Sat, 7 Nov 2020 18:14:40 +0100 Subject: [PATCH 06/18] Disable threads for PDF uncertainties - just for the time being to avoid LHAPDF bug --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index a0bea1fd..a0e674e9 100755 --- a/run.sh +++ b/run.sh @@ -147,7 +147,7 @@ EOF # (re-)produce predictions "${pineappl}" convolute "${grid}" "${pdfstring}" --scales 9 > pineappl.convolute "${pineappl}" orders "${grid}" "${pdfstring}" --absolute > pineappl.orders - "${pineappl}" pdf_uncertainty "${grid}" "${pdfstring}" > pineappl.pdf_uncertainty + "${pineappl}" pdf_uncertainty --threads=1 "${grid}" "${pdfstring}" > pineappl.pdf_uncertainty # extract the numerical results from mg5_aMC sed '/^ [+-]/!d' "${dataset}"/Events/run_01*/MADatNLO.HwU > results.mg5_aMC From 1b38ab39f1bed22afeb3ecbabcca479fa525da64 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 21 Jan 2021 13:43:12 +0100 Subject: [PATCH 07/18] Add `mw` parameter --- nnpdf31_proc/CDFZRAP/launch.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index 12fd6d39..6930ab2a 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -1,5 +1,6 @@ launch @OUTPUT@ fixed_order = ON +set mw @MW@ set mz @MZ@ set ymt @YMT@ set ebeam1 980 From 8a5b09d995b7d41e6af4b287404a83261a1e90d7 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 21 Jan 2021 17:48:22 +0100 Subject: [PATCH 08/18] Add precheck support --- run.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run.sh b/run.sh index a0e674e9..13263f87 100755 --- a/run.sh +++ b/run.sh @@ -141,6 +141,11 @@ EOF grid="${grid}.lz4" fi + if [[ -x ../nnpdf31_proc/"${dataset}"/precheck.sh ]]; then + cp ../nnpdf31_proc/"${dataset}"/precheck.sh . + GRID=$grid ./precheck.sh + fi + # find out which PDF set was used to generate the predictions pdfstring=$(grep "set lhaid" "${launch_file}" | sed 's/set lhaid \([0-9]\+\)/\1/') From 722822b12cc1765fdb056b21249137839795edcc Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 21 Jan 2021 17:48:53 +0100 Subject: [PATCH 09/18] Change second initial state to anti-proton --- nnpdf31_proc/CDFZRAP/launch.txt | 2 +- nnpdf31_proc/CDFZRAP/precheck.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 nnpdf31_proc/CDFZRAP/precheck.sh diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index 6930ab2a..21ff3e7a 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -5,7 +5,7 @@ set mz @MZ@ set ymt @YMT@ set ebeam1 980 set ebeam2 980 -set lpp1 -1 +set lpp2 -1 set pdlabel lhapdf set lhaid 324900 set fixed_ren_scale True diff --git a/nnpdf31_proc/CDFZRAP/precheck.sh b/nnpdf31_proc/CDFZRAP/precheck.sh new file mode 100755 index 00000000..3c6c5f02 --- /dev/null +++ b/nnpdf31_proc/CDFZRAP/precheck.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +pineappl info --set initial_state_2 -2212 "${GRID}".tmp "${GRID}" +lz4 -9 "${GRID}".tmp +rm "${GRID}".tmp +mv "${GRID}".tmp.lz4 "${GRID%.lz4}".lz4 From 1e6044e4c664a7ab839172610d87193c7c243bc9 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 21 Jan 2021 18:40:22 +0100 Subject: [PATCH 10/18] Increase precision --- nnpdf31_proc/CDFZRAP/launch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index 21ff3e7a..a8b8ee73 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -19,7 +19,7 @@ set etal = 2.8 set mll_sf = 66 #user_defined_cut set mmllmax = 116.0 set rphreco = 0.1 -set req_acc_FO 0.01 +set req_acc_FO 0.0001 set pineappl True done quit From 16ef4d89afcf6b79ddb5373796d3d0ec732231d5 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Sat, 23 Jan 2021 09:31:50 +0100 Subject: [PATCH 11/18] Disable lepton cuts --- nnpdf31_proc/CDFZRAP/launch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index a8b8ee73..7cd4b27e 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -13,8 +13,8 @@ set fixed_fac_scale True set mur_ref_fixed @MZ@ set muf_ref_fixed @MZ@ set reweight_scale True -set ptl = 20.0 -set etal = 2.8 +set ptl = 0.0 +set etal = -1.0 #user_defined_cut set yz = 2.9 set mll_sf = 66 #user_defined_cut set mmllmax = 116.0 From 50741a49a455871c0fbce8893ddc3a014efaebd4 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Sat, 23 Jan 2021 09:32:23 +0100 Subject: [PATCH 12/18] Increase photon recombination radius --- nnpdf31_proc/CDFZRAP/launch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index 7cd4b27e..a71597e9 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -18,7 +18,7 @@ set etal = -1.0 #user_defined_cut set yz = 2.9 set mll_sf = 66 #user_defined_cut set mmllmax = 116.0 -set rphreco = 0.1 +set rphreco = 0.2 set req_acc_FO 0.0001 set pineappl True done From eb86699316a67d9109b30b1556ed23ac9f010b98 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Fri, 26 Mar 2021 12:44:47 +0100 Subject: [PATCH 13/18] Remove obsolete file --- nnpdf31_proc/CDFZRAP/precheck.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 nnpdf31_proc/CDFZRAP/precheck.sh diff --git a/nnpdf31_proc/CDFZRAP/precheck.sh b/nnpdf31_proc/CDFZRAP/precheck.sh deleted file mode 100755 index 3c6c5f02..00000000 --- a/nnpdf31_proc/CDFZRAP/precheck.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -pineappl info --set initial_state_2 -2212 "${GRID}".tmp "${GRID}" -lz4 -9 "${GRID}".tmp -rm "${GRID}".tmp -mv "${GRID}".tmp.lz4 "${GRID%.lz4}".lz4 From 74164d21cb6bd933d93f38a4d8142a16376177ee Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Fri, 26 Mar 2021 12:44:59 +0100 Subject: [PATCH 14/18] Set missing parameters --- nnpdf31_proc/CDFZRAP/launch.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDFZRAP/launch.txt index a71597e9..947a5af4 100644 --- a/nnpdf31_proc/CDFZRAP/launch.txt +++ b/nnpdf31_proc/CDFZRAP/launch.txt @@ -1,8 +1,15 @@ launch @OUTPUT@ fixed_order = ON +set maxjetflavor 5 +set gf @GF@ +set mh @MH@ +set mt @MT@ set mw @MW@ set mz @MZ@ -set ymt @YMT@ +set wh @WH@ +set wt @WT@ +set ww @WW@ +set wz @WZ@ set ebeam1 980 set ebeam2 980 set lpp2 -1 From 43c119d6a7f3f4496e56367f7c60c3f1bb47b408 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Fri, 26 Mar 2021 13:03:09 +0100 Subject: [PATCH 15/18] Add metadata --- nnpdf31_proc/CDFZRAP/metadata.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 nnpdf31_proc/CDFZRAP/metadata.txt diff --git a/nnpdf31_proc/CDFZRAP/metadata.txt b/nnpdf31_proc/CDFZRAP/metadata.txt new file mode 100644 index 00000000..9b229db0 --- /dev/null +++ b/nnpdf31_proc/CDFZRAP/metadata.txt @@ -0,0 +1,9 @@ +arxiv=0908.3914 +description=CDF differential Drell–Yan cross section at 1.96 TeV +hepdata=10.17182/hepdata.52674.v1/t2 +x1_label=yll +x1_label_tex=$y_{\ell\bar{\ell}}$ +x1_unit=GeV +y_label=dsig/dyll +y_label_tex=$\frac{\mathrm{d}\sigma}{\mathrm{d}y_{\ell\bar{\ell}}}$ +y_unit=pb/GeV From 4e8cbf006a5ad4e5d64a5b5389b835d6b2258bdf Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 19 Apr 2022 14:30:16 +0200 Subject: [PATCH 16/18] Rename dataset --- nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/analysis.f | 0 nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/launch.txt | 0 nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/metadata.txt | 0 nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/output.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/analysis.f (100%) rename nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/launch.txt (100%) rename nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/metadata.txt (100%) rename nnpdf31_proc/{CDFZRAP => CDF_DY_1960GEV_21FB}/output.txt (100%) diff --git a/nnpdf31_proc/CDFZRAP/analysis.f b/nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f similarity index 100% rename from nnpdf31_proc/CDFZRAP/analysis.f rename to nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f diff --git a/nnpdf31_proc/CDFZRAP/launch.txt b/nnpdf31_proc/CDF_DY_1960GEV_21FB/launch.txt similarity index 100% rename from nnpdf31_proc/CDFZRAP/launch.txt rename to nnpdf31_proc/CDF_DY_1960GEV_21FB/launch.txt diff --git a/nnpdf31_proc/CDFZRAP/metadata.txt b/nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt similarity index 100% rename from nnpdf31_proc/CDFZRAP/metadata.txt rename to nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt diff --git a/nnpdf31_proc/CDFZRAP/output.txt b/nnpdf31_proc/CDF_DY_1960GEV_21FB/output.txt similarity index 100% rename from nnpdf31_proc/CDFZRAP/output.txt rename to nnpdf31_proc/CDF_DY_1960GEV_21FB/output.txt From d93ffd19c41b4115c28e8e4bd7c6f497a740de65 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 19 Apr 2022 14:50:56 +0200 Subject: [PATCH 17/18] Fix `recombine_momenta` call --- nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f b/nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f index ed399c89..4c999020 100644 --- a/nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f +++ b/nnpdf31_proc/CDF_DY_1960GEV_21FB/analysis.f @@ -38,6 +38,7 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody) double precision p(0:4,nexternal) double precision wgts(*) double precision ppl(0:3), pplb(0:3), ppv(0:3), xyll, getabsy + logical is_nextph_iso(nexternal),is_nextph_iso_reco(nexternal) external getabsy double precision p_reco(0:4,nexternal) @@ -46,7 +47,8 @@ subroutine analysis_fill(p,istatus,ipdg,wgts,ibody) call recombine_momenta(rphreco, etaphreco, lepphreco, quarkphreco, - $ p, iPDG, p_reco, iPDG_reco) + $ p, iPDG, is_nextph_iso, p_reco, iPDG_reco, + $ is_nextph_iso_reco) do j = nincoming+1, nexternal if (iPDG_reco(j).eq.11) ppl(0:3)=p_reco(0:3,j) From e35cf1e9e57c13d2f721da2a27f9b69e3d15ddd3 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 19 Apr 2022 16:44:40 +0200 Subject: [PATCH 18/18] Fix wrong units in metadata --- nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt b/nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt index 9b229db0..a8a6a682 100644 --- a/nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt +++ b/nnpdf31_proc/CDF_DY_1960GEV_21FB/metadata.txt @@ -6,4 +6,4 @@ x1_label_tex=$y_{\ell\bar{\ell}}$ x1_unit=GeV y_label=dsig/dyll y_label_tex=$\frac{\mathrm{d}\sigma}{\mathrm{d}y_{\ell\bar{\ell}}}$ -y_unit=pb/GeV +y_unit=pb