Skip to content

Commit

Permalink
Update to SCOS Actions 6.3.0 (#44)
Browse files Browse the repository at this point in the history 
* switch scos-actions branch

* Add temporary configs for metadata testing

* change example IQ/M4S action names to exclude "test"

* add rf_path to example action configs

* update calibration key names

* update to tagged scos-actions

* remove temporary action configs

these were used for testing but aren't needed

* bump version to 3.1.0
  • Loading branch information
@aromanielloNTIA
aromanielloNTIA committed Jun 22, 2023
1 parent 9666495 commit b6786b6
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 151 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ classifiers = [
dependencies = [
"environs>=9.5.0",
"tekrsa-api-wrap>=1.3.2",
"scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.4",
"scos_actions @ git+https://github.com/NTIA/scos-actions@6.3.0",
]

[project.optional-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/scos_tekrsa/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.0.6"
__version__ = "3.1.0"
206 changes: 86 additions & 120 deletions src/scos_tekrsa/configs/sensor_calibration_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@
"preamp_enable",
"attenuation"
],
"last_calibration_datetime": "2020-11-18T23:13:09.156274Z",
"last_calibration_datetime": "1970-01-01T00:00:00.000000Z",
"calibration_data": {
"14000000.0":{
"3545000000": {
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -29,13 +27,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -45,13 +41,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -61,13 +55,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -77,13 +69,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -93,13 +83,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -109,13 +97,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -125,13 +111,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -141,13 +125,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -157,13 +139,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -173,13 +153,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -189,13 +167,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -205,13 +181,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -221,13 +195,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -237,13 +209,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -253,13 +223,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand All @@ -269,13 +237,11 @@
"-25":{
"true": {
"0": {
"noise_figure_sensor": 5.0,
"enbw_sensor": 15723428.858731967,
"gain_sensor": 30.0,
"gain_preselector": 0,
"noise_figure_preselector": 0,
"1db_compression_sensor": -12.0,
"datetime": "2020-11-18T23:13:09.156274Z",
"datetime": "1970-01-01T00:00:00.000000Z",
"gain": 30.0,
"noise_figure": 5.0,
"1db_compression_point": -12.0,
"enbw": 15723428.858731967,
"temperature": 20.0
}
}
Expand Down
Loading

0 comments on commit b6786b6

Please sign in to comment.