diff --git a/data/ScaleFactors/BTagging_loose_bjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_loose_bjets_comb_CSVv2_ichep2016.json
index eb1af7a..18b22f3 100644
--- a/data/ScaleFactors/BTagging_loose_bjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_bjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.0085541494190692902)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.010088782757520676)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.0096752624958753586)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.013629432767629623)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.013655256479978561)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.019513897597789764)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.044546689838171005)", 
               "value": "0.931535+(1.40704e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_loose_bjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_loose_bjets_mujets_CSVv2_ichep2016.json
index cfd3c36..51a01d8 100644
--- a/data/ScaleFactors/BTagging_loose_bjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_bjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.0097665237262845039", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.012756481766700745", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.011882438324391842", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.017469916492700577", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.02002299576997757", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.019548686221241951", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.044757485389709473", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
diff --git a/data/ScaleFactors/BTagging_loose_bjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_loose_bjets_ttbar_cmvav2_ichep2016.json
index c4a1b90..32eb7f6 100644
--- a/data/ScaleFactors/BTagging_loose_bjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_bjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.034025698900222778)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.017240405082702637)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.013116368092596531)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.014045564457774162)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.016984345391392708)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.03540763258934021)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
diff --git a/data/ScaleFactors/BTagging_loose_cjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_loose_cjets_comb_CSVv2_ichep2016.json
index 47ad903..f732242 100644
--- a/data/ScaleFactors/BTagging_loose_cjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_cjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.01710829883813858)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.020177565515041351)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.019350524991750717)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.027258865535259247)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.027310512959957123)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.039027795195579529)", 
               "value": "0.931535+(1.40704e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.931535+((1.40704e-05*x)-0.089093379676342122)", 
               "value": "0.931535+(1.40704e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_loose_cjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_loose_cjets_mujets_CSVv2_ichep2016.json
index 7b76670..592d674 100644
--- a/data/ScaleFactors/BTagging_loose_cjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_cjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.019533047452569008", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.025512963533401489", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.023764876648783684", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.034939832985401154", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.040045991539955139", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.039097372442483902", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.956768*((1.+(0.107522*x))/(1.+(0.110892*x))))-0.089514970779418834", 
               "value": "0.956768*((1.+(0.107522*x))/(1.+(0.110892*x)))", 
diff --git a/data/ScaleFactors/BTagging_loose_cjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_loose_cjets_ttbar_cmvav2_ichep2016.json
index fb33fc6..e37948d 100644
--- a/data/ScaleFactors/BTagging_loose_cjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_cjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.068051397800445668)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.034480810165405273)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.026232736185193062)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.028091128915548325)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.033968690782785416)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.937935+((-(3.7358e-05*x))-0.07081526517868042)", 
               "value": "0.937935+(-(3.7358e-05*x))", 
diff --git a/data/ScaleFactors/BTagging_loose_lightjets_incl_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_loose_lightjets_incl_CSVv2_ichep2016.json
index f388d84..7587bb8 100644
--- a/data/ScaleFactors/BTagging_loose_lightjets_incl_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_lightjets_incl_CSVv2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(1.05636+0.000920353*x+-7.85916e-07*x*x+1.92221e-11*x*x*x)*(1-(0.0539991+-6.29073e-06*x+-3.39895e-09*x*x))", 
               "value": "1.05636+0.000920353*x+-7.85916e-07*x*x+1.92221e-11*x*x*x", 
diff --git a/data/ScaleFactors/BTagging_loose_lightjets_incl_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_loose_lightjets_incl_cmvav2_ichep2016.json
index 8bcae4e..b76a4b0 100644
--- a/data/ScaleFactors/BTagging_loose_lightjets_incl_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_loose_lightjets_incl_cmvav2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.757897+0.000932057*x+-6.36634e-07*x*x+8.45515/x)*(1-(0.04666+1.86712e-05*x+-2.20295e-08*x*x))", 
               "value": "0.757897+0.000932057*x+-6.36634e-07*x*x+8.45515/x", 
diff --git a/data/ScaleFactors/BTagging_medium_bjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_medium_bjets_comb_CSVv2_ichep2016.json
index 6e25ecc..5ea6643 100644
--- a/data/ScaleFactors/BTagging_medium_bjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_bjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.011629186570644379)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.011501740664243698)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.01121238712221384)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.016118986532092094)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.016830746084451675)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.032492130994796753)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.036446873098611832)", 
               "value": "0.901114+(1.32145e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_medium_bjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_medium_bjets_mujets_CSVv2_ichep2016.json
index 145cfb6..85b7fbf 100644
--- a/data/ScaleFactors/BTagging_medium_bjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_bjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.014778987504541874", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.01550204586237669", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.015054234303534031", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.024039825424551964", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.02960566058754921", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.033029336482286453", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.037009656429290771", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
diff --git a/data/ScaleFactors/BTagging_medium_bjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_medium_bjets_ttbar_cmvav2_ichep2016.json
index 61a913e..dfa0568 100644
--- a/data/ScaleFactors/BTagging_medium_bjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_bjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.036839894950389862)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.018426690250635147)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.013165884651243687)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.013141424395143986)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.017590207979083061)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.045318335294723511)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
diff --git a/data/ScaleFactors/BTagging_medium_cjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_medium_cjets_comb_CSVv2_ichep2016.json
index bef8211..9ea2fd8 100644
--- a/data/ScaleFactors/BTagging_medium_cjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_cjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.023258373141288757)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.023003481328487396)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.022424774244427681)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.032237973064184189)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.033661492168903351)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.064984261989593506)", 
               "value": "0.901114+(1.32145e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.901114+((1.32145e-05*x)-0.072893746197223663)", 
               "value": "0.901114+(1.32145e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_medium_cjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_medium_cjets_mujets_CSVv2_ichep2016.json
index 433d315..57d7a71 100644
--- a/data/ScaleFactors/BTagging_medium_cjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_cjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.029557975009083748", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.03100409172475338", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.030108468607068062", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.048079650849103928", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.059211321175098419", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.066058672964572906", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.628408*((1.+(0.576276*x))/(1.+(0.396304*x))))-0.074019312858581543", 
               "value": "0.628408*((1.+(0.576276*x))/(1.+(0.396304*x)))", 
diff --git a/data/ScaleFactors/BTagging_medium_cjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_medium_cjets_ttbar_cmvav2_ichep2016.json
index 0cfeacb..c78c60e 100644
--- a/data/ScaleFactors/BTagging_medium_cjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_cjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.073679789900779724)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.036853380501270294)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.026331769302487373)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.026282848790287971)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.035180415958166122)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.885562+((-(5.67668e-05*x))-0.090636670589447021)", 
               "value": "0.885562+(-(5.67668e-05*x))", 
diff --git a/data/ScaleFactors/BTagging_medium_lightjets_incl_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_medium_lightjets_incl_CSVv2_ichep2016.json
index 182ef73..434abd9 100644
--- a/data/ScaleFactors/BTagging_medium_lightjets_incl_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_lightjets_incl_CSVv2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.980777+-0.00109334*x+4.2909e-06*x*x+-2.78512e-09*x*x*x)*(1-(0.0672836+0.000102309*x+-1.01558e-07*x*x))", 
               "value": "0.980777+-0.00109334*x+4.2909e-06*x*x+-2.78512e-09*x*x*x", 
diff --git a/data/ScaleFactors/BTagging_medium_lightjets_incl_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_medium_lightjets_incl_cmvav2_ichep2016.json
index c4a93ed..ea453bd 100644
--- a/data/ScaleFactors/BTagging_medium_lightjets_incl_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_medium_lightjets_incl_cmvav2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(1.07108+-0.0015866*x+3.06322e-06*x*x+-1.7438e-09*x*x*x)*(1-(0.077087+6.83526e-05*x+-4.99923e-08*x*x))", 
               "value": "1.07108+-0.0015866*x+3.06322e-06*x*x+-1.7438e-09*x*x*x", 
diff --git a/data/ScaleFactors/BTagging_tight_bjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_tight_bjets_comb_CSVv2_ichep2016.json
index d2290be..cfd124e 100644
--- a/data/ScaleFactors/BTagging_tight_bjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_bjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.01438605971634388)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.013547157868742943)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.01491188071668148)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.019157662987709045)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.021716726943850517)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.046845909208059311)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.042299006134271622)", 
               "value": "0.857294+(3.75846e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_tight_bjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_tight_bjets_mujets_CSVv2_ichep2016.json
index 35eb3ac..607fafc 100644
--- a/data/ScaleFactors/BTagging_tight_bjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_bjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.021938160061836243", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.020387420430779457", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.027388265356421471", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.035915832966566086", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.051160342991352081", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.047210521996021271", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.044128604233264923", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
diff --git a/data/ScaleFactors/BTagging_tight_bjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_tight_bjets_ttbar_cmvav2_ichep2016.json
index 9981fe1..156f7b8 100644
--- a/data/ScaleFactors/BTagging_tight_bjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_bjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.036142464727163315)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.02133803628385067)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.015581912361085415)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.018966136500239372)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.024859944358468056)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.062531806528568268)", 
               "value": "0.806363+(0.000389927*x)", 
diff --git a/data/ScaleFactors/BTagging_tight_cjets_comb_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_tight_cjets_comb_CSVv2_ichep2016.json
index c3040c6..5489c92 100644
--- a/data/ScaleFactors/BTagging_tight_cjets_comb_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_cjets_comb_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.028772119432687759)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.027094315737485886)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.029823761433362961)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.038315325975418091)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.043433453887701035)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.093691818416118622)", 
               "value": "0.857294+(3.75846e-05*x)", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.857294+((3.75846e-05*x)-0.084598012268543243)", 
               "value": "0.857294+(3.75846e-05*x)", 
diff --git a/data/ScaleFactors/BTagging_tight_cjets_mujets_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_tight_cjets_mujets_CSVv2_ichep2016.json
index 5e0f819..00f62e1 100644
--- a/data/ScaleFactors/BTagging_tight_cjets_mujets_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_cjets_mujets_CSVv2_ichep2016.json
@@ -21,8 +21,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -42,8 +42,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.043876320123672485", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -59,8 +59,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.040774840861558914", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -76,8 +76,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.054776530712842941", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -93,8 +93,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.071831665933132172", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -110,8 +110,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.10232068598270416", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -127,8 +127,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.094421043992042542", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
@@ -144,8 +144,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x)))))-0.088257208466529846", 
               "value": "0.850182*((1.+(-(0.000611408*x)))/(1.+(-(0.000654205*x))))", 
diff --git a/data/ScaleFactors/BTagging_tight_cjets_ttbar_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_tight_cjets_ttbar_cmvav2_ichep2016.json
index dce3251..ef07819 100644
--- a/data/ScaleFactors/BTagging_tight_cjets_ttbar_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_cjets_ttbar_cmvav2_ichep2016.json
@@ -20,8 +20,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -41,8 +41,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.07228492945432663)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -58,8 +58,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.04267607256770134)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -75,8 +75,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.03116382472217083)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -92,8 +92,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.037932273000478745)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -109,8 +109,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.049719888716936111)", 
               "value": "0.806363+(0.000389927*x)", 
@@ -126,8 +126,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "0.806363+((0.000389927*x)-0.12506361305713665)", 
               "value": "0.806363+(0.000389927*x)", 
diff --git a/data/ScaleFactors/BTagging_tight_lightjets_incl_CSVv2_ichep2016.json b/data/ScaleFactors/BTagging_tight_lightjets_incl_CSVv2_ichep2016.json
index 6082720..b46b606 100644
--- a/data/ScaleFactors/BTagging_tight_lightjets_incl_CSVv2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_lightjets_incl_CSVv2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.688619+260.84/(x*x))*(1-(0.144982+0.000116685*x+-1.0021e-07*x*x))", 
               "value": "0.688619+260.84/(x*x)", 
diff --git a/data/ScaleFactors/BTagging_tight_lightjets_incl_cmvav2_ichep2016.json b/data/ScaleFactors/BTagging_tight_lightjets_incl_cmvav2_ichep2016.json
index 07a5ed7..ef58799 100644
--- a/data/ScaleFactors/BTagging_tight_lightjets_incl_cmvav2_ichep2016.json
+++ b/data/ScaleFactors/BTagging_tight_lightjets_incl_cmvav2_ichep2016.json
@@ -15,8 +15,8 @@
       2.4
     ], 
     "z": [
-      0.0, 
-      1.0
+      -100, 
+      100
     ]
   }, 
   "variable": "y", 
@@ -36,8 +36,8 @@
           "values": [
             {
               "bin": [
-                0.0, 
-                1.0
+                -100, 
+                100
               ], 
               "error_low": "(0.712074+293.026/(x*x))*(1-(0.145849+8.95114e-05*x+-9.63642e-08*x*x))", 
               "value": "0.712074+293.026/(x*x)", 
diff --git a/interface/BinnedValues.h b/interface/BinnedValues.h
index ec9ebd1..e444509 100644
--- a/interface/BinnedValues.h
+++ b/interface/BinnedValues.h
@@ -229,6 +229,10 @@ class BinnedValues {
 
             std::vector<std::shared_ptr<TFormula>> formulas = get<std::shared_ptr<TFormula>>(*formula.get(), variables, outOfRange);
             std::vector<float> values;
+
+            // Ensure variables are not outside the validity range
+            variables = formula->clamp(variables);
+
             for (auto& formula: formulas) {
                 values.push_back(formula->Eval(variables[formula_variable_index]));
             }
diff --git a/interface/Histogram.h b/interface/Histogram.h
index 64c7cd1..e1f8f36 100644
--- a/interface/Histogram.h
+++ b/interface/Histogram.h
@@ -10,6 +10,7 @@ class Histogram {
         virtual std::size_t findBin(const std::vector<_Bin>& values) = 0;
         virtual std::size_t findClosestBin(const std::vector<_Bin>& values, bool* outOfRange = nullptr) = 0;
         virtual bool inRange(const std::vector<_Bin>& values) = 0;
+        virtual std::vector<_Bin> clamp(const std::vector<_Bin>& values) = 0;
 
         T getBinContent(std::size_t bin) {
             return m_values[bin - 1];
@@ -85,6 +86,19 @@ class Histogram {
             return ((value >= min) && (value < max));
         }
 
+        static _Bin clamp(const std::vector<_Bin>& array, _Bin value) {
+            _Bin min = array.front();
+            _Bin max = array.back();
+
+            if (value < min)
+                return min;
+
+            if (value > max)
+                return max;
+
+            return value;
+        }
+
         std::size_t m_size;
         std::unique_ptr<T[]> m_values;
         std::unique_ptr<T[]> m_errors_low;
@@ -130,6 +144,15 @@ class OneDimensionHistogram: public Histogram<T, _Bin> {
             return Histogram<T, _Bin>::inRange(m_bins, value);
         }
 
+        virtual std::vector<_Bin> clamp(const std::vector<_Bin>& values) override {
+            if (values.size() != 1) {
+                return values;
+            }
+
+            _Bin value = values.front();
+            return {Histogram<T, _Bin>::clamp(m_bins, value)};
+        }
+
     private:
         std::vector<_Bin> m_bins;
 };
@@ -203,6 +226,17 @@ class TwoDimensionsHistogram: public Histogram<T, _Bin> {
             return Histogram<T, _Bin>::inRange(m_bins_x, value_x) && Histogram<T, _Bin>::inRange(m_bins_y, value_y);
         }
 
+        virtual std::vector<_Bin> clamp(const std::vector<_Bin>& values) override {
+            if (values.size() != 2) {
+                return values;
+            }
+
+            _Bin value_x = values.front();
+            _Bin value_y = values[1];
+
+            return {Histogram<T, _Bin>::clamp(m_bins_x, value_x), Histogram<T, _Bin>::clamp(m_bins_y, value_y)};
+        }
+
     private:
         std::vector<_Bin> m_bins_x;
         std::vector<_Bin> m_bins_y;
@@ -289,6 +323,18 @@ class ThreeDimensionsHistogram: public Histogram<T, _Bin> {
             return Histogram<T, _Bin>::inRange(m_bins_x, value_x) && Histogram<T, _Bin>::inRange(m_bins_y, value_y) && Histogram<T, _Bin>::inRange(m_bins_z, value_z);
         }
 
+        virtual std::vector<_Bin> clamp(const std::vector<_Bin>& values) override {
+            if (values.size() != 3) {
+                return values;
+            }
+
+            _Bin value_x = values[0];
+            _Bin value_y = values[1];
+            _Bin value_z = values[2];
+
+            return {Histogram<T, _Bin>::clamp(m_bins_x, value_x), Histogram<T, _Bin>::clamp(m_bins_y, value_y), Histogram<T, _Bin>::clamp(m_bins_z, value_z)};
+        }
+
     private:
         std::vector<_Bin> m_bins_x;
         std::vector<_Bin> m_bins_y;
diff --git a/scripts/extractBTaggingScaleFactors.py b/scripts/extractBTaggingScaleFactors.py
index 77be2b0..e9596fa 100755
--- a/scripts/extractBTaggingScaleFactors.py
+++ b/scripts/extractBTaggingScaleFactors.py
@@ -81,7 +81,9 @@ def get_token(operating_point, measurement_type, jet_flavor):
 
         eta_bin = [float(row[4]), float(row[5])]
         pt_bin = [float(row[6]), float(row[7])]
-        discr_bin = [float(row[8]), float(row[9])]
+        # discr_bin = [float(row[8]), float(row[9])]
+        # Hardcode the range: it's not correct inside the CSV file
+        discr_bin = [-100, 100]
         formula = row[10].strip()
 
         def get_bin(bin, data, syst_type):
diff --git a/test/unit_tests_data_ref.root b/test/unit_tests_data_ref.root
index f34d1d6..fdd8abd 100644
Binary files a/test/unit_tests_data_ref.root and b/test/unit_tests_data_ref.root differ
diff --git a/test/unit_tests_mc_ref.root b/test/unit_tests_mc_ref.root
index 359352b..576f79f 100644
Binary files a/test/unit_tests_mc_ref.root and b/test/unit_tests_mc_ref.root differ
diff --git a/test/unit_tests_mc_with_db_ref.root b/test/unit_tests_mc_with_db_ref.root
index 22a543e..144b885 100644
Binary files a/test/unit_tests_mc_with_db_ref.root and b/test/unit_tests_mc_with_db_ref.root differ