From 9eb5ed942070912a9100093f3e0cd2f373c9fbd4 Mon Sep 17 00:00:00 2001 From: vbertone <valerio.bertone@cern.ch> Date: Fri, 20 Oct 2017 18:49:25 +0200 Subject: [PATCH 01/12] implementing interface to small-x resummation as implemented in APFEL --- FONLL/src/FONLL_wrap.f | 8 +++++++- src/apfel.f | 5 +++++ src/init_theory.f | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/FONLL/src/FONLL_wrap.f b/FONLL/src/FONLL_wrap.f index 5bf4a084c..34a316a6a 100644 --- a/FONLL/src/FONLL_wrap.f +++ b/FONLL/src/FONLL_wrap.f @@ -53,7 +53,8 @@ call SetPerturbativeOrder(PtOrder) call SetMassScheme(scheme) call SetNumberOfGrids(3) -c call EnableDampingFONLL(.false.) + call EnableDampingFONLL(.false.) +c call SetDampingPowerFONLL(-1,2,2) call SetGridParameters(1,50,3,9.8d-7) call SetGridParameters(2,40,3,1d-2) call SetGridParameters(3,40,3,7d-1) @@ -77,6 +78,11 @@ c call EnableDampingFONLL(.false.) endif endif * +* Small-x resummation +* +c call SetSmallxResummation(.true.,"NLL") +c call SetQLimits(1.65d0,300d0) +* * Initialize the APFEL DIS module * call InitializeAPFEL_DIS() diff --git a/src/apfel.f b/src/apfel.f index 5d7f5a674..16255a84c 100644 --- a/src/apfel.f +++ b/src/apfel.f @@ -52,6 +52,11 @@ endif call SetMassMatchingScales(kmuc,kmub,kmut) * +* Small-x resummation +* +c call SetSmallxResummation(.true.,"NLL") +c call SetQLimits(1.65d0,300d0) +* * Initialize APFEL * call InitializeAPFEL diff --git a/src/init_theory.f b/src/init_theory.f index 6cc466bb3..4207851f0 100644 --- a/src/init_theory.f +++ b/src/init_theory.f @@ -164,6 +164,8 @@ C Q2 grid weights WGT_q2(1) = 1.d0 WGT_q2(2) = 1.d0 C Basic Q2 grid: +c QARR(1) = starting_scale +c QARR(2) = 89000d0 ! needed for lhapdf grid QARR(1) = 1. QARR(2) = 2.05D8 ! needed for lhapdf grid c QARR(2) = 64000000. ! enough for 8 TeV LHC. -- GitLab From 699daf04ca0be938ac3edddfc87bd5c0b5c50d52 Mon Sep 17 00:00:00 2001 From: vbertone <valerio.bertone@cern.ch> Date: Fri, 20 Oct 2017 20:33:27 +0200 Subject: [PATCH 02/12] committing interface to small-x resummation through APFEL --- FONLL/src/FONLL_wrap.f | 12 ++++++----- src/apfel.f | 9 +++++---- src/init_theory.f | 46 ++++++++++++++++++++++++++++++++++++------ src/read_steer.f | 6 ++++++ 4 files changed, 58 insertions(+), 15 deletions(-) diff --git a/FONLL/src/FONLL_wrap.f b/FONLL/src/FONLL_wrap.f index 34a316a6a..a34a61eef 100644 --- a/FONLL/src/FONLL_wrap.f +++ b/FONLL/src/FONLL_wrap.f @@ -4,7 +4,7 @@ * ************************************************************************ subroutine FONLL_Set_Input(MassScheme,runm,Mcharm,MBottom,MTop, - 1 Q_ref,Alphas_ref,PtOrder,Scheme) + 1 Q_ref,Alphas_ref,PtOrder,Scheme,Smallx) * implicit none * @@ -17,7 +17,7 @@ double precision Q_ref,Alphas_ref character*7 Scheme character*5 MassScheme - logical runm + logical runm,Smallx double precision Q2save common / PreviousQ2 / Q2save ** @@ -53,7 +53,7 @@ call SetPerturbativeOrder(PtOrder) call SetMassScheme(scheme) call SetNumberOfGrids(3) - call EnableDampingFONLL(.false.) +c call EnableDampingFONLL(.false.) c call SetDampingPowerFONLL(-1,2,2) call SetGridParameters(1,50,3,9.8d-7) call SetGridParameters(2,40,3,1d-2) @@ -80,8 +80,10 @@ c call SetDampingPowerFONLL(-1,2,2) * * Small-x resummation * -c call SetSmallxResummation(.true.,"NLL") -c call SetQLimits(1.65d0,300d0) + if(Smallx)then + call SetSmallxResummation(.true.,"NLL") + call SetQLimits(1.65d0,300d0) + endif * * Initialize the APFEL DIS module * diff --git a/src/apfel.f b/src/apfel.f index 16255a84c..4d186c6b0 100644 --- a/src/apfel.f +++ b/src/apfel.f @@ -23,11 +23,10 @@ * if(iTheory.eq.35)then call SetTheory("QUniD") ! Set QCD+QED evolution (default) - call SetPDFEvolution("exactalpha") ! Use DGLAP evolution in terms of muF else call SetTheory("QCD") ! Set QCD evolution (default) - call SetPDFEvolution("exactalpha") ! Use DGLAP evolution in terms of alphas (rather than muF => faster for short steps) endif + call SetPDFEvolution("exactalpha") ! Use DGLAP evolution in terms of alphas (rather than muF => faster for short steps) call SetFastEvolution(.true.) ! Use fast evolution (default) call SetAlphaEvolution("exact") ! Use exact solution on the beta functions (default) call SetQLimits(0.5d0,20000d0) ! Evolution limits @@ -54,8 +53,10 @@ * * Small-x resummation * -c call SetSmallxResummation(.true.,"NLL") -c call SetQLimits(1.65d0,300d0) + if(HF_SCHEME(9:12).eq."NLLx")then + call SetSmallxResummation(.true.,"NLL") + call SetQLimits(1.65d0,300d0) + endif * * Initialize APFEL * diff --git a/src/init_theory.f b/src/init_theory.f index 4207851f0..8f4539d57 100644 --- a/src/init_theory.f +++ b/src/init_theory.f @@ -1,4 +1,3 @@ - subroutine init_theory_modules * ------------------------------------------------ @@ -164,10 +163,15 @@ C Q2 grid weights WGT_q2(1) = 1.d0 WGT_q2(2) = 1.d0 C Basic Q2 grid: -c QARR(1) = starting_scale -c QARR(2) = 89000d0 ! needed for lhapdf grid QARR(1) = 1. - QARR(2) = 2.05D8 ! needed for lhapdf grid + QARR(2) = 2.05D8 ! needed for lhapdf grid +C Reduce the Q2 interval if small-x resummation through APFEL is included. + if(HFSCHEME.eq.3005.or. + 1 HFSCHEME.eq.3055.or. + 2 HFSCHEME.eq.3555)then + QARR(1) = starting_scale + QARR(2) = 89000d0 ! needed for lhapdf grid + endif c QARR(2) = 64000000. ! enough for 8 TeV LHC. C Default sizes @@ -1430,7 +1434,7 @@ c#include "steering.inc" double precision Q_ref,Alphas_ref character*7 Scheme character*5 MassScheme - logical runm + logical runm,Smallx * MCharm = mch MBottom = mbt @@ -1446,6 +1450,7 @@ c#include "steering.inc" * MassScheme = "Pole" runm = .false. + Smallx = .false. if (I_FIT_order.eq.1) then write(6,*) 'You have selected the FONLL scheme at LO' write(6,*) '*****************************************' @@ -1468,6 +1473,11 @@ c#include "steering.inc" Scheme = "FONLL-A" MassScheme = "MSbar" runm = .true. + elseif(HFSCHEME.eq.3005)then + write(6,*) "You have selected the FONLL-A scheme", + 1 " with small-x resummation at NLL" + Scheme = "FONLL-A" + Smallx = .true. elseif(HFSCHEME.eq.55)then write(6,*) "You have selected the FONLL-B scheme", 1 " with poles masses" @@ -1483,6 +1493,11 @@ c#include "steering.inc" Scheme = "FONLL-B" MassScheme = "MSbar" runm = .true. + elseif(HFSCHEME.eq.3055)then + write(6,*) "You have selected the FONLL-B scheme", + 1 " with small-x resummation at NLL" + Scheme = "FONLL-B" + Smallx = .true. else call HF_errlog(310320151, 'F: '// 1 'At NLO only the FONLL-A and FONLL-B '// @@ -1504,6 +1519,11 @@ c#include "steering.inc" Scheme = "FONLL-C" MassScheme = "MSbar" runm = .true. + elseif(HFSCHEME.eq.3555)then + write(6,*) "You have selected the FONLL-C scheme", + 1 " with small-x resummation at NLL" + Scheme = "FONLL-C" + Smallx = .true. else call HF_errlog(310320152, 'F: '// 1 'At NNLO only the FONLL-C scheme '// @@ -1523,9 +1543,23 @@ c#include "steering.inc" 4 'steering.txt card.') endif endif +* +* If the small-x resummation is included check that APFEL is used also +* for the evolution. +* + if(Smallx)then + if(iTheory.ne.10.and.iTheory.ne.35)then + call HF_errlog(20102017, 'F: '// + 1 'When using the FONLL scheme with small-x '// + 2 'resummation, APFEL must be used for the '// + 3 'evolution. '// + 4 'Please set TheoryType = "DGLAP_APFEL" in the '// + 5 'steering.txt card.') + endif + endif * call FONLL_Set_Input(MassScheme,runm,Mcharm,MBottom,MTop, - 1 Q_ref,Alphas_ref,PtOrder,Scheme) + 1 Q_ref,Alphas_ref,PtOrder,Scheme,Smallx) * return end diff --git a/src/read_steer.f b/src/read_steer.f index 5aaa19f5e..57660fd3f 100644 --- a/src/read_steer.f +++ b/src/read_steer.f @@ -1249,18 +1249,24 @@ C--------------------------------- HFSCHEME = 1005 elseif (HF_SCHEME.eq.'FONLL-A RUNM ON') then HFSCHEME = 2005 + elseif (HF_SCHEME.eq.'FONLL-A NLLx') then + HFSCHEME = 3005 elseif (HF_SCHEME.eq.'FONLL-B') then HFSCHEME = 55 elseif (HF_SCHEME.eq.'FONLL-B RUNM OFF') then HFSCHEME = 1055 elseif (HF_SCHEME.eq.'FONLL-B RUNM ON') then HFSCHEME = 2055 + elseif (HF_SCHEME.eq.'FONLL-B NLLx') then + HFSCHEME = 3055 elseif (HF_SCHEME.eq.'FONLL-C') then HFSCHEME = 555 elseif (HF_SCHEME.eq.'FONLL-C RUNM OFF') then HFSCHEME = 1555 elseif (HF_SCHEME.eq.'FONLL-C RUNM ON') then HFSCHEME = 2555 + elseif (HF_SCHEME.eq.'FONLL-C NLLx') then + HFSCHEME = 3555 elseif (HF_SCHEME.eq.'S-ACOT Chi') then HFSCHEME = 17 elseif (HF_SCHEME.eq.'S-ACOT Chi RC') then -- GitLab From b952e9679c9461019fc5217f96b968d14d6c5ffa Mon Sep 17 00:00:00 2001 From: vbertone <valerio.bertone@cern.ch> Date: Sat, 21 Oct 2017 14:23:31 +0200 Subject: [PATCH 03/12] including dummy routines in src/apfel_dum.f to avoid compilation errors when xFitter is configured without APFEL --- src/apfel_dum.f | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/apfel_dum.f b/src/apfel_dum.f index e88417df0..66a8c5f69 100644 --- a/src/apfel_dum.f +++ b/src/apfel_dum.f @@ -184,3 +184,11 @@ c---------------------------------------------------------- double precision Q,HeavyQuarkMass call print_apfel_error_message end + + subroutine SetSmallxResummation + call print_apfel_error_message + end + + subroutine SetQLimits + call print_apfel_error_message + end -- GitLab From 5cb9dfa61f8c2b994402dfb56d737235d41ec1d0 Mon Sep 17 00:00:00 2001 From: vbertone <valerio.bertone@cern.ch> Date: Tue, 7 Nov 2017 14:36:48 +0100 Subject: [PATCH 04/12] adjusting lower limit of the tabulation in alpha_s when small-x resummation through APFEL+HELL is enabled --- FONLL/src/FONLL_wrap.f | 2 +- src/apfel.f | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FONLL/src/FONLL_wrap.f b/FONLL/src/FONLL_wrap.f index a34a61eef..50baf6066 100644 --- a/FONLL/src/FONLL_wrap.f +++ b/FONLL/src/FONLL_wrap.f @@ -82,7 +82,7 @@ c call SetDampingPowerFONLL(-1,2,2) * if(Smallx)then call SetSmallxResummation(.true.,"NLL") - call SetQLimits(1.65d0,300d0) + call SetQLimits(1.6d0,300d0) endif * * Initialize the APFEL DIS module diff --git a/src/apfel.f b/src/apfel.f index 4d186c6b0..b00891e94 100644 --- a/src/apfel.f +++ b/src/apfel.f @@ -55,7 +55,7 @@ * if(HF_SCHEME(9:12).eq."NLLx")then call SetSmallxResummation(.true.,"NLL") - call SetQLimits(1.65d0,300d0) + call SetQLimits(1.6d0,300d0) endif * * Initialize APFEL -- GitLab From b693d0848f5dd244c142eb32bc1cd07b49e80058 Mon Sep 17 00:00:00 2001 From: vbertone <valerio.bertone@cern.ch> Date: Tue, 21 Nov 2017 18:12:21 +0100 Subject: [PATCH 05/12] extending tabulation in alphas in HELL needed for small-x resummation to allow the inclusion of experiments whose factorization scale can get as large as 4.5 TeV --- FONLL/src/FONLL_wrap.f | 2 +- src/apfel.f | 2 +- src/init_theory.f | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FONLL/src/FONLL_wrap.f b/FONLL/src/FONLL_wrap.f index 50baf6066..a476a61c9 100644 --- a/FONLL/src/FONLL_wrap.f +++ b/FONLL/src/FONLL_wrap.f @@ -82,7 +82,7 @@ c call SetDampingPowerFONLL(-1,2,2) * if(Smallx)then call SetSmallxResummation(.true.,"NLL") - call SetQLimits(1.6d0,300d0) + call SetQLimits(1.6d0,4550d0) endif * * Initialize the APFEL DIS module diff --git a/src/apfel.f b/src/apfel.f index b00891e94..2527633ad 100644 --- a/src/apfel.f +++ b/src/apfel.f @@ -55,7 +55,7 @@ * if(HF_SCHEME(9:12).eq."NLLx")then call SetSmallxResummation(.true.,"NLL") - call SetQLimits(1.6d0,300d0) + call SetQLimits(1.6d0,4550d0) endif * * Initialize APFEL diff --git a/src/init_theory.f b/src/init_theory.f index 8f4539d57..a7441454d 100644 --- a/src/init_theory.f +++ b/src/init_theory.f @@ -170,7 +170,7 @@ C Reduce the Q2 interval if small-x resummation through APFEL is included. 1 HFSCHEME.eq.3055.or. 2 HFSCHEME.eq.3555)then QARR(1) = starting_scale - QARR(2) = 89000d0 ! needed for lhapdf grid + QARR(2) = 2.025D7 ! needed for lhapdf grid endif c QARR(2) = 64000000. ! enough for 8 TeV LHC. -- GitLab From 656b849694799970df9b41ebc514ebaef595bfd7 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:19:10 +0000 Subject: [PATCH 06/12] Replace minuit.in.txt --- minuit.in.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/minuit.in.txt b/minuit.in.txt index 22a64cb9c..cb0044320 100644 --- a/minuit.in.txt +++ b/minuit.in.txt @@ -1,25 +1,25 @@ set title new 14p HERAPDF parameters - 2 'Bg' -0.061953 0.027133 - 3 'Cg' 5.562367 0.318464 - 7 'Aprig' 0.166118 0.028009 - 8 'Bprig' -0.383100 0.009784 + 2 'Bg' -0.089607 0.017340 + 3 'Cg' 6.181438 0.561598 + 7 'Aprig' -0.000253 0.000162 + 8 'Bprig' -0.963059 0.058750 9 'Cprig' 25.000000 0.000000 - 12 'Buv' 0.810476 0.016017 - 13 'Cuv' 4.823512 0.063844 - 15 'Euv' 9.921366 0.835891 - 22 'Bdv' 1.029995 0.061123 - 23 'Cdv' 4.846279 0.295439 - 33 'CUbar' 7.059694 0.809144 - 34 'DUbar' 1.548098 1.096540 - 41 'ADbar' 0.268798 0.008020 - 42 'BDbar' -0.127297 0.003628 - 43 'CDbar' 9.586246 1.448861 + 12 'Buv' 0.754313 0.025895 + 13 'Cuv' 4.944407 0.081892 + 15 'Euv' 11.487581 1.410932 + 22 'Bdv' 0.938383 0.084895 + 23 'Cdv' 4.689317 0.389127 + 33 'CUbar' 7.469599 1.312034 + 34 'DUbar' 3.542548 2.187603 + 41 'ADbar' 0.250268 0.008368 + 42 'BDbar' -0.165150 0.004035 + 43 'CDbar' 9.424084 1.829824 *call fcn 3 -*migrad 200000 -*hesse +migrad 200000 +hesse set print 3 return -- GitLab From 9b6dd53643b7e145d8cc6e94e89cd877e6302df4 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:19:45 +0000 Subject: [PATCH 07/12] Replace steering.txt --- steering.txt | 203 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 176 insertions(+), 27 deletions(-) diff --git a/steering.txt b/steering.txt index fcd6a9eca..1510c07a9 100644 --- a/steering.txt +++ b/steering.txt @@ -3,18 +3,27 @@ &InFiles ! Number of intput files - NInputFiles = 7 + NInputFiles = 8 ! Input files: - InputFileNames(1) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_920.dat' - InputFileNames(2) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_820.dat' - InputFileNames(3) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_575.dat' - InputFileNames(4) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_460.dat' - InputFileNames(5) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCem.dat' - InputFileNames(6) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCep.dat' - InputFileNames(7) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCem.dat' + InputFileNames(1) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_920.dat' + InputFileNames(2) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_820.dat' + InputFileNames(3) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_575.dat' + InputFileNames(4) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_460.dat' + InputFileNames(5) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCem.dat' + InputFileNames(6) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_CCep.dat' + InputFileNames(7) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_CCem.dat' + InputFileNames(8) = 'datafiles/hera/h1zeusCombined/charmProduction/1211.1182/MOD_H1ZEUS_Charm_combined.dat' + InputFileNames(9) = 'datafiles/lhc/atlas/wzProduction/1612.03016/zylow_cc.dat' + InputFileNames(10) = 'datafiles/lhc/atlas/drellYan/1404.1212/dy_lowmass.dat' + InputFileNames(11) = 'datafiles/lhc/atlas/drellYan/1404.1212/dy_lowmass_extended.dat' + !InputFileNames(11) = 'datafiles/lhc/atlas/drellYan/1305.4192/dy_highmass.dat' + !InputFileNames(11) = 'datafiles/hera/zeus/beautyProduction/1405.6915/ZEUS_Beauty_vertex.dat' + !InputFileNames(12) = 'datafiles/hera/zeus/beautyProduction/1405.6915/f2beauty-h1.dat' + + !InputFileNames(1) = 'datafiles/lhc/cms/wzProduction/1310.1138/CMS_W_plus_c_SPM_12_002.dat' &End @@ -44,23 +53,44 @@ &QCDNUM ! do not re-compute QCDNUM tables if they are present and match grid definition Read_QCDNUM_Tables = .true. + kmuc = 1.12 + !kmuc = 1.2 + !kmuc = 1.0 + kmub = 1.0 + kmut = 1.0 &End &OutDir ! Name of the directory where output will be stored (max 255 characters) - OutDirName = 'output' + !OutDirName = 'NLLx_HERA_charm_FIT_14p_rs_1' + !OutDirName = 'NLLx_HERAonly_NNLO_gluon_lowbin_11p' + !OutDirName = 'lmDY_zylow_NLLx_rs_1_NEW' + !OutDirName = 'Valerio_TRY' + !OutDirName = 'HERAonly_RTOPT_rs_1' + !OutDirName = 'FONLLC_HERA_charm_lmDY_Z_NEW' + !OutDirName = 'NLLx_TRY_rs_1' + !OutDirName = 'NLLx_HERA_charm_no2_7_11p_rs_1' + !OutDirName = 'FONLLC_HERA_nocharm_no2_7_11p' + !OutDirName = 'NLLx_NNLOfit_HERA_charm_Bands.RIGHT' + !OutDirName = 'FONLLC_2_7GeV_noBands.Bonvini' + !OutDirName = 'NLLx_2_7GeV_Dcut_1_6_max_FIT' + !OutDirName = 'NNPDF31_nnlo_as_0118' + !OutDirName = 'NNPDF31_nnlonllx.NEW/' + OutDirName = 'FONLLC_NoGreenArea_FIT.NEW.2' &End * * (Optional) Modify renormalisation/factorisation scales, dataset * dependently. The numbering follows sequential numbering of input files * &Scales - DataSetMuR = 7*1.0 ! Set muR scale to 1 for all 4 datasets - DataSetMuF = 7*1.0 ! Set muF scale to 1 for all 4 datasets - ! DataSetTheoryOrder = 7*'NNLO',"NLO",'NNLO' + DataSetMuR = 10*1.0 ! Set muR scale to 1 for all 4 datasets + DataSetMuF = 10*1.0 ! Set muF scale to 1 for all 4 datasets + DataSetTheoryOrder = 8*'NNLO',"NLO","NLO","NLO" ! DataSetMaxNF(2) = 4 ! Enable the H-VFNS (requires APFEL) ! DataSetMaxNF = 9*5 + !DataSetTheoryOrder = 'NNLO' + !DataSetTheoryOrder = 2*'NLO' &End * @@ -81,13 +111,15 @@ * &xFitter RunningMode = 'Fit' + !RunningMode = 'LHAPDF Analysis' ! 'Fit' -- standard MINUIT-minimization of PDF and other parameters ! 'LHAPDF Analysis' -- Evalutate input LHAPDF set uncertaitnies, chi2, profiling or reweighting ! Requires &LHAPDF namelist to specify the set name. If PDFSTYLE is not ! set to LHAPDFQ0, LHAPDF or LHAPDFNATIVE, sets it to LHAPDF ! 'PDF Rotate' -- performs PDF re-diagonalization. Requires theo.in files to operate properly - TheoryType = 'DGLAP' ! 'DGLAP' -- colinear evolution + TheoryType = 'DGLAP_APFEL' ! 'DGLAP' -- colinear evolution + !TheoryType = 'DGLAP' ! 'DGLAP' -- colinear evolution ! 'DGLAP_APFEL' -- collinear evolution with APFEL ! 'DGLAP_QEDEVOL' -- collinear evolution with QEDEVOL ! 'DGLAP_APFEL_QED' -- collinear evolution with APFEL with QED corrections @@ -100,8 +132,13 @@ Order = 'NNLO' ! 'LO', 'NLO' or 'NNLO', used for DGLAP evolution. + !Order = 'NLO' ! 'LO', 'NLO' or 'NNLO', used for DGLAP evolution. - Q02 = 1.9 ! Evolution starting scale + !Q02 = 1.9 ! Evolution starting scale + !Q02 = 2.6896 ! Evolution starting scale + !Q02 = 2.7225 ! Evolution starting scale + !Q02 = 2.8 ! Evolution starting scale + Q02 = 2.56 ! Evolution starting scale ! --- Scheme for heavy flavors ! --- HF_SCHEME = 'ZMVFNS' : ZM-VFNS (massless) from QCDNUM, @@ -133,7 +170,12 @@ ! --- HF_SCHEME = 'FONLL-C RUNM OFF' : FONLL-C mass scheme provided by APFEL with MSbar masses running OFF (available only at NNLO) ! --- HF_SCHEME = 'FONLL-C RUNM ON' : FONLL-C mass scheme provided by APFEL with MSbar masses running ON (available only at NNLO) ! (Any of the FONLL schemes at LO is equivalent to the ZM-VFNS) - HF_SCHEME = 'RT OPT' + + !HF_SCHEME = 'RT OPT' + !HF_SCHEME = 'FONLL-B' + !HF_SCHEME = 'FONLL-B NLLx' + HF_SCHEME = 'FONLL-C' + !HF_SCHEME = 'FONLL-C NLLx' ! PDF type. Possible types are currently available: ! 'proton' -- default (fitting proton data) @@ -152,7 +194,8 @@ ! 'DDIS' -- use Diffractive DIS ! 'BiLog' -- bi-lognormal parametrisation - PDFStyle = 'HERAPDF' + PDFStyle = 'HERAPDF' + !PDFStyle = 'LHAPDFNATIVE' ! XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ! @@ -175,7 +218,9 @@ CHI2SettingsName = 'StatScale', 'UncorSysScale', 'CorSysScale', 'UncorChi2Type', 'CorChi2Type' Chi2Settings = 'Poisson' , 'Linear', 'Linear' , 'Diagonal' , 'Hessian' + !Chi2Settings = 'Poisson' , 'Linear', 'Linear' , 'Diagonal' , 'Matrix' Chi2ExtraParam = 'PoissonCorr' + !Chi2ExtraParam = 'PoissonCorr', 'ExtraSystRescale' ! Flag to define if native APPLgrid CKM values should be kept. LUseAPPLgridCKM = True @@ -193,8 +238,10 @@ * Add extra to minuit parameters. These MUST include alpha_S and fs * &ExtraMinimisationParameters + !name = 'alphas', 'rs', 'fcharm' name = 'alphas', 'fs', 'fcharm' value = 0.118 , 0.4, 0. + !value = 0.118 , 1.0, 0. step = 0.0 , 0.0 , 0. ! set to 0 to avoid minimisation &End @@ -208,8 +255,12 @@ DoBandsSym = False ! symmetric bands ( HESSE ) ! -- Q2 values at which the pdfs & errors are done (up to 20) - Q2VAL = 1.9, 3.0, 4.0, 5., 10., 100., 6464, 8317 -! Q2VAL = 1.9, 4., 10., 100., 6464, 8317 + Q2VAL = 2.56, 2.8, 3.0, 4.0, 5., 10., 100., 6464, 8317 +! Q2VAL = 2.8, 3.0, 4.0, 5., 10., 100., 6464, 8317 +! Q2VAL = 1.9, 2.8, 3.0, 4., 10., 100., 6464, 8317 +! Q2VAL = 2.7225, 3., 4., 5., 10., 100., 6464, 8317, 10000 +! Q2VAL = 2.56, 2.8, 3., 4., 5., 10., 100., 6464, 8317, 10000 +! Q2VAL = 10, 100, 1000, 2000, 4000, 10000 ! How many x points to write (standard = 101) OUTNX = 101 @@ -236,25 +287,29 @@ ! Rule #1: Q2 cuts ProcessName(1) = 'NC e+-p' Variable(1) = 'Q2' - CutValueMin(1) = 3.5 + !CutValueMin(1) = 15.0 + CutValueMin(1) = 2.7 CutValueMax(1) = 1000000.0 ! Rule #2: x cuts ProcessName(2) = 'NC e+-p' Variable(2) = 'x' - CutValueMin(2) = 0.000001 + CutValueMin(2) = 0.000001 + !CutValueMin(2) = 0.0005 CutValueMax(2) = 1.0 !--------------------- CC ep ------------------ ProcessName(3) = 'CC e+-p' Variable(3) = 'Q2' - CutValueMin(3) = 3.5 + !CutValueMin(3) = 15.0 + CutValueMin(3) = 2.7 CutValueMax(3) = 1000000.0 ProcessName(4) = 'CC e+-p' Variable(4) = 'x' - CutValueMin(4) = 0.000001 + CutValueMin(4) = 0.000001 + !CutValueMin(4) = 0.0005 CutValueMax(4) = 1.0 !-------------------- DY pp ---------------------- @@ -289,15 +344,64 @@ ProcessName(9) = 'NC e+-p charm' Variable(9) = 'Q2' - CutValueMin(9) = 3.5 + !CutValueMin(9) = 15.0 + CutValueMin(9) = 2.7 CutValueMax(9) = 10000.0 ProcessName(10) = 'NC e+-p charm' Variable(10) = 'x' - CutValueMin(10) = 0.000001 + CutValueMin(10) = 0.000001 + !CutValueMin(10) = 0.0005 CutValueMax(10) = 1.0 - + ProcessName(11) = 'NC e+-p' + Variable(11) = 'y' + CutValueMin(11) = 0.0 + !CutValueMax(11) = 0.4 + CutValueMax(11) = 1.0 + + ProcessName(12) = 'CC e+-p' + Variable(12) = 'y' + CutValueMin(12) = 0.0 + !CutValueMax(12) = 0.4 + CutValueMax(12) = 1.0 + + ProcessName(13) = 'NC e+-p charm' + Variable(13) = 'y' + CutValueMin(13) = 0.0 + !CutValueMax(13) = 0.4 + CutValueMax(13) = 1.0 + + !ProcessName(14) = 'NC e+-p' + !Variable(14) = 'satVar' + !CutValueMin(14) = 0.0 + !CutValueMax(14) = 1.6 + + !ProcessName(15) = 'CC e+-p' + !Variable(15) = 'satVar' + !CutValueMin(15) = 0.0 + !CutValueMax(15) = 1.6 + + !ProcessName(16) = 'NC e+-p charm' + !Variable(16) = 'satVar' + !CutValueMin(16) = 0.0 + !CutValueMax(16) = 1.6 + + ProcessName(14) = 'NC e+-p' + Variable(14) = 'newVar' + CutValueMin(14) = 0.5 + CutValueMax(14) = 1.1 + + ProcessName(15) = 'CC e+-p' + Variable(15) = 'newVar' + CutValueMin(15) = 0.5 + CutValueMax(15) = 1.1 + + ProcessName(16) = 'NC e+-p charm' + Variable(16) = 'newVar' + CutValueMin(16) = 0.5 + CutValueMax(16) = 1.1 + &End * @@ -373,13 +477,58 @@ * (Optional) LHAPDF sttering card * &lhapdf - LHAPDFSET = 'CT10nlo' ! LHAPDF grid file + !LHAPDFSET = 'CT10nlo' ! LHAPDF grid file + !LHAPDFSET = 'CT14nlo' ! LHAPDF grid file + !LHAPDFSET = 'CT10nlo_CMSWc' ! LHAPDF grid file + !LHAPDFSET = 'CT14nlo_CMSWc' ! LHAPDF grid file + + !LHAPDFSET = 'ATLAS-epWZ12-EIG' ! LHAPDF grid file + !LHAPDFSET = 'ATLAS-epWZ16-EIG' ! LHAPDF grid file + !LHAPDFSET = 'ATLAS-epWZ16-EIG_CMSWc' ! LHAPDF grid file + + !LHAPDFSET = 'MMHT2014nnlo68cl' ! LHAPDF grid file + !LHAPDFSET = 'MMHT2014nlo68cl' ! LHAPDF grid file + !LHAPDFSET = 'MMHT2014nlo68cl_CMSWc' ! LHAPDF grid file + + !LHAPDFSET = 'CT10nnlo' ! LHAPDF grid file + !LHAPDFSET = 'CT14nnlo' ! LHAPDF grid file + !LHAPDFSET = 'abm12lhc_5_nnlo' ! LHAPDF grid file + !LHAPDFSET = 'HERAPDF20_NNLO_EIG' ! LHAPDF grid file + !LHAPDFSET = 'myCT14qed_90cl' ! LHAPDF grid file + !LHAPDFSET = 'HERAPDF20_NLO_EIG' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed_my' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed_1D' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed' ! LHAPDF grid file + + !LHAPDFSET = 'NNPDF30qed_2D_NNLOrwg' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30qed_2D_rwg' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30qed_1D_rwg' ! LHAPDF grid file + + !LHAPDFSET = 'NNPDF23_nnlo_as_0118_qed' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF23_nlo_as_0118_qed_Wasym' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed' ! LHAPDF grid file + !LHAPDFSET = 'gamHKR' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nnlo_as_0118' ! LHAPDF grid file + + !LHAPDFSET = 'NNPDF30_nlo_as_0118' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF31_nlo_as_0118' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nlo_as_0118_CMSWc' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF31_nlo_as_0118_CMSWc' ! LHAPDF grid file + LHAPDFSET = 'NNPDF31sx_nnlonllx_as_0118' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF31_nnlo_as_0118' ! LHAPDF grid file + + !LHAPDFSET = 'NNPDF30_nlo_as_0118_qed_HERA' ! LHAPDF grid file + !LHAPDFSET = 'CT14qed_inc_proton' ! LHAPDF grid file + !LHAPDFSET = 'LUXqed_plus_PDF4LHC15_nnlo_100' ! LHAPDF grid file + !LHAPDFSET = 'xfitterHMDYep_1K_Bph_neg' ! LHAPDF grid file + !LHAPDFSET = 'NNPDF30_nlo_as_0118_qed_2D' ! LHAPDF grid file + ILHAPDFSET = 0 ! Set a PDF member of the PDF set (use together with LHAPDFPROFILE = False) ! LHAPDFVARSET = 'HERAPDF20_NLO_VAR' ! Add a PDF set with model and parametrisation uncertainties ! NPARVAR = 3 ! Number of parametrisation uncertainties in the LHAPDFVARSET set ! LHAPDFPROFILE = False ! run only on the set specified by ILHAPDFSET ! LHASCALEPROFILE = True ! Add QCD scale variations as nuisance parameters - ! SCALE68 = false ! Scale PDF uncertainties by a factor 1/1.645 + !SCALE68 = True ! Scale PDF uncertainties by a factor 1/1.645 ! WriteAlphaSToMemberPDF = false ! NREMOVEPRIORS = 0 ! Remove prior from the last n PDF nuisance parameters ! DataToTheo = True ! reset data to predictions corresponding to member 0, for sensitivity studies -- GitLab From b97d4024b49c2080baf5358cd88467039b502722 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:20:10 +0000 Subject: [PATCH 08/12] Replace ewparam.txt --- ewparam.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ewparam.txt b/ewparam.txt index 8caabee17..adfcc815e 100644 --- a/ewparam.txt +++ b/ewparam.txt @@ -58,7 +58,8 @@ mst = 0.150d0 ! Heavy quark masses: - mch = 1.43d0 ! Synchronize with QCDNUM,RT + !mch = 1.43d0 ! Synchronize with QCDNUM,RT + mch = 1.46d0 ! Synchronize with QCDNUM,RT mtp = 173d0 ! Synchronize with QCDNUM mbt = 4.5d0 ! Synchronize with QCDNUM,RT -- GitLab From 0ae0867beceee3d0f036b0eb9f2213e52c0a7cf6 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:20:44 +0000 Subject: [PATCH 09/12] Replace dimensions.h --- include/dimensions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dimensions.h b/include/dimensions.h index ded5b51c5..5beb0deed 100644 --- a/include/dimensions.h +++ b/include/dimensions.h @@ -1,5 +1,5 @@ #ifndef NSYSMAX_C -#define NSYSMAX_C 750 +#define NSYSMAX_C 1500 #endif #ifndef NTOT_C #define NTOT_C 2700 -- GitLab From 3a2dd446f4a3c5d6d335d93b4be3ee6039295344 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:22:12 +0000 Subject: [PATCH 10/12] Replace FONLL_wrap.f -- GitLab From 58d2da5ceeecd69f36d44321fff327badc50fed2 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 12:22:44 +0000 Subject: [PATCH 11/12] Replace apfel.f -- GitLab From 3ae2dadcabed6e96eb4187b95f014af64cd86344 Mon Sep 17 00:00:00 2001 From: Francesco Giuli <francesco.giuli@cern.ch> Date: Thu, 8 Feb 2018 14:25:59 +0000 Subject: [PATCH 12/12] Replace steering.txt --- steering.txt | 227 +++++++++++---------------------------------------- 1 file changed, 49 insertions(+), 178 deletions(-) diff --git a/steering.txt b/steering.txt index 1510c07a9..ab852d87c 100644 --- a/steering.txt +++ b/steering.txt @@ -3,27 +3,28 @@ &InFiles ! Number of intput files - NInputFiles = 8 + NInputFiles = 7 ! Input files: - InputFileNames(1) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_920.dat' - InputFileNames(2) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_820.dat' - InputFileNames(3) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_575.dat' - InputFileNames(4) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCep_460.dat' - InputFileNames(5) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_NCem.dat' - InputFileNames(6) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_CCep.dat' - InputFileNames(7) = 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/MOD_HERA1+2_CCem.dat' - InputFileNames(8) = 'datafiles/hera/h1zeusCombined/charmProduction/1211.1182/MOD_H1ZEUS_Charm_combined.dat' - InputFileNames(9) = 'datafiles/lhc/atlas/wzProduction/1612.03016/zylow_cc.dat' - InputFileNames(10) = 'datafiles/lhc/atlas/drellYan/1404.1212/dy_lowmass.dat' - InputFileNames(11) = 'datafiles/lhc/atlas/drellYan/1404.1212/dy_lowmass_extended.dat' - - !InputFileNames(11) = 'datafiles/lhc/atlas/drellYan/1305.4192/dy_highmass.dat' - !InputFileNames(11) = 'datafiles/hera/zeus/beautyProduction/1405.6915/ZEUS_Beauty_vertex.dat' - !InputFileNames(12) = 'datafiles/hera/zeus/beautyProduction/1405.6915/f2beauty-h1.dat' - - !InputFileNames(1) = 'datafiles/lhc/cms/wzProduction/1310.1138/CMS_W_plus_c_SPM_12_002.dat' + InputFileNames = + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_920-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_820-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_575-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_460-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCem-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCep-thexp.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCem-thexp.dat', + + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_920.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_820.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_575.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCep_460.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_NCem.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCep.dat', + 'datafiles/hera/h1zeusCombined/inclusiveDis/1506.06042/HERA1+2_CCem.dat', + ! 'Z0_applgrid_nnlo_reaction.dat', 'D0_Wel_pt25_asymmetry.dat' + ! 'datafiles/lhc/atlas/wzProduction/1203.4051/Z0_applgrid_nnlo.dat', &End @@ -35,9 +36,18 @@ ! CorrFileNames(1) = 'datafiles/hera/h1/jets/0904.3870/H1_NormInclJets_HighQ2_99-07___H1_NormInclJets_HighQ2_99-07.corr' &End +&ReduceSyst + ! even with tolerance =0 the following flag may speed up calculations + do_reduce = .false. ! turn-on to simplify/speedup chi2 calculation. + ! tolerance = 0.0 for exact calculation, > 0.0 for improved speed. + tolerance = 0.0 + ! depending on blas library, toggling the following flag may improve chi2 computation speed: + useBlas = .false. +&End + &CovarToNuisance ! Global switch for using nuisance param representation for covariance mat. - LConvertCovToNui = .false. + LConvertCovToNui = .False. ! Tolerance -- zero means exact transformation Tolerance = 0.0 @@ -53,44 +63,23 @@ &QCDNUM ! do not re-compute QCDNUM tables if they are present and match grid definition Read_QCDNUM_Tables = .true. - kmuc = 1.12 - !kmuc = 1.2 - !kmuc = 1.0 - kmub = 1.0 - kmut = 1.0 &End &OutDir ! Name of the directory where output will be stored (max 255 characters) - !OutDirName = 'NLLx_HERA_charm_FIT_14p_rs_1' - !OutDirName = 'NLLx_HERAonly_NNLO_gluon_lowbin_11p' - !OutDirName = 'lmDY_zylow_NLLx_rs_1_NEW' - !OutDirName = 'Valerio_TRY' - !OutDirName = 'HERAonly_RTOPT_rs_1' - !OutDirName = 'FONLLC_HERA_charm_lmDY_Z_NEW' - !OutDirName = 'NLLx_TRY_rs_1' - !OutDirName = 'NLLx_HERA_charm_no2_7_11p_rs_1' - !OutDirName = 'FONLLC_HERA_nocharm_no2_7_11p' - !OutDirName = 'NLLx_NNLOfit_HERA_charm_Bands.RIGHT' - !OutDirName = 'FONLLC_2_7GeV_noBands.Bonvini' - !OutDirName = 'NLLx_2_7GeV_Dcut_1_6_max_FIT' - !OutDirName = 'NNPDF31_nnlo_as_0118' - !OutDirName = 'NNPDF31_nnlonllx.NEW/' - OutDirName = 'FONLLC_NoGreenArea_FIT.NEW.2' + OutDirName = 'output' &End * * (Optional) Modify renormalisation/factorisation scales, dataset * dependently. The numbering follows sequential numbering of input files * &Scales - DataSetMuR = 10*1.0 ! Set muR scale to 1 for all 4 datasets - DataSetMuF = 10*1.0 ! Set muF scale to 1 for all 4 datasets - DataSetTheoryOrder = 8*'NNLO',"NLO","NLO","NLO" + DataSetMuR = 7*1.0 ! Set muR scale to 1 for all 4 datasets + DataSetMuF = 7*1.0 ! Set muF scale to 1 for all 4 datasets + ! DataSetTheoryOrder = 7*'NNLO',"NLO",'NNLO' ! DataSetMaxNF(2) = 4 ! Enable the H-VFNS (requires APFEL) ! DataSetMaxNF = 9*5 - !DataSetTheoryOrder = 'NNLO' - !DataSetTheoryOrder = 2*'NLO' &End * @@ -111,15 +100,13 @@ * &xFitter RunningMode = 'Fit' - !RunningMode = 'LHAPDF Analysis' ! 'Fit' -- standard MINUIT-minimization of PDF and other parameters ! 'LHAPDF Analysis' -- Evalutate input LHAPDF set uncertaitnies, chi2, profiling or reweighting ! Requires &LHAPDF namelist to specify the set name. If PDFSTYLE is not ! set to LHAPDFQ0, LHAPDF or LHAPDFNATIVE, sets it to LHAPDF ! 'PDF Rotate' -- performs PDF re-diagonalization. Requires theo.in files to operate properly - TheoryType = 'DGLAP_APFEL' ! 'DGLAP' -- colinear evolution - !TheoryType = 'DGLAP' ! 'DGLAP' -- colinear evolution + TheoryType = 'DGLAP' ! 'DGLAP' -- colinear evolution ! 'DGLAP_APFEL' -- collinear evolution with APFEL ! 'DGLAP_QEDEVOL' -- collinear evolution with QEDEVOL ! 'DGLAP_APFEL_QED' -- collinear evolution with APFEL with QED corrections @@ -132,13 +119,8 @@ Order = 'NNLO' ! 'LO', 'NLO' or 'NNLO', used for DGLAP evolution. - !Order = 'NLO' ! 'LO', 'NLO' or 'NNLO', used for DGLAP evolution. - !Q02 = 1.9 ! Evolution starting scale - !Q02 = 2.6896 ! Evolution starting scale - !Q02 = 2.7225 ! Evolution starting scale - !Q02 = 2.8 ! Evolution starting scale - Q02 = 2.56 ! Evolution starting scale + Q02 = 1.9 ! Evolution starting scale ! --- Scheme for heavy flavors ! --- HF_SCHEME = 'ZMVFNS' : ZM-VFNS (massless) from QCDNUM, @@ -170,12 +152,7 @@ ! --- HF_SCHEME = 'FONLL-C RUNM OFF' : FONLL-C mass scheme provided by APFEL with MSbar masses running OFF (available only at NNLO) ! --- HF_SCHEME = 'FONLL-C RUNM ON' : FONLL-C mass scheme provided by APFEL with MSbar masses running ON (available only at NNLO) ! (Any of the FONLL schemes at LO is equivalent to the ZM-VFNS) - - !HF_SCHEME = 'RT OPT' - !HF_SCHEME = 'FONLL-B' - !HF_SCHEME = 'FONLL-B NLLx' - HF_SCHEME = 'FONLL-C' - !HF_SCHEME = 'FONLL-C NLLx' + HF_SCHEME = 'RT OPT' ! PDF type. Possible types are currently available: ! 'proton' -- default (fitting proton data) @@ -194,8 +171,7 @@ ! 'DDIS' -- use Diffractive DIS ! 'BiLog' -- bi-lognormal parametrisation - PDFStyle = 'HERAPDF' - !PDFStyle = 'LHAPDFNATIVE' + PDFStyle = 'HERAPDF' ! XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ! @@ -218,9 +194,7 @@ CHI2SettingsName = 'StatScale', 'UncorSysScale', 'CorSysScale', 'UncorChi2Type', 'CorChi2Type' Chi2Settings = 'Poisson' , 'Linear', 'Linear' , 'Diagonal' , 'Hessian' - !Chi2Settings = 'Poisson' , 'Linear', 'Linear' , 'Diagonal' , 'Matrix' Chi2ExtraParam = 'PoissonCorr' - !Chi2ExtraParam = 'PoissonCorr', 'ExtraSystRescale' ! Flag to define if native APPLgrid CKM values should be kept. LUseAPPLgridCKM = True @@ -228,6 +202,7 @@ ! Debug flag LDEBUG = False + ! Quadratic approximation for asymmetric uncertainties ! AsymErrorsIterations = 10 &End @@ -238,10 +213,8 @@ * Add extra to minuit parameters. These MUST include alpha_S and fs * &ExtraMinimisationParameters - !name = 'alphas', 'rs', 'fcharm' name = 'alphas', 'fs', 'fcharm' value = 0.118 , 0.4, 0. - !value = 0.118 , 1.0, 0. step = 0.0 , 0.0 , 0. ! set to 0 to avoid minimisation &End @@ -255,12 +228,8 @@ DoBandsSym = False ! symmetric bands ( HESSE ) ! -- Q2 values at which the pdfs & errors are done (up to 20) - Q2VAL = 2.56, 2.8, 3.0, 4.0, 5., 10., 100., 6464, 8317 -! Q2VAL = 2.8, 3.0, 4.0, 5., 10., 100., 6464, 8317 -! Q2VAL = 1.9, 2.8, 3.0, 4., 10., 100., 6464, 8317 -! Q2VAL = 2.7225, 3., 4., 5., 10., 100., 6464, 8317, 10000 -! Q2VAL = 2.56, 2.8, 3., 4., 5., 10., 100., 6464, 8317, 10000 -! Q2VAL = 10, 100, 1000, 2000, 4000, 10000 + Q2VAL = 1.9, 3.0, 4.0, 5., 10., 100., 6464, 8317 +! Q2VAL = 1.9, 4., 10., 100., 6464, 8317 ! How many x points to write (standard = 101) OUTNX = 101 @@ -287,29 +256,25 @@ ! Rule #1: Q2 cuts ProcessName(1) = 'NC e+-p' Variable(1) = 'Q2' - !CutValueMin(1) = 15.0 - CutValueMin(1) = 2.7 + CutValueMin(1) = 3.5 CutValueMax(1) = 1000000.0 ! Rule #2: x cuts ProcessName(2) = 'NC e+-p' Variable(2) = 'x' - CutValueMin(2) = 0.000001 - !CutValueMin(2) = 0.0005 + CutValueMin(2) = 0.000001 CutValueMax(2) = 1.0 !--------------------- CC ep ------------------ ProcessName(3) = 'CC e+-p' Variable(3) = 'Q2' - !CutValueMin(3) = 15.0 - CutValueMin(3) = 2.7 + CutValueMin(3) = 3.5 CutValueMax(3) = 1000000.0 ProcessName(4) = 'CC e+-p' Variable(4) = 'x' - CutValueMin(4) = 0.000001 - !CutValueMin(4) = 0.0005 + CutValueMin(4) = 0.000001 CutValueMax(4) = 1.0 !-------------------- DY pp ---------------------- @@ -344,64 +309,15 @@ ProcessName(9) = 'NC e+-p charm' Variable(9) = 'Q2' - !CutValueMin(9) = 15.0 - CutValueMin(9) = 2.7 + CutValueMin(9) = 3.5 CutValueMax(9) = 10000.0 ProcessName(10) = 'NC e+-p charm' Variable(10) = 'x' - CutValueMin(10) = 0.000001 - !CutValueMin(10) = 0.0005 + CutValueMin(10) = 0.000001 CutValueMax(10) = 1.0 - ProcessName(11) = 'NC e+-p' - Variable(11) = 'y' - CutValueMin(11) = 0.0 - !CutValueMax(11) = 0.4 - CutValueMax(11) = 1.0 - - ProcessName(12) = 'CC e+-p' - Variable(12) = 'y' - CutValueMin(12) = 0.0 - !CutValueMax(12) = 0.4 - CutValueMax(12) = 1.0 - - ProcessName(13) = 'NC e+-p charm' - Variable(13) = 'y' - CutValueMin(13) = 0.0 - !CutValueMax(13) = 0.4 - CutValueMax(13) = 1.0 - - !ProcessName(14) = 'NC e+-p' - !Variable(14) = 'satVar' - !CutValueMin(14) = 0.0 - !CutValueMax(14) = 1.6 - - !ProcessName(15) = 'CC e+-p' - !Variable(15) = 'satVar' - !CutValueMin(15) = 0.0 - !CutValueMax(15) = 1.6 - - !ProcessName(16) = 'NC e+-p charm' - !Variable(16) = 'satVar' - !CutValueMin(16) = 0.0 - !CutValueMax(16) = 1.6 - - ProcessName(14) = 'NC e+-p' - Variable(14) = 'newVar' - CutValueMin(14) = 0.5 - CutValueMax(14) = 1.1 - - ProcessName(15) = 'CC e+-p' - Variable(15) = 'newVar' - CutValueMin(15) = 0.5 - CutValueMax(15) = 1.1 - - ProcessName(16) = 'NC e+-p charm' - Variable(16) = 'newVar' - CutValueMin(16) = 0.5 - CutValueMax(16) = 1.1 - + &End * @@ -477,58 +393,13 @@ * (Optional) LHAPDF sttering card * &lhapdf - !LHAPDFSET = 'CT10nlo' ! LHAPDF grid file - !LHAPDFSET = 'CT14nlo' ! LHAPDF grid file - !LHAPDFSET = 'CT10nlo_CMSWc' ! LHAPDF grid file - !LHAPDFSET = 'CT14nlo_CMSWc' ! LHAPDF grid file - - !LHAPDFSET = 'ATLAS-epWZ12-EIG' ! LHAPDF grid file - !LHAPDFSET = 'ATLAS-epWZ16-EIG' ! LHAPDF grid file - !LHAPDFSET = 'ATLAS-epWZ16-EIG_CMSWc' ! LHAPDF grid file - - !LHAPDFSET = 'MMHT2014nnlo68cl' ! LHAPDF grid file - !LHAPDFSET = 'MMHT2014nlo68cl' ! LHAPDF grid file - !LHAPDFSET = 'MMHT2014nlo68cl_CMSWc' ! LHAPDF grid file - - !LHAPDFSET = 'CT10nnlo' ! LHAPDF grid file - !LHAPDFSET = 'CT14nnlo' ! LHAPDF grid file - !LHAPDFSET = 'abm12lhc_5_nnlo' ! LHAPDF grid file - !LHAPDFSET = 'HERAPDF20_NNLO_EIG' ! LHAPDF grid file - !LHAPDFSET = 'myCT14qed_90cl' ! LHAPDF grid file - !LHAPDFSET = 'HERAPDF20_NLO_EIG' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed_my' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed_1D' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed' ! LHAPDF grid file - - !LHAPDFSET = 'NNPDF30qed_2D_NNLOrwg' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30qed_2D_rwg' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30qed_1D_rwg' ! LHAPDF grid file - - !LHAPDFSET = 'NNPDF23_nnlo_as_0118_qed' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF23_nlo_as_0118_qed_Wasym' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nnlo_as_0118_qed' ! LHAPDF grid file - !LHAPDFSET = 'gamHKR' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nnlo_as_0118' ! LHAPDF grid file - - !LHAPDFSET = 'NNPDF30_nlo_as_0118' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF31_nlo_as_0118' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nlo_as_0118_CMSWc' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF31_nlo_as_0118_CMSWc' ! LHAPDF grid file - LHAPDFSET = 'NNPDF31sx_nnlonllx_as_0118' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF31_nnlo_as_0118' ! LHAPDF grid file - - !LHAPDFSET = 'NNPDF30_nlo_as_0118_qed_HERA' ! LHAPDF grid file - !LHAPDFSET = 'CT14qed_inc_proton' ! LHAPDF grid file - !LHAPDFSET = 'LUXqed_plus_PDF4LHC15_nnlo_100' ! LHAPDF grid file - !LHAPDFSET = 'xfitterHMDYep_1K_Bph_neg' ! LHAPDF grid file - !LHAPDFSET = 'NNPDF30_nlo_as_0118_qed_2D' ! LHAPDF grid file - + LHAPDFSET = 'CT10nlo' ! LHAPDF grid file ILHAPDFSET = 0 ! Set a PDF member of the PDF set (use together with LHAPDFPROFILE = False) ! LHAPDFVARSET = 'HERAPDF20_NLO_VAR' ! Add a PDF set with model and parametrisation uncertainties ! NPARVAR = 3 ! Number of parametrisation uncertainties in the LHAPDFVARSET set ! LHAPDFPROFILE = False ! run only on the set specified by ILHAPDFSET ! LHASCALEPROFILE = True ! Add QCD scale variations as nuisance parameters - !SCALE68 = True ! Scale PDF uncertainties by a factor 1/1.645 + ! SCALE68 = false ! Scale PDF uncertainties by a factor 1/1.645 ! WriteAlphaSToMemberPDF = false ! NREMOVEPRIORS = 0 ! Remove prior from the last n PDF nuisance parameters ! DataToTheo = True ! reset data to predictions corresponding to member 0, for sensitivity studies -- GitLab