Skip to content

Commit

Permalink
Regenerate schemas
Browse files Browse the repository at this point in the history
  • Loading branch information
bruno-f-cruz committed May 17, 2024
1 parent 2b77980 commit fe06e05
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 1 deletion.
13 changes: 13 additions & 0 deletions src/DataSchemas/schemas/aind_manipulator_calibration_logic.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@
}
],
"title": "Rng Seed"
},
"stage_alias": {
"default": null,
"description": "Alias name used for the task stage",
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Stage Alias"
}
},
"title": "CalibrationParameters",
Expand Down
13 changes: 13 additions & 0 deletions src/DataSchemas/schemas/load_cells_calibration_logic.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
],
"title": "Rng Seed"
},
"stage_alias": {
"default": null,
"description": "Alias name used for the task stage",
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Stage Alias"
},
"channels": {
"default": [
0,
Expand Down
13 changes: 13 additions & 0 deletions src/DataSchemas/schemas/olfactometer_calibration_logic.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
],
"title": "Rng Seed"
},
"stage_alias": {
"default": null,
"description": "Alias name used for the task stage",
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Stage Alias"
},
"channel_config": {
"additionalProperties": {
"$ref": "#/definitions/OlfactometerChannelConfig"
Expand Down
13 changes: 13 additions & 0 deletions src/DataSchemas/schemas/water_valve_calibration_logic.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
],
"title": "Rng Seed"
},
"stage_alias": {
"default": null,
"description": "Alias name used for the task stage",
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Stage Alias"
},
"valve_open_time": {
"description": "An array with the times (s) the valve is open during calibration",
"items": {
Expand Down
23 changes: 22 additions & 1 deletion src/Extensions/AindManipulatorCalibrationLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ public partial class CalibrationParameters

private double? _rngSeed;

private string _stageAlias;

public CalibrationParameters()
{
}

protected CalibrationParameters(CalibrationParameters other)
{
_rngSeed = other._rngSeed;
_stageAlias = other._stageAlias;
}

/// <summary>
Expand All @@ -44,6 +47,23 @@ public double? RngSeed
}
}

/// <summary>
/// Alias name used for the task stage
/// </summary>
[Newtonsoft.Json.JsonPropertyAttribute("stage_alias")]
[System.ComponentModel.DescriptionAttribute("Alias name used for the task stage")]
public string StageAlias
{
get
{
return _stageAlias;
}
set
{
_stageAlias = value;
}
}

public System.IObservable<CalibrationParameters> Process()
{
return System.Reactive.Linq.Observable.Defer(() => System.Reactive.Linq.Observable.Return(new CalibrationParameters(this)));
Expand All @@ -56,7 +76,8 @@ public System.IObservable<CalibrationParameters> Process<TSource>(System.IObserv

protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
{
stringBuilder.Append("rng_seed = " + _rngSeed);
stringBuilder.Append("rng_seed = " + _rngSeed + ", ");
stringBuilder.Append("stage_alias = " + _stageAlias);
return true;
}

Expand Down
21 changes: 21 additions & 0 deletions src/Extensions/LoadCellsCalibrationLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public partial class CalibrationParameters

private double? _rngSeed;

private string _stageAlias;

private System.Collections.Generic.List<int> _channels = new System.Collections.Generic.List<int>();

private int _offsetBufferSize = 200;
Expand All @@ -28,6 +30,7 @@ public CalibrationParameters()
protected CalibrationParameters(CalibrationParameters other)
{
_rngSeed = other._rngSeed;
_stageAlias = other._stageAlias;
_channels = other._channels;
_offsetBufferSize = other._offsetBufferSize;
}
Expand All @@ -50,6 +53,23 @@ public double? RngSeed
}
}

/// <summary>
/// Alias name used for the task stage
/// </summary>
[Newtonsoft.Json.JsonPropertyAttribute("stage_alias")]
[System.ComponentModel.DescriptionAttribute("Alias name used for the task stage")]
public string StageAlias
{
get
{
return _stageAlias;
}
set
{
_stageAlias = value;
}
}

/// <summary>
/// List of channels to calibrate
/// </summary>
Expand Down Expand Up @@ -98,6 +118,7 @@ public System.IObservable<CalibrationParameters> Process<TSource>(System.IObserv
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
{
stringBuilder.Append("rng_seed = " + _rngSeed + ", ");
stringBuilder.Append("stage_alias = " + _stageAlias + ", ");
stringBuilder.Append("channels = " + _channels + ", ");
stringBuilder.Append("offset_buffer_size = " + _offsetBufferSize);
return true;
Expand Down
21 changes: 21 additions & 0 deletions src/Extensions/OlfactometerCalibrationLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public partial class CalibrationParameters

private double? _rngSeed;

private string _stageAlias;

private System.Collections.Generic.IDictionary<string, OlfactometerChannelConfig> _channelConfig;

private double _fullFlowRate = 1000D;
Expand All @@ -34,6 +36,7 @@ public CalibrationParameters()
protected CalibrationParameters(CalibrationParameters other)
{
_rngSeed = other._rngSeed;
_stageAlias = other._stageAlias;
_channelConfig = other._channelConfig;
_fullFlowRate = other._fullFlowRate;
_nRepeatsPerStimulus = other._nRepeatsPerStimulus;
Expand All @@ -59,6 +62,23 @@ public double? RngSeed
}
}

/// <summary>
/// Alias name used for the task stage
/// </summary>
[Newtonsoft.Json.JsonPropertyAttribute("stage_alias")]
[System.ComponentModel.DescriptionAttribute("Alias name used for the task stage")]
public string StageAlias
{
get
{
return _stageAlias;
}
set
{
_stageAlias = value;
}
}

/// <summary>
/// Configuration of olfactometer channels
/// </summary>
Expand Down Expand Up @@ -158,6 +178,7 @@ public System.IObservable<CalibrationParameters> Process<TSource>(System.IObserv
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
{
stringBuilder.Append("rng_seed = " + _rngSeed + ", ");
stringBuilder.Append("stage_alias = " + _stageAlias + ", ");
stringBuilder.Append("channel_config = " + _channelConfig + ", ");
stringBuilder.Append("full_flow_rate = " + _fullFlowRate + ", ");
stringBuilder.Append("n_repeats_per_stimulus = " + _nRepeatsPerStimulus + ", ");
Expand Down
21 changes: 21 additions & 0 deletions src/Extensions/WaterValveCalibrationLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public partial class CalibrationParameters

private double? _rngSeed;

private string _stageAlias;

private System.Collections.Generic.List<double> _valveOpenTime = new System.Collections.Generic.List<double>();

private double _valveOpenInterval = 0.2D;
Expand All @@ -30,6 +32,7 @@ public CalibrationParameters()
protected CalibrationParameters(CalibrationParameters other)
{
_rngSeed = other._rngSeed;
_stageAlias = other._stageAlias;
_valveOpenTime = other._valveOpenTime;
_valveOpenInterval = other._valveOpenInterval;
_repeatCount = other._repeatCount;
Expand All @@ -53,6 +56,23 @@ public double? RngSeed
}
}

/// <summary>
/// Alias name used for the task stage
/// </summary>
[Newtonsoft.Json.JsonPropertyAttribute("stage_alias")]
[System.ComponentModel.DescriptionAttribute("Alias name used for the task stage")]
public string StageAlias
{
get
{
return _stageAlias;
}
set
{
_stageAlias = value;
}
}

/// <summary>
/// An array with the times (s) the valve is open during calibration
/// </summary>
Expand Down Expand Up @@ -118,6 +138,7 @@ public System.IObservable<CalibrationParameters> Process<TSource>(System.IObserv
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
{
stringBuilder.Append("rng_seed = " + _rngSeed + ", ");
stringBuilder.Append("stage_alias = " + _stageAlias + ", ");
stringBuilder.Append("valve_open_time = " + _valveOpenTime + ", ");
stringBuilder.Append("valve_open_interval = " + _valveOpenInterval + ", ");
stringBuilder.Append("repeat_count = " + _repeatCount);
Expand Down

0 comments on commit fe06e05

Please sign in to comment.