Skip to content

Commit 0c930f5

Browse files
eslavichWilliamJamieson
eslavich
authored and
WilliamJamieson
committed
Merge pull request #40 from WilliamJamieson/feature/trig-schemas
Add schemas for new trig models
1 parent 229c300 commit 0c930f5

File tree

7 files changed

+221
-0
lines changed

7 files changed

+221
-0
lines changed

‎CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- Add inputs and outputs to base transform schema to properly document them. [#33]
44
- Add spline1d schema. [#41]
5+
- Add cosine, tangent, arcsine, arccosine, and arctangent schemas. [#40]
56

67
0.2.0 (2021-12-13)
78

‎resources/asdf-format.org/manifests/transform-1.5.0.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,31 @@ tags:
680680
title: One dimensional sine model.
681681
description: |-
682682
One dimensional sine.
683+
- tag_uri: tag:stsci.edu:asdf/transform/cosine1d-1.0.0
684+
schema_uri: http://stsci.edu/schemas/asdf/transform/cosine1d-1.0.0
685+
title: One dimensional cosine model.
686+
description: |-
687+
One dimensional cosine.
688+
- tag_uri: tag:stsci.edu:asdf/transform/tangent1d-1.0.0
689+
schema_uri: http://stsci.edu/schemas/asdf/transform/tangent1d-1.0.0
690+
title: One dimensional tangent model.
691+
description: |-
692+
One dimensional tangent.
693+
- tag_uri: tag:stsci.edu:asdf/transform/arcsine1d-1.0.0
694+
schema_uri: http://stsci.edu/schemas/asdf/transform/arcsine1d-1.0.0
695+
title: One dimensional arcsine model.
696+
description: |-
697+
One dimensional arcsine.
698+
- tag_uri: tag:stsci.edu:asdf/transform/arccosine1d-1.0.0
699+
schema_uri: http://stsci.edu/schemas/asdf/transform/arccosine1d-1.0.0
700+
title: One dimensional arccosine model.
701+
description: |-
702+
One dimensional arccosine.
703+
- tag_uri: tag:stsci.edu:asdf/transform/arctangent1d-1.0.0
704+
schema_uri: http://stsci.edu/schemas/asdf/transform/arctangent1d-1.0.0
705+
title: One dimensional arctangent model.
706+
description: |-
707+
One dimensional arctangent.
683708
- tag_uri: tag:stsci.edu:asdf/transform/slant_orthographic-1.2.0
684709
schema_uri: http://stsci.edu/schemas/asdf/transform/slant_orthographic-1.2.0
685710
title: The slant orthographic projection.

‎resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
---
3+
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
4+
id: "http://stsci.edu/schemas/asdf/transform/arccosine1d-1.0.0"
5+
tag: "tag:stsci.edu:asdf/transform/arccosine1d-1.0.0"
6+
title: >
7+
One dimensional arccosine model.
8+
9+
description: >
10+
One dimensional arccosine.
11+
12+
examples:
13+
-
14+
- $$f(x)=((arccos(x/10.0) / 2\pi) - 1.0) / 0.5$$
15+
- |
16+
!transform/arccosine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0}
17+
18+
allOf:
19+
- $ref: "transform-1.2.0"
20+
- type: object
21+
properties:
22+
amplitude:
23+
anyOf:
24+
- $ref: "../unit/quantity-1.1.0"
25+
- type: number
26+
description: Oscillation amplitude.
27+
frequency:
28+
anyOf:
29+
- $ref: "../unit/quantity-1.1.0"
30+
- type: number
31+
description: Oscillation frequency.
32+
phase:
33+
anyOf:
34+
- $ref: "../unit/quantity-1.1.0"
35+
- type: number
36+
description: Oscillation phase.
37+
38+
required: ['amplitude', 'frequency', 'phase']
39+
...

‎resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
---
3+
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
4+
id: "http://stsci.edu/schemas/asdf/transform/arcsine1d-1.0.0"
5+
tag: "tag:stsci.edu:asdf/transform/arcsine1d-1.0.0"
6+
title: >
7+
One dimensional arcsine model.
8+
9+
description: >
10+
One dimensional arcsine.
11+
12+
examples:
13+
-
14+
- $$f(x)=((arcsin(x/10.0) / 2\pi) - 1.0) / 0.5$$
15+
- |
16+
!transform/arcsine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0}
17+
18+
allOf:
19+
- $ref: "transform-1.2.0"
20+
- type: object
21+
properties:
22+
amplitude:
23+
anyOf:
24+
- $ref: "../unit/quantity-1.1.0"
25+
- type: number
26+
description: Oscillation amplitude.
27+
frequency:
28+
anyOf:
29+
- $ref: "../unit/quantity-1.1.0"
30+
- type: number
31+
description: Oscillation frequency.
32+
phase:
33+
anyOf:
34+
- $ref: "../unit/quantity-1.1.0"
35+
- type: number
36+
description: Oscillation phase.
37+
38+
required: ['amplitude', 'frequency', 'phase']
39+
...

‎resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
---
3+
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
4+
id: "http://stsci.edu/schemas/asdf/transform/arctangent1d-1.0.0"
5+
tag: "tag:stsci.edu:asdf/transform/arctangent1d-1.0.0"
6+
title: >
7+
One dimensional arctangent model.
8+
9+
description: >
10+
One dimensional arctangent.
11+
12+
examples:
13+
-
14+
- $$f(x)=((arctan(x/10.0) / 2\pi) - 1.0) / 0.5$$
15+
- |
16+
!transform/arctangent1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0}
17+
18+
allOf:
19+
- $ref: "transform-1.2.0"
20+
- type: object
21+
properties:
22+
amplitude:
23+
anyOf:
24+
- $ref: "../unit/quantity-1.1.0"
25+
- type: number
26+
description: Oscillation amplitude.
27+
frequency:
28+
anyOf:
29+
- $ref: "../unit/quantity-1.1.0"
30+
- type: number
31+
description: Oscillation frequency.
32+
phase:
33+
anyOf:
34+
- $ref: "../unit/quantity-1.1.0"
35+
- type: number
36+
description: Oscillation phase.
37+
38+
required: ['amplitude', 'frequency', 'phase']
39+
...

‎resources/stsci.edu/schemas/cosine1d-1.0.0.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
---
3+
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
4+
id: "http://stsci.edu/schemas/asdf/transform/cosine1d-1.0.0"
5+
tag: "tag:stsci.edu:asdf/transform/cosine1d-1.0.0"
6+
title: >
7+
One dimensional cosine model.
8+
9+
description: >
10+
One dimensional cosine.
11+
12+
examples:
13+
-
14+
- $$f(x)=10.0cos(2\pi *0.5x+2\pi*1.0)$$
15+
- |
16+
!transform/cosine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0}
17+
18+
allOf:
19+
- $ref: "transform-1.2.0"
20+
- type: object
21+
properties:
22+
amplitude:
23+
anyOf:
24+
- $ref: "../unit/quantity-1.1.0"
25+
- type: number
26+
description: Oscillation amplitude.
27+
frequency:
28+
anyOf:
29+
- $ref: "../unit/quantity-1.1.0"
30+
- type: number
31+
description: Oscillation frequency.
32+
phase:
33+
anyOf:
34+
- $ref: "../unit/quantity-1.1.0"
35+
- type: number
36+
description: Oscillation phase.
37+
38+
required: ['amplitude', 'frequency', 'phase']
39+
...

‎resources/stsci.edu/schemas/tangent1d-1.0.0.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
---
3+
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
4+
id: "http://stsci.edu/schemas/asdf/transform/tangent1d-1.0.0"
5+
tag: "tag:stsci.edu:asdf/transform/tangent1d-1.0.0"
6+
title: >
7+
One dimensional tangent model.
8+
9+
description: >
10+
One dimensional tangent.
11+
12+
examples:
13+
-
14+
- $$f(x)=10.0tan(2\pi *0.5x+2\pi*1.0)$$
15+
- |
16+
!transform/tangent1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0}
17+
18+
allOf:
19+
- $ref: "transform-1.2.0"
20+
- type: object
21+
properties:
22+
amplitude:
23+
anyOf:
24+
- $ref: "../unit/quantity-1.1.0"
25+
- type: number
26+
description: Oscillation amplitude.
27+
frequency:
28+
anyOf:
29+
- $ref: "../unit/quantity-1.1.0"
30+
- type: number
31+
description: Oscillation frequency.
32+
phase:
33+
anyOf:
34+
- $ref: "../unit/quantity-1.1.0"
35+
- type: number
36+
description: Oscillation phase.
37+
38+
required: ['amplitude', 'frequency', 'phase']
39+
...

0 commit comments

Comments
 (0)