data: improve and add NNLLfast 13TeV grids

misho104 · Mar 10, 2019 · a75557b · a75557b
1 parent 18cea33
commit a75557b
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 160 deletions.
diff --git a/susy_cross_section/config.py b/susy_cross_section/config.py
@@ -40,6 +40,8 @@
     "8TeV.sb10": "nllfast/8TeV/sb_nllnlo_mstw2008.grid",
     "8TeV.ss10": "nllfast/8TeV/ss_nllnlo_mstw2008.grid",
     "13TeV.sb10.decoup": "nnllfast/13TeV/sdcpl_nnlonnll_pdf4lhc15_13TeV_wpresc.grid",
+    "13TeV.sb10": "nnllfast/13TeV/sb_nnlonnll_pdf4lhc15_13TeV_wpresc.grid",
+    "13TeV.ss10": "nnllfast/13TeV/ss_nnlonnll_pdf4lhc15_13TeV_wpresc.grid",
     # stop
     "7TeV.st": "nllfast/7TeV/st_nllnlo_mstw2008.grid",
     "8TeV.st": "nllfast/8TeV/st_nllnlo_mstw2008.grid",

diff --git a/susy_cross_section/data/nnllfast/13TeV/gdcpl_nnlonnll_pdf4lhc15_13TeV_wpresc.info b/susy_cross_section/data/nnllfast/13TeV/gdcpl_nnlonnll_pdf4lhc15_13TeV_wpresc.info
@@ -16,15 +16,15 @@
     { "name": "ms_dummy", "unit": "" },
     { "name": "mgl", "unit": "GeV" },
     { "name": "xsec_lo", "unit": "pb" },
-    { "name": "unc+_scale_lo", "unit": "pb" },
-    { "name": "unc-_scale_lo", "unit": "pb" },
+    { "name": "unc_mu1_lo", "unit": "pb" },
+    { "name": "unc_mu2_lo", "unit": "pb" },
     { "name": "xsec_nlo", "unit": "pb" },
-    { "name": "unc+_scale_nlo", "unit": "pb" },
-    { "name": "unc-_scale_nlo", "unit": "pb" },
+    { "name": "unc_mu1_nlo", "unit": "pb" },
+    { "name": "unc_mu2_nlo", "unit": "pb" },
     { "name": "unc_pdf_alphas_nlo", "unit": "%" },
     { "name": "xsec", "unit": "pb" },
-    { "name": "unc-_scale_nnll", "unit": "pb" },
-    { "name": "unc+_scale_nnll", "unit": "pb" },
+    { "name": "unc_mu1_nnll", "unit": "pb" },
+    { "name": "unc_mu2_nnll", "unit": "pb" },
     { "name": "unc_pdf_alphas_nnll", "unit": "%" }
   ],
   "reader_options": {
@@ -35,36 +35,27 @@
   "values": [
     {
       "column": "xsec_lo",
-      "unc+": [
-        { "column": "unc+_scale_lo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_lo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_lo", "unc_mu2_lo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "LO", "pdf_name": "(unknown)" }
     },
     {
       "column": "xsec_nlo",
-      "unc+": [
-        { "column": "unc+_scale_nlo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nlo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_nlo", "unc_mu2_nlo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "NLO", "pdf_name": "PDF4LHC15_nlo_mc" }
     },
     {
       "column": "xsec",
-      "unc+": [
-        { "column": "unc+_scale_nnll", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nnll", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nnll", "type": "absolute" },
+      "unc": [
+        {
+          "column": ["unc_mu1_nnll", "unc_mu2_nnll"],
+          "type": "absolute,signed"
+        },
         { "column": "unc_pdf_alphas_nnll", "type": "relative" }
       ],
       "attributes": {

diff --git a/susy_cross_section/data/nnllfast/13TeV/gg_nnlonnll_pdf4lhc15_13TeV_wpresc.info b/susy_cross_section/data/nnllfast/13TeV/gg_nnlonnll_pdf4lhc15_13TeV_wpresc.info
@@ -16,15 +16,15 @@
     { "name": "ms", "unit": "GeV" },
     { "name": "mgl", "unit": "GeV" },
     { "name": "xsec_lo", "unit": "pb" },
-    { "name": "unc+_scale_lo", "unit": "pb" },
-    { "name": "unc-_scale_lo", "unit": "pb" },
+    { "name": "unc_mu1_lo", "unit": "pb" },
+    { "name": "unc_mu2_lo", "unit": "pb" },
     { "name": "xsec_nlo", "unit": "pb" },
-    { "name": "unc+_scale_nlo", "unit": "pb" },
-    { "name": "unc-_scale_nlo", "unit": "pb" },
+    { "name": "unc_mu1_nlo", "unit": "pb" },
+    { "name": "unc_mu2_nlo", "unit": "pb" },
     { "name": "unc_pdf_alphas_nlo", "unit": "%" },
     { "name": "xsec", "unit": "pb" },
-    { "name": "unc-_scale_nnll", "unit": "pb" },
-    { "name": "unc+_scale_nnll", "unit": "pb" },
+    { "name": "unc_mu1_nnll", "unit": "pb" },
+    { "name": "unc_mu2_nnll", "unit": "pb" },
     { "name": "unc_pdf_alphas_nnll", "unit": "%" }
   ],
   "reader_options": {
@@ -38,36 +38,27 @@
   "values": [
     {
       "column": "xsec_lo",
-      "unc+": [
-        { "column": "unc+_scale_lo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_lo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_lo", "unc_mu2_lo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "LO", "pdf_name": "(unknown)" }
     },
     {
       "column": "xsec_nlo",
-      "unc+": [
-        { "column": "unc+_scale_nlo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nlo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_nlo", "unc_mu2_nlo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "NLO", "pdf_name": "PDF4LHC15_nlo_mc" }
     },
     {
       "column": "xsec",
-      "unc+": [
-        { "column": "unc+_scale_nnll", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nnll", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nnll", "type": "absolute" },
+      "unc": [
+        {
+          "column": ["unc_mu1_nnll", "unc_mu2_nnll"],
+          "type": "absolute,signed"
+        },
         { "column": "unc_pdf_alphas_nnll", "type": "relative" }
       ],
       "attributes": {

diff --git a/...nlonnll_pdf4lhc15_13TeV_wpresc.info.draft → ...V/sb_nnlonnll_pdf4lhc15_13TeV_wpresc.info b/...nlonnll_pdf4lhc15_13TeV_wpresc.info.draft → ...V/sb_nnlonnll_pdf4lhc15_13TeV_wpresc.info
@@ -20,15 +20,15 @@
     { "name": "ms", "unit": "GeV" },
     { "name": "mgl", "unit": "GeV" },
     { "name": "xsec_lo", "unit": "pb" },
-    { "name": "unc+_scale_lo", "unit": "pb" },
-    { "name": "unc-_scale_lo", "unit": "pb" },
+    { "name": "unc_mu1_lo", "unit": "pb" },
+    { "name": "unc_mu2_lo", "unit": "pb" },
     { "name": "xsec_nlo", "unit": "pb" },
-    { "name": "unc+_scale_nlo", "unit": "pb" },
-    { "name": "unc-_scale_nlo", "unit": "pb" },
+    { "name": "unc_mu1_nlo", "unit": "pb" },
+    { "name": "unc_mu2_nlo", "unit": "pb" },
     { "name": "unc_pdf_alphas_nlo", "unit": "%" },
     { "name": "xsec", "unit": "pb" },
-    { "name": "unc-_scale_nnll", "unit": "pb" },
-    { "name": "unc+_scale_nnll", "unit": "pb" },
+    { "name": "unc_mu1_nnll", "unit": "pb" },
+    { "name": "unc_mu2_nnll", "unit": "pb" },
     { "name": "unc_pdf_alphas_nnll", "unit": "%" }
   ],
   "reader_options": {
@@ -42,36 +42,27 @@
   "values": [
     {
       "column": "xsec_lo",
-      "unc+": [
-        { "column": "unc+_scale_lo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_lo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_lo", "unc_mu2_lo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "LO", "pdf_name": "(unknown)" }
     },
     {
       "column": "xsec_nlo",
-      "unc+": [
-        { "column": "unc+_scale_nlo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nlo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_nlo", "unc_mu2_nlo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "NLO", "pdf_name": "PDF4LHC15_nlo_mc" }
     },
     {
       "column": "xsec",
-      "unc+": [
-        { "column": "unc+_scale_nnll", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nnll", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nnll", "type": "absolute" },
+      "unc": [
+        {
+          "column": ["unc_mu1_nnll", "unc_mu2_nnll"],
+          "type": "absolute,signed"
+        },
         { "column": "unc_pdf_alphas_nnll", "type": "relative" }
       ],
       "attributes": {

diff --git a/susy_cross_section/data/nnllfast/13TeV/sdcpl_nnlonnll_pdf4lhc15_13TeV_wpresc.info b/susy_cross_section/data/nnllfast/13TeV/sdcpl_nnlonnll_pdf4lhc15_13TeV_wpresc.info
@@ -27,15 +27,15 @@
     { "name": "ms", "unit": "GeV" },
     { "name": "mgl_dummy", "unit": "" },
     { "name": "xsec_lo", "unit": "pb" },
-    { "name": "unc+_scale_lo", "unit": "pb" },
-    { "name": "unc-_scale_lo", "unit": "pb" },
+    { "name": "unc_mu1_lo", "unit": "pb" },
+    { "name": "unc_mu2_lo", "unit": "pb" },
     { "name": "xsec_nlo", "unit": "pb" },
-    { "name": "unc+_scale_nlo", "unit": "pb" },
-    { "name": "unc-_scale_nlo", "unit": "pb" },
+    { "name": "unc_mu1_nlo", "unit": "pb" },
+    { "name": "unc_mu2_nlo", "unit": "pb" },
     { "name": "unc_pdf_alphas_nlo", "unit": "%" },
     { "name": "xsec", "unit": "pb" },
-    { "name": "unc-_scale_nnll", "unit": "pb" },
-    { "name": "unc+_scale_nnll", "unit": "pb" },
+    { "name": "unc_mu1_nnll", "unit": "pb" },
+    { "name": "unc_mu2_nnll", "unit": "pb" },
     { "name": "unc_pdf_alphas_nnll", "unit": "%" }
   ],
   "reader_options": {
@@ -46,36 +46,27 @@
   "values": [
     {
       "column": "xsec_lo",
-      "unc+": [
-        { "column": "unc+_scale_lo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_lo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_lo", "unc_mu2_lo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "LO", "pdf_name": "(unknown)" }
     },
     {
       "column": "xsec_nlo",
-      "unc+": [
-        { "column": "unc+_scale_nlo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nlo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_nlo", "unc_mu2_nlo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "NLO", "pdf_name": "PDF4LHC15_nlo_mc" }
     },
     {
       "column": "xsec",
-      "unc+": [
-        { "column": "unc+_scale_nnll", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nnll", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nnll", "type": "absolute" },
+      "unc": [
+        {
+          "column": ["unc_mu1_nnll", "unc_mu2_nnll"],
+          "type": "absolute,signed"
+        },
         { "column": "unc_pdf_alphas_nnll", "type": "relative" }
       ],
       "attributes": {

diff --git a/susy_cross_section/data/nnllfast/13TeV/sg_nnlonnll_pdf4lhc15_13TeV_wpresc.info b/susy_cross_section/data/nnllfast/13TeV/sg_nnlonnll_pdf4lhc15_13TeV_wpresc.info
@@ -27,15 +27,15 @@
     { "name": "ms", "unit": "GeV" },
     { "name": "mgl", "unit": "GeV" },
     { "name": "xsec_lo", "unit": "pb" },
-    { "name": "unc+_scale_lo", "unit": "pb" },
-    { "name": "unc-_scale_lo", "unit": "pb" },
+    { "name": "unc_mu1_lo", "unit": "pb" },
+    { "name": "unc_mu2_lo", "unit": "pb" },
     { "name": "xsec_nlo", "unit": "pb" },
-    { "name": "unc+_scale_nlo", "unit": "pb" },
-    { "name": "unc-_scale_nlo", "unit": "pb" },
+    { "name": "unc_mu1_nlo", "unit": "pb" },
+    { "name": "unc_mu2_nlo", "unit": "pb" },
     { "name": "unc_pdf_alphas_nlo", "unit": "%" },
     { "name": "xsec", "unit": "pb" },
-    { "name": "unc-_scale_nnll", "unit": "pb" },
-    { "name": "unc+_scale_nnll", "unit": "pb" },
+    { "name": "unc_mu1_nnll", "unit": "pb" },
+    { "name": "unc_mu2_nnll", "unit": "pb" },
     { "name": "unc_pdf_alphas_nnll", "unit": "%" }
   ],
   "reader_options": {
@@ -49,36 +49,27 @@
   "values": [
     {
       "column": "xsec_lo",
-      "unc+": [
-        { "column": "unc+_scale_lo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_lo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_lo", "unc_mu2_lo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "LO", "pdf_name": "(unknown)" }
     },
     {
       "column": "xsec_nlo",
-      "unc+": [
-        { "column": "unc+_scale_nlo", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nlo", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nlo", "type": "absolute" },
+      "unc": [
+        { "column": ["unc_mu1_nlo", "unc_mu2_nlo"], "type": "absolute,signed" },
         { "column": "unc_pdf_alphas_nlo", "type": "relative" }
       ],
       "attributes": { "order": "NLO", "pdf_name": "PDF4LHC15_nlo_mc" }
     },
     {
       "column": "xsec",
-      "unc+": [
-        { "column": "unc+_scale_nnll", "type": "absolute" },
-        { "column": "unc_pdf_alphas_nnll", "type": "relative" }
-      ],
-      "unc-": [
-        { "column": "unc-_scale_nnll", "type": "absolute" },
+      "unc": [
+        {
+          "column": ["unc_mu1_nnll", "unc_mu2_nnll"],
+          "type": "absolute,signed"
+        },
         { "column": "unc_pdf_alphas_nnll", "type": "relative" }
       ],
       "attributes": {