Skip to content

Commit

Permalink
Merge pull request #2224 from NNPDF/fix_modsv_theorycards
Browse files Browse the repository at this point in the history 
add modsv key if xif not 1
  • Loading branch information
@RoyStegeman
RoyStegeman authored Nov 22, 2024
2 parents 6edf250 + 61fd17b commit b876a44
Show file tree
Hide file tree
Showing 221 changed files with 262 additions and 257 deletions.
11 changes: 11 additions & 0 deletions nnpdf_data/nnpdf_data/theory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,17 @@ def _apply_checks(self):
f"Trying to use {self.ID} with {self.Qedref} != {self.Qref}. This is not supported!"
)

if self.XIF == 1 and self.ModSV is not None:
raise TheoryCardError(
f"Theory: {self.ID}, error: XIF is {self.XIF} while ModSV is {self.ModSV}. "
"If XIF is equal to 1.0, ModSV should not be defined."
)
elif self.XIF != 1 and self.ModSV not in ["expanded", "exponentiated"]:
raise TheoryCardError(
f"Theory: {self.ID}, error: XIF is {self.XIF} while ModSV is {self.ModSV}. "
"If XIF is different from 1.0, ModSV should be either 'expanded' or 'exponentiated'."
)

if self.DAMP != 0 and "FONLL" in self.FNS:
# Check the damp powers are being used
if self.DAMPPOWERb is None:
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1010.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1010
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1011.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1011
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1012.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1012
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1013.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1013
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1014.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1014
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1015.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1015
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1016.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1016
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1017.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1017
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1018.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1018
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1019.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1019
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1020.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1020
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1021.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1021
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1022.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1022
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down Expand Up @@ -48,3 +48,4 @@ Comments: NNPDF4.0 N3LO ad variation (0, 0, 0, 0, 0, 0, 0), FHMV splitting
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
global_nx: 0
EScaleVar: 1
ModSV: expanded
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1023.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1023
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1024.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1024
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1025.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1025
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
2 changes: 1 addition & 1 deletion nnpdf_data/nnpdf_data/theory_cards/1026.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ID: 1026
PTO: 3
FNS: FONLL-E
use_fhmruvv: True
use_fhmruvv: true
DAMP: 0
IC: 1
ModEv: TRN
Expand Down
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/156.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO FC xiF=xiR=0.5
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/157.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO FC xiF=xiR=2.0
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/158.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO (FONLLA) FC xiF=xiR=0.5
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/159.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO (FONNLA) FC xiF=xiR=2.0
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/164.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, xiF=xiR=2
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/165.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m xiF=xiR=0.5
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/167.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, xiF=xiR=2
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/168.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m xiF=xiR=0.5
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/171.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, xiF=2.0, xiR=central
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/172.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, xiF=0.5, xiR=central
global_nx: 0
EScaleVar: 1
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/173.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=0.5
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/175.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=0.5
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/176.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=central
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/177.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=central
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/178.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=2.0
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/180.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=2.0
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/182.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=0.5
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/184.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=0.5
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/185.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=central
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/186.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=central
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/187.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=0.5, xiR=2.0
global_nx: 0
EScaleVar: 0
ModSV: expanded
1 change: 1 addition & 0 deletions nnpdf_data/nnpdf_data/theory_cards/189.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ MP: 0.938
Comments: NNPDF3.1 NNLO central, b thresholds 2*m, noEScaleVar, xiF=2.0, xiR=2.0
global_nx: 0
EScaleVar: 0
ModSV: expanded
3 changes: 2 additions & 1 deletion nnpdf_data/nnpdf_data/theory_cards/40001003.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ID: 40_001_003
Comments: NNPDF40 perturbative charm, NNLO QCD only, charm threshold displaced to 2xmc
Comments: NNPDF40 perturbative charm, NNLO QCD only, charm threshold displaced to
2xmc
PTO: 2
FNS: FONLL-C
DAMP: 1
Expand Down
5 changes: 2 additions & 3 deletions nnpdf_data/nnpdf_data/theory_cards/40002000.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CKM:
- 0.999152
DAMP: 0
FNS: FONLL-E
use_fhmruvv: False
use_fhmruvv: false
GF: 1.1663787e-05
HQ: POLE
IC: 1
Expand All @@ -21,7 +21,6 @@ MW: 80.398
MZ: 91.1876
MaxNfPdf: 5
ModEv: TRN
ModSV: None
NfFF: 4
PTO: 3
Q0: 1.65
Expand All @@ -44,5 +43,5 @@ mc: 1.51
mt: 172.5
nfref: 5
nf0: 4
n3lo_ad_variation: [0,0,0,0,0,0,0]
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
n3lo_cf_variation: 0
5 changes: 2 additions & 3 deletions nnpdf_data/nnpdf_data/theory_cards/40002001.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CKM:
- 0.999152
DAMP: 0
FNS: FONLL-E
use_fhmruvv: False
use_fhmruvv: false
GF: 1.1663787e-05
HQ: POLE
IC: 1
Expand All @@ -21,7 +21,6 @@ MW: 80.398
MZ: 91.1876
MaxNfPdf: 5
ModEv: TRN
ModSV: None
NfFF: 4
PTO: 3
Q0: 1.65
Expand All @@ -44,5 +43,5 @@ mc: 1.51
mt: 172.5
nfref: 5
nf0: 4
n3lo_ad_variation: [0,0,0,0,0,0,0]
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
n3lo_cf_variation: 0
5 changes: 2 additions & 3 deletions nnpdf_data/nnpdf_data/theory_cards/40002002.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CKM:
- 0.999152
DAMP: 0
FNS: FONLL-E
use_fhmruvv: False
use_fhmruvv: false
GF: 1.1663787e-05
HQ: POLE
IC: 1
Expand All @@ -21,7 +21,6 @@ MW: 80.398
MZ: 91.1876
MaxNfPdf: 5
ModEv: TRN
ModSV: None
NfFF: 4
PTO: 3
Q0: 1.65
Expand All @@ -44,5 +43,5 @@ mc: 1.51
mt: 172.5
nfref: 5
nf0: 4
n3lo_ad_variation: [0,0,0,0,0,0,0]
n3lo_ad_variation: [0, 0, 0, 0, 0, 0, 0]
n3lo_cf_variation: 0
Loading

0 comments on commit b876a44

Please sign in to comment.