Skip to content

Commit

Permalink
Fix ComCam yaml and add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmeyers314
jmeyers314 committed Mar 13, 2024
1 parent 4863010 commit 9efaae3
Show file tree
Hide file tree
Showing 19 changed files with 225 additions and 139 deletions.
47 changes: 25 additions & 22 deletions batoid/data/LSST/ComCam_g.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ opticalSystem:
outer: 1.71
inner: 0.9
coordSys:
z: 6.1559766921647
z: 6.155977
-
type: Mirror
name: M3
Expand All @@ -59,19 +59,19 @@ opticalSystem:
type: CompoundOptic
name: ComCam
coordSys:
z: 4.1097066396
z: 4.109701294941687
items:
-
type: Lens
name: L1
medium: &silica
type: SellmeierMedium
B1: 0.696183020
B2: 0.407925877
B3: 0.897464057
C1: 0.00467926519
C2: 0.0135122244
C3: 97.9323636
B1: 0.696182877
B2: 0.407926020
B3: 0.897462254
C1: 0.00467926421
C2: 0.0135122230
C3: 97.9321695
items:
-
type: RefractiveInterface
Expand All @@ -81,34 +81,36 @@ opticalSystem:
R: 0.744422
obscuration:
type: ClearCircle
radius: 0.192
# radius: 0.20004
radius: 0.189
-
type: RefractiveInterface
name: L1_exit
surface:
type: Sphere
R: 4.18068
R: 4.180678
obscuration:
type: ClearCircle
radius: 0.192
radius: 0.20004
coordSys:
z: 0.032
-
type: Lens
name: L2
medium: *silica
coordSys:
z: 0.08896479090387038
z: 0.088965
items:
-
type: RefractiveInterface
name: L2_entrance
surface:
type: Sphere
R: -5.99534
R: -5.995343
obscuration:
type: ClearCircle
radius: 0.166
# radius: 0.175
radius: 0.161
-
type: RefractiveInterface
name: L2_exit
Expand All @@ -117,15 +119,16 @@ opticalSystem:
R: 0.639028
obscuration:
type: ClearCircle
radius: 0.155
# radius: 0.175
radius: 0.152
coordSys:
z: 0.009
-
type: Lens
name: Filter
medium: *silica
coordSys:
z: 0.19626409289185995
z: 0.196264
items:
-
type: RefractiveInterface
Expand All @@ -150,26 +153,26 @@ opticalSystem:
name: L3
medium: *silica
coordSys:
z: 0.27026409289185995
z: 0.270264
items:
-
type: RefractiveInterface
name: L3_entrance
surface:
type: Sphere
R: 6.10983
R: 6.109828
obscuration:
type: ClearCircle
radius: 0.108
radius: 0.108025
-
type: RefractiveInterface
name: L3_exit
surface:
type: Sphere
R: -1.52259
R: -1.522589
obscuration:
type: ClearCircle
radius: 0.108
radius: 0.108025
coordSys:
z: 0.0155
-
Expand All @@ -181,4 +184,4 @@ opticalSystem:
type: ClearCircle
radius: 0.11
coordSys:
z: 0.30770909289185965
z: 0.307709
49 changes: 26 additions & 23 deletions batoid/data/LSST/ComCam_i.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ opticalSystem:
outer: 1.71
inner: 0.9
coordSys:
z: 6.1559766921647
z: 6.155977
-
type: Mirror
name: M3
Expand All @@ -59,19 +59,19 @@ opticalSystem:
type: CompoundOptic
name: ComCam
coordSys:
z: 4.10903938251
z: 4.1090347440789
items:
-
type: Lens
name: L1
medium: &silica
type: SellmeierMedium
B1: 0.696183020
B2: 0.407925877
B3: 0.897464057
C1: 0.00467926519
C2: 0.0135122244
C3: 97.9323636
B1: 0.696182877
B2: 0.407926020
B3: 0.897462254
C1: 0.00467926421
C2: 0.0135122230
C3: 97.9321695
items:
-
type: RefractiveInterface
Expand All @@ -81,34 +81,36 @@ opticalSystem:
R: 0.744422
obscuration:
type: ClearCircle
radius: 0.192
# radius: 0.20004
radius: 0.189
-
type: RefractiveInterface
name: L1_exit
surface:
type: Sphere
R: 4.18068
R: 4.180678
obscuration:
type: ClearCircle
radius: 0.192
radius: 0.20004
coordSys:
z: 0.032
-
type: Lens
name: L2
medium: *silica
coordSys:
z: 0.08896479090387038
z: 0.088965
items:
-
type: RefractiveInterface
name: L2_entrance
surface:
type: Sphere
R: -5.99534
R: -5.995343
obscuration:
type: ClearCircle
radius: 0.166
# radius: 0.175
radius: 0.161
-
type: RefractiveInterface
name: L2_exit
Expand All @@ -117,15 +119,16 @@ opticalSystem:
R: 0.639028
obscuration:
type: ClearCircle
radius: 0.155
# radius: 0.175
radius: 0.152
coordSys:
z: 0.009
-
type: Lens
name: Filter
medium: *silica
coordSys:
z: 0.19626409289185995
z: 0.196264
items:
-
type: RefractiveInterface
Expand All @@ -144,32 +147,32 @@ opticalSystem:
type: ClearCircle
radius: 0.1325
coordSys:
z: 0.009
z: 0.007
-
type: Lens
name: L3
medium: *silica
coordSys:
z: 0.27026409289185995
z: 0.270264
items:
-
type: RefractiveInterface
name: L3_entrance
surface:
type: Sphere
R: 6.10983
R: 6.109828
obscuration:
type: ClearCircle
radius: 0.108
radius: 0.108025
-
type: RefractiveInterface
name: L3_exit
surface:
type: Sphere
R: -1.52259
R: -1.522589
obscuration:
type: ClearCircle
radius: 0.108
radius: 0.108025
coordSys:
z: 0.0155
-
Expand All @@ -181,4 +184,4 @@ opticalSystem:
type: ClearCircle
radius: 0.11
coordSys:
z: 0.30770909289185965
z: 0.307709
Loading

0 comments on commit 9efaae3

Please sign in to comment.