From 768c0c2e9d7a019b7631890c5ad1bba80115a325 Mon Sep 17 00:00:00 2001 From: niclaurenti Date: Thu, 29 Jun 2023 12:27:49 +0200 Subject: [PATCH 1/5] Add theory 527 and extend comments in theories 522, 523, 524, 525, 526 --- nnpdfcpp/data/theory.db | Bin 110592 -> 110592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/nnpdfcpp/data/theory.db b/nnpdfcpp/data/theory.db index fa202758dff642f46054edb4265f30c67e5fa0c5..3dd3177dd2864e72c1516b9afc0bac11798042cc 100644 GIT binary patch delta 580 zcmZp8z}E19ZGtqTz(g5mMuCk9OXQj5I9N8bD_AfwvTU|fI>O4q&dkKb#LvXv%%icL zM}zTex;T3|0|%2B1K%8$qfBDlADDC45fs1 z8q@1%Gwz&Tpu)&G{my(w30;Mv(!9LPymW=coPvzR)Lb2ff{gr<{5*y9)V$Q9#FEq$ zg~SqtK!c{x7Cx9ss@P02AkHL11NYRhrmz-nm|^PJ3^OLyFtBMME&N&xoYU*3Gb(d8 zs&a6;`TP0!=sHbLoXvP0>{XUPR~Lop59c!q6YWZn!Q48GRvQb=7`Jbn!C1}2!t23s zWMbg~)~1jaUYP5ZvAJH4IM&;<2KmE@vM(*kJ zf*Cod8_Z=CVKX#Pa8C`}zHtU)H4|%-X$vnzJ!AUxk5d>QqN*0<1gUMZXyJh-QAK>!|8Pcn$T;Ou=fETDYNV3$&nWs=V bG+Vf!?rnVycCW Date: Fri, 30 Jun 2023 15:03:48 +0200 Subject: [PATCH 2/5] Change the order of the process for the output --- validphys2/src/validphys/theorycovariance/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/theorycovariance/output.py b/validphys2/src/validphys/theorycovariance/output.py index e9c4428e54..7299579863 100644 --- a/validphys2/src/validphys/theorycovariance/output.py +++ b/validphys2/src/validphys/theorycovariance/output.py @@ -128,7 +128,7 @@ def plot_covmat_heatmap(covmat, title): return fig -_procorder = ("DIS NC", "DIS CC", "DY NC", "DY CC", "JETS", "TOP", "SINGLETOP", "PHOTON", "DIJET") +_procorder = ("DIS NC", "DIS CC", "TOP", "DY NC", "DY CC", "SINGLETOP", "JETS", "PHOTON", "DIJET") _dsorder = ( "BCDMSP", From c8d087b959de313e94687b3b1e111ea1af9f0f7c Mon Sep 17 00:00:00 2001 From: niclaurenti Date: Mon, 3 Jul 2023 16:06:24 +0200 Subject: [PATCH 3/5] Change also luxset with vp-nextfitruncard --- validphys2/src/validphys/eff_exponents.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/validphys2/src/validphys/eff_exponents.py b/validphys2/src/validphys/eff_exponents.py index 0a3a6c7a1f..6ed9b168e1 100644 --- a/validphys2/src/validphys/eff_exponents.py +++ b/validphys2/src/validphys/eff_exponents.py @@ -599,5 +599,8 @@ def iterated_runcard_yaml(fit, update_runcard_description_yaml): closuretest_data = filtermap["closuretest"] if "filterseed" in closuretest_data: closuretest_data["filterseed"] = random.randrange(0, maxint) + + if "fiatlux" in filtermap: + filtermap['fiatlux']['luxset'] = fit.name return yaml.dump(filtermap, Dumper=yaml.RoundTripDumper) From abf98bc9d9439d65a94f5d6921c673371bab979d Mon Sep 17 00:00:00 2001 From: Andrea Barontini Date: Wed, 5 Jul 2023 11:20:06 +0200 Subject: [PATCH 4/5] Add theoryids for alpha variation but same thcovmat --- .../scalevariationtheoryids.yaml | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml index a1f7b7c681..a74805c98c 100644 --- a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml +++ b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml @@ -24,6 +24,32 @@ scale_variations_for: (2, 1): 408 (2, 2): 409 +#alpha=0.117 + - theoryid: 528 + variations: + (0.5, 0.5): 401 + (0.5, 1): 402 + (0.5, 2): 403 + (1, 0.5): 404 + (1, 1): 405 + (1, 2): 406 + (2, 0.5): 407 + (2, 1): 408 + (2, 2): 409 + +#alpha=0.119 + - theoryid: 529 + variations: + (0.5, 0.5): 401 + (0.5, 1): 402 + (0.5, 2): 403 + (1, 0.5): 404 + (1, 1): 405 + (1, 2): 406 + (2, 0.5): 407 + (2, 1): 408 + (2, 2): 409 + - theoryid: 414 variations: (0.5, 0.5): 410 @@ -48,6 +74,32 @@ scale_variations_for: (2, 1): 427 (2, 2): 428 +#alpha=0.117 + - theoryid: 530 + variations: + (0.5, 0.5): 420 + (0.5, 1): 421 + (0.5, 2): 422 + (1, 0.5): 423 + (1, 1): 424 + (1, 2): 425 + (2, 0.5): 426 + (2, 1): 427 + (2, 2): 428 + +#alpha=0.119 + - theoryid: 531 + variations: + (0.5, 0.5): 420 + (0.5, 1): 421 + (0.5, 2): 422 + (1, 0.5): 423 + (1, 1): 424 + (1, 2): 425 + (2, 0.5): 426 + (2, 1): 427 + (2, 2): 428 + - theoryid: 434 variations: (0.5, 0.5): 430 From 78d83d64a2afebd2e21ac37286993f5b3727deca Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 5 Jul 2023 11:33:19 +0200 Subject: [PATCH 5/5] Add theory database with new theories --- nnpdfcpp/data/theory.db | Bin 110592 -> 110592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/nnpdfcpp/data/theory.db b/nnpdfcpp/data/theory.db index 3dd3177dd2864e72c1516b9afc0bac11798042cc..410e2ed89b005d9cabad725972b463c94a0fe35d 100644 GIT binary patch delta 404 zcmZp8z}E19ZGtqT$V3@uK@kSMa1UPoHw;Yd4;a`V@NeDhC{Vz@`2o9%1hW$Rlg;c3 zmP{P%f7rjUzX9?bl;*H1uro6;F$psXgJ~fqAuuh-BnYMjm;{0CGZ?FxK-z?0+9u!I$}`;M7>-~b2U54E#F5O4>x;0Gia10Dzj zvj-qK0t5&|2t2WIzy*T@D7OSC0sUte2X_Dn0u}%coCL)J77OqLYz7|*@d&Z8asC0f z?3)2s0RvTp4wvwo0VlU+nE@{W16G6!m++ebC%0{#0Wtvu4=Ml&myJ>ZB)1Nj0WARp z3oHRTv2iv51A;t+lhM8>mq1zp3%4wi0Y(A@4M+gQk#WETf>eYJm!O^jQkUFP0k@ZM aBmoJRs+$2q1ONa5RIzbT0k@o<0b~(H%0zDf