Skip to content

Commit fa02361

Browse files
github-actions[bot]github-actions[bot]
committed
bump schema version [skip actions]
1 parent 7e9d863 commit fa02361

8 files changed

Lines changed: 303 additions & 42 deletions

File tree

‎schemas/acquisition_schema.json‎

Lines changed: 97 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,19 @@
697697
],
698698
"title": "Output unit"
699699
},
700+
"fit": {
701+
"anyOf": [
702+
{
703+
"$ref": "#/$defs/CalibrationFit"
704+
},
705+
{
706+
"type": "null"
707+
}
708+
],
709+
"default": null,
710+
"description": "Fit equation for the calibration data used during data acquisition",
711+
"title": "Fit"
712+
},
700713
"notes": {
701714
"anyOf": [
702715
{
@@ -707,7 +720,6 @@
707720
}
708721
],
709722
"default": null,
710-
"description": "Fit equation, etc",
711723
"title": "Notes"
712724
}
713725
},
@@ -723,6 +735,40 @@
723735
"title": "Calibration",
724736
"type": "object"
725737
},
738+
"CalibrationFit": {
739+
"additionalProperties": false,
740+
"description": "Fit equation for calibration data",
741+
"properties": {
742+
"object_type": {
743+
"const": "Calibration fit",
744+
"default": "Calibration fit",
745+
"title": "Object Type",
746+
"type": "string"
747+
},
748+
"fit_type": {
749+
"$ref": "#/$defs/FitType",
750+
"title": "Fit type"
751+
},
752+
"fit_parameters": {
753+
"anyOf": [
754+
{
755+
"$ref": "#/$defs/GenericModel"
756+
},
757+
{
758+
"type": "null"
759+
}
760+
],
761+
"default": null,
762+
"description": "Parameters of the fit equation, e.g. slope and intercept for linear fit",
763+
"title": "Fit parameters"
764+
}
765+
},
766+
"required": [
767+
"fit_type"
768+
],
769+
"title": "CalibrationFit",
770+
"type": "object"
771+
},
726772
"Channel": {
727773
"additionalProperties": false,
728774
"description": "Configuration of a channel",
@@ -1755,6 +1801,16 @@
17551801
"title": "FiberAssemblyConfig",
17561802
"type": "object"
17571803
},
1804+
"FitType": {
1805+
"description": "Type of fit for calibration data",
1806+
"enum": [
1807+
"linear_interpolation",
1808+
"linear",
1809+
"other"
1810+
],
1811+
"title": "FitType",
1812+
"type": "string"
1813+
},
17581814
"FrequencyUnit": {
17591815
"description": "Enumeration of Frequency Measurements",
17601816
"enum": [
@@ -3178,7 +3234,7 @@
31783234
},
31793235
"PowerCalibration": {
31803236
"additionalProperties": false,
3181-
"description": "Calibration of a laser device",
3237+
"description": "Calibration of a device that outputs power based on input strength",
31823238
"properties": {
31833239
"object_type": {
31843240
"const": "Power calibration",
@@ -3203,15 +3259,22 @@
32033259
"type": "string"
32043260
},
32053261
"input": {
3206-
"description": "Power or percentage input strength",
3262+
"description": "Power, voltage, or percentage input strength",
32073263
"items": {
32083264
"type": "number"
32093265
},
32103266
"title": "Input",
32113267
"type": "array"
32123268
},
32133269
"input_unit": {
3214-
"$ref": "#/$defs/PowerUnit",
3270+
"anyOf": [
3271+
{
3272+
"$ref": "#/$defs/PowerUnit"
3273+
},
3274+
{
3275+
"$ref": "#/$defs/VoltageUnit"
3276+
}
3277+
],
32153278
"title": "Input unit"
32163279
},
32173280
"repeats": {
@@ -3239,6 +3302,19 @@
32393302
"$ref": "#/$defs/PowerUnit",
32403303
"title": "Output unit"
32413304
},
3305+
"fit": {
3306+
"anyOf": [
3307+
{
3308+
"$ref": "#/$defs/CalibrationFit"
3309+
},
3310+
{
3311+
"type": "null"
3312+
}
3313+
],
3314+
"default": null,
3315+
"description": "Fit equation for the calibration data used during data acquisition",
3316+
"title": "Fit"
3317+
},
32423318
"notes": {
32433319
"anyOf": [
32443320
{
@@ -3249,7 +3325,6 @@
32493325
}
32503326
],
32513327
"default": null,
3252-
"description": "Fit equation, etc",
32533328
"title": "Notes"
32543329
}
32553330
},
@@ -4674,7 +4749,7 @@
46744749
},
46754750
"VolumeCalibration": {
46764751
"additionalProperties": false,
4677-
"description": "Calibration of a liquid delivery device",
4752+
"description": "Calibration of a liquid delivery device based on solenoid/valve opening times",
46784753
"properties": {
46794754
"object_type": {
46804755
"const": "Volume calibration",
@@ -4699,7 +4774,7 @@
46994774
"type": "string"
47004775
},
47014776
"input": {
4702-
"description": "Length of time solenoid is open",
4777+
"description": "Length of time solenoid/valve is open",
47034778
"items": {
47044779
"type": "number"
47054780
},
@@ -4735,6 +4810,19 @@
47354810
"$ref": "#/$defs/VolumeUnit",
47364811
"title": "Output unit"
47374812
},
4813+
"fit": {
4814+
"anyOf": [
4815+
{
4816+
"$ref": "#/$defs/CalibrationFit"
4817+
},
4818+
{
4819+
"type": "null"
4820+
}
4821+
],
4822+
"default": null,
4823+
"description": "Fit equation for the calibration data used during data acquisition",
4824+
"title": "Fit"
4825+
},
47384826
"notes": {
47394827
"anyOf": [
47404828
{
@@ -4745,7 +4833,6 @@
47454833
}
47464834
],
47474835
"default": null,
4748-
"description": "Fit equation, etc",
47494836
"title": "Notes"
47504837
}
47514838
},
@@ -10573,8 +10660,8 @@
1057310660
"type": "string"
1057410661
},
1057510662
"schema_version": {
10576-
"const": "2.0.33",
10577-
"default": "2.0.33",
10663+
"const": "2.0.34",
10664+
"default": "2.0.34",
1057810665
"title": "Schema Version",
1057910666
"type": "string"
1058010667
},

0 commit comments

Comments
 (0)