Fix/pulse schema

ukaea-schema/examples/equipment/camera.json

@@ -1,16 +1,10 @@
 {
-    "deviceInformation": {
-        "make": "Canon",
-        "model": "EOS R5",
-        "serialNumber": "123456789",
-        "resolution": {
-            "x": 8192,
-            "y": 5464
-        }
-    },
-    "captureSettings": {
-        "imageAcquisitionRate": 120,
-        "imageNoise": 0.85,
-        "imageScale": 0.05
+    "make": "Canon",
+    "model": "EOS R5",
+    "serialNumber": "123456789",
+    "assetId": "C-0932",
+    "resolution": {
+        "x": 8192,
+        "y": 5464
     }
 }

ukaea-schema/examples/equipment/flowmeter.json

@@ -1,12 +1,11 @@
 {
-    "deviceInformation": {
-        "make": "Nixon",
-        "model": "NT13",
-        "serialNumber": "2942701",
-        "flowRange": {
-            "minimum": 8,
-            "maximum": 80
-        },
-        "flowmeterType": "Turbine"
-    }
+    "make": "Nixon",
+    "model": "NT13",
+    "serialNumber": "2942701",
+    "assetId": "F-0989",
+    "flowRange": {
+        "minimum": 8,
+        "maximum": 80
+    },
+    "flowmeterType": "Turbine"
 }

ukaea-schema/examples/equipment/pyrometer.json

@@ -1,8 +1,8 @@
 {
-    "deviceInformation": {
         "make": "SensorTherm",
         "model": "M322",
         "serialNumber": "10319",
+        "assetId": "P-89789",
         "temperatureRange": {
             "minimum": 350,
             "maximum": 1300
@@ -11,9 +11,4 @@
             "minimum": 1.45,
             "maximum": 1.65
         }
-    },
-    "deviceSettings": {
-        "emissivity": 0.45,
-        "framerate": 5
-    }
 }

ukaea-schema/examples/hive/experiment.json

@@ -1,6 +1,4 @@
 {
-    "campaignId": "4c7e8d7-6291-4a9f-9c27-0f8339c5f0a7",
-    "campaignTitle": "",
     "experimentNumber": "07cf92f4-5e1b-4fc3-96d1-6e6e527c3b39",
     "experimentTitle": "",
     "leadInvestigator": {
@@ -18,7 +16,6 @@
     },
     "startDate": "2023-09-05T10:00:00Z",
     "endDate": "2023-09-05T16:00:00Z",
-    "heatingType": "Induction",
-    "sampleCooling": true,
+    "schemaVersion": "0.0.1",
     "description": "this is the description"
 }

ukaea-schema/examples/hive/pulse.json

@@ -1,12 +1,7 @@
 {
-    "pulseNumber": "0023",
-    "pulseStart": "2025-03-06T10:33:00.000Z",
     "sampleNumber": "0011",
-    "pulseDuration": 120,
-    "dataCaptureStart": "2025-03-04T03:00:00.000Z",
     "experimentNumber": "0098",
     "configurationId": "a64870d1-4b12-4a7b-b7d6-3010f5e0f958",
-    "pulseEnd": "2025-03-06T10:38:00.000Z",
     "operator1": {
         "firstName": "Bob",
         "lastName": "Smith",
@@ -20,16 +15,21 @@
     "comment": "This is a test comment",
     "pulseQuality": "Success",
     "heatingInformation": {
+        "heatingType": "Induction",
         "currentType": "AC",
         "inputPower": 500,
         "inputCurrent": 100,
-        "inputVoltage": 5000
+        "inputVoltage": 5000,
+        "outputCurrent": 8978
     },
     "coolantInformation": {
+        "sampleCooling": "yes",
         "coolantType": "Demineralised Water",
         "targetCoolantFlow": 19.3,
-        "targetCoolantTemperature": 22.3
+        "targetCoolantTemperature": 22.3,
+        "measuredCoolantFlow": 14.3
     },
+    "schemaVersion": "0.0.1",
     "diagnostics": [
         [
             "CA-002",

ukaea-schema/facility/hive/pulse.schema.json

@@ -118,21 +118,23 @@
                 }
             },
             "required": [
-                "sampleCooling",
-                "coolantType",
-                "targetCoolantFlow",
-                "targetCoolantTemperature",
-                "measuredCoolantFlow"
-            ]
-        },
-        "comment": {
-            "type": "string"
-        },
-        "pulseQuality": {
-            "enum": [
-                "Success",
-                "Fail"
-            ]
+                "sampleCooling"
+            ],
+            "if": {
+                "properties": {
+                    "sampleCooling": {
+                        "const": "yes"
+                    }
+                }
+            },
+            "then": {
+                "required": [
+                    "coolantType",
+                    "targetCoolantFlow",
+                    "targetCoolantTemperature",
+                    "measuredCoolantFlow"
+                ]
+            }
         },
         "experimentNumber": {
             "type": "integer"
@@ -161,8 +163,6 @@
         "operator2",
         "heatingInformation",
         "coolantInformation",
-        "comment",
-        "pulseQuality",
         "experimentNumber",
         "configurationId",
         "diagnostics",