Allow low, high, value in independent variables

HEPData · Aug 5, 2021 · e9e6e4e · e9e6e4e
1 parent bec110e
commit e9e6e4e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/hepdata_validator/schemas/1.1.0/data_schema.json b/hepdata_validator/schemas/1.1.0/data_schema.json
@@ -34,6 +34,7 @@
                 {
                   "type": "object",
                   "properties": {
+                    "value": { "type": "number" },
                     "low": { "type": "number" },
                     "high": { "type": "number" }
                   },

diff --git a/testsuite/test_data/valid_file.json b/testsuite/test_data/valid_file.json
@@ -12,7 +12,12 @@
         },
         {
           "value": 8000
-        }
+        },
+        {
+          "high": 9000,
+          "low": 7000,
+          "value": 8000
+        },
       ]
     }
   ],
@@ -68,8 +73,28 @@
               "label": "sys,lumi"
             }
           ]
+        },
+        {
+          "value": 6.7,
+          "errors": [
+            {
+              "symerror": 0.5,
+              "label": "stat"
+            },
+            {
+              "asymerror": {
+                "plus": 0.24,
+                "minus": 0.34
+              },
+              "label": "sys"
+            },
+            {
+              "symerror": 0.3,
+              "label": "sys,lumi"
+            }
+          ]
         }
       ]
     }
   ]
-}
+}
diff --git a/testsuite/test_data_validator.py b/testsuite/test_data_validator.py
@@ -329,7 +329,7 @@ def test_file_with_invalid_independent_variables_v1(validator_v1, data_path, cap
 
     assert is_valid is False
     out, err = capsys.readouterr()
-    assert out.strip() == "error - {'low': 6000} is not valid under any of the given schemas in 'independent_variables[0].values[0]' (expected: {'oneOf': [{'type': 'object', 'properties': {'value': {'type': ['string', 'number']}}, 'required': ['value'], 'additionalProperties': False}, {'type': 'object', 'properties': {'low': {'type': 'number'}, 'high': {'type': 'number'}}, 'required': ['low', 'high'], 'additionalProperties': False}]})"
+    assert out.strip() == "error - {'low': 6000} is not valid under any of the given schemas in 'independent_variables[0].values[0]' (expected: {'oneOf': [{'type': 'object', 'properties': {'value': {'type': ['string', 'number']}}, 'required': ['value'], 'additionalProperties': False}, {'type': 'object', 'properties': {'value': {'type': 'number'}, 'low': {'type': 'number'}, 'high': {'type': 'number'}}, 'required': ['low', 'high'], 'additionalProperties': False}]})"
 
 
 def test_file_with_missing_dependent_values_v1(validator_v1, data_path, capsys):