Merge pull request #1250 from NNPDF/nuclear_corrs

Nuclear corrections
NNPDF · May 27, 2021 · 2dac5d4 · 2dac5d4
2 parents eeaee15 + 528ae4e
commit 2dac5d4
Show file tree

Hide file tree

Showing 46 changed files with 3,558 additions and 3,578 deletions.
diff --git a/buildmaster/rawdata/BCDMSD/nuclear_ite/nuclear.yaml b/buildmaster/rawdata/BCDMSD/nuclear_ite/nuclear.yaml
@@ -2,15 +2,14 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: NNPDF31_nnlo_as_0118_deuteron_only_ite
-pdf: NNPDF31_nnlo_as_0118_deuteron_only_ite
+pdf: 210525-ern-002
 
 dataset_inputs:
          - dataset: BCDMSD
 
 actions_:
-   - group_result_table
+   - group_result_table
diff --git a/buildmaster/rawdata/BCDMSD/nuclear_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/BCDMSD/nuclear_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/BCDMSD/proton_ite/proton.yaml b/buildmaster/rawdata/BCDMSD/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/CHORUSNBPb/nuclear/nuclear.yaml b/buildmaster/rawdata/CHORUSNBPb/nuclear/nuclear.yaml
@@ -2,11 +2,10 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A208_Z82 
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/CHORUSNBPb/proton_ite/proton.yaml b/buildmaster/rawdata/CHORUSNBPb/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/CHORUSNUPb/nuclear/nuclear.yaml b/buildmaster/rawdata/CHORUSNUPb/nuclear/nuclear.yaml
@@ -2,11 +2,10 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A208_Z82 
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/CHORUSNUPb/proton_ite/proton.yaml b/buildmaster/rawdata/CHORUSNUPb/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/DYE605/nuclear/nuclear.yaml b/buildmaster/rawdata/DYE605/nuclear/nuclear.yaml
@@ -2,15 +2,14 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A64_Z32
 
 dataset_inputs:
-         - dataset: DYE605
+         - { dataset: DYE605, cfac: [QCD] }
 
 actions_:
    - group_result_table
diff --git a/buildmaster/rawdata/DYE605/nuclear/output/tables/group_result_table.csv b/buildmaster/rawdata/DYE605/nuclear/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/DYE605/proton_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/DYE605/proton_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/DYE605/proton_ite/proton.yaml b/buildmaster/rawdata/DYE605/proton_ite/proton.yaml
@@ -6,11 +6,10 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:
-         - dataset: DYE605
+         - { dataset: DYE605, cfac: [QCD] }
 
 actions_:
    - group_result_table
diff --git a/buildmaster/rawdata/DYE886R/nuclear_ite/nuclear.yaml b/buildmaster/rawdata/DYE886R/nuclear_ite/nuclear.yaml
@@ -2,15 +2,14 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: NNPDF31_nnlo_as_0118_deuteron_only_ite
-pdf: NNPDF31_nnlo_as_0118_deuteron_only_ite
+pdf: 210525-ern-002
 
 dataset_inputs:
-         - { dataset: DYE886_D, cfac: [DEU1] }
+         - { dataset: DYE886_D, cfac: [QCD,DEU1] }
 
 actions_:
    - group_result_table
diff --git a/buildmaster/rawdata/DYE886R/nuclear_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/DYE886R/nuclear_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/DYE886R/proton_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/DYE886R/proton_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/DYE886R/proton_ite/proton.yaml b/buildmaster/rawdata/DYE886R/proton_ite/proton.yaml
@@ -6,11 +6,10 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:
-         - dataset: DYE886R
+         - { dataset: DYE886R, cfac: [QCD] }
 
 actions_:
    - group_result_table

diff --git a/buildmaster/rawdata/EMCF2C/nuclear/nuclear.yaml b/buildmaster/rawdata/EMCF2C/nuclear/nuclear.yaml
@@ -2,11 +2,10 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A56_Z26
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/EMCF2C/proton_ite/proton.yaml b/buildmaster/rawdata/EMCF2C/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/NMCPD/nuclear_ite/nuclear.yaml b/buildmaster/rawdata/NMCPD/nuclear_ite/nuclear.yaml
@@ -2,12 +2,11 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: NNPDF31_nnlo_as_0118_deuteron_only_ite
-pdf: NNPDF31_nnlo_as_0118_deuteron_only_ite
+pdf: 210525-ern-002
 
 dataset_inputs:
          - { dataset: NMCPD_D, cfac: [DEU1] }

diff --git a/buildmaster/rawdata/NMCPD/nuclear_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/NMCPD/nuclear_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/NMCPD/proton_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/NMCPD/proton_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/NMCPD/proton_ite/proton.yaml b/buildmaster/rawdata/NMCPD/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/NTVNBDMNFe/nuclear/nuclear.yaml b/buildmaster/rawdata/NTVNBDMNFe/nuclear/nuclear.yaml
@@ -2,11 +2,10 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A56_Z26
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/NTVNBDMNFe/proton_ite/proton.yaml b/buildmaster/rawdata/NTVNBDMNFe/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/NTVNUDMNFe/nuclear/nuclear.yaml b/buildmaster/rawdata/NTVNUDMNFe/nuclear/nuclear.yaml
@@ -2,11 +2,10 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: 201130-jcm-001
 pdf: nNNPDF20_nlo_as_0118_p_A56_Z26
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/NTVNUDMNFe/proton_ite/proton.yaml b/buildmaster/rawdata/NTVNUDMNFe/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs:

diff --git a/buildmaster/rawdata/SLACD/nuclear_ite/nuclear.yaml b/buildmaster/rawdata/SLACD/nuclear_ite/nuclear.yaml
@@ -2,12 +2,11 @@ meta:
    author: Rosalyn Pearson
    title: Theoretical predictions
 
-theoryid: 53
+theoryid: 200
 
 use_cuts: nocuts
 
-fit: NNPDF31_nnlo_as_0118_deuteron_only_ite
-pdf: NNPDF31_nnlo_as_0118_deuteron_only_ite
+pdf: 210525-ern-002
 
 dataset_inputs:
          - dataset: SLACD

diff --git a/buildmaster/rawdata/SLACD/nuclear_ite/output/tables/group_result_table.csv b/buildmaster/rawdata/SLACD/nuclear_ite/output/tables/group_result_table.csv
diff --git a/buildmaster/rawdata/SLACD/proton_ite/proton.yaml b/buildmaster/rawdata/SLACD/proton_ite/proton.yaml
@@ -6,7 +6,6 @@ theoryid: 200
 
 use_cuts: nocuts
 
-fit: 210219-01-rs-nnpdf40-baseline
 pdf: 210219-01-rs-nnpdf40-baseline
 
 dataset_inputs: