Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bilby
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lscsoft
bilby
Commits
d72af34c
Commit
d72af34c
authored
5 years ago
by
Moritz
Browse files
Options
Downloads
Patches
Plain Diff
Wrote a docstring and refactored some names
parent
4f5a57ed
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!474
Refactor strain data
,
!473
Interferometer geometry refactor
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bilby/gw/detector/interferometer.py
+43
-25
43 additions, 25 deletions
bilby/gw/detector/interferometer.py
with
43 additions
and
25 deletions
bilby/gw/detector/interferometer.py
+
43
−
25
View file @
d72af34c
...
...
@@ -18,17 +18,35 @@ except ImportError:
"
not be able to use some of the prebuilt functions.
"
)
class
_GenericProperty
(
object
):
class
_GenericInterferometerProperty
(
object
):
"""
Generic descriptor class that allows handy access of properties without long
boilerplate code. The properties of Interferometer are defined as instances
of this class.
This avoids lengthy code like
```
@property
def length(self):
return self.geometry.length
@length_setter
def length(self, length)
self.geometry.length = length
in the Interferometer class
```
"""
def
__init__
(
self
,
property_name
,
instance_name
):
def
__init__
(
self
,
property_name
,
container_
instance_name
):
self
.
property_name
=
property_name
self
.
instance_name
=
instance_name
self
.
container_
instance_name
=
container_
instance_name
def
__get__
(
self
,
instance
,
owner
):
return
getattr
(
getattr
(
instance
,
self
.
instance_name
),
self
.
property_name
)
return
getattr
(
getattr
(
instance
,
self
.
container_
instance_name
),
self
.
property_name
)
def
__set__
(
self
,
instance
,
value
):
setattr
(
getattr
(
instance
,
self
.
instance_name
),
self
.
property_name
,
value
)
setattr
(
getattr
(
instance
,
self
.
container_
instance_name
),
self
.
property_name
,
value
)
class
InterferometerGeometry
(
object
):
...
...
@@ -298,26 +316,26 @@ class InterferometerGeometry(object):
class
Interferometer
(
object
):
"""
Class for the Interferometer
"""
length
=
_GenericProperty
(
'
length
'
,
'
geometry
'
)
latitude
=
_GenericProperty
(
'
latitude
'
,
'
geometry
'
)
latitude_radians
=
_GenericProperty
(
'
latitude_radians
'
,
'
geometry
'
)
longitude
=
_GenericProperty
(
'
longitude
'
,
'
geometry
'
)
longitude_radians
=
_GenericProperty
(
'
longitude_radians
'
,
'
geometry
'
)
elevation
=
_GenericProperty
(
'
elevation
'
,
'
geometry
'
)
x
=
_GenericProperty
(
'
x
'
,
'
geometry
'
)
y
=
_GenericProperty
(
'
y
'
,
'
geometry
'
)
xarm_azimuth
=
_GenericProperty
(
'
xarm_azimuth
'
,
'
geometry
'
)
yarm_azimuth
=
_GenericProperty
(
'
yarm_azimuth
'
,
'
geometry
'
)
xarm_tilt
=
_GenericProperty
(
'
xarm_tilt
'
,
'
geometry
'
)
yarm_tilt
=
_GenericProperty
(
'
yarm_tilt
'
,
'
geometry
'
)
vertex
=
_GenericProperty
(
'
vertex
'
,
'
geometry
'
)
detector_tensor
=
_GenericProperty
(
'
detector_tensor
'
,
'
geometry
'
)
frequency_array
=
_GenericProperty
(
'
frequency_array
'
,
'
strain_data
'
)
time_array
=
_GenericProperty
(
'
time_array
'
,
'
strain_data
'
)
frequency_mask
=
_GenericProperty
(
'
frequency_mask
'
,
'
strain_data
'
)
frequency_domain_strain
=
_GenericProperty
(
'
frequency_domain_strain
'
,
'
strain_data
'
)
time_domain_strain
=
_GenericProperty
(
'
time_domain_strain
'
,
'
strain_data
'
)
length
=
_Generic
Interferometer
Property
(
'
length
'
,
'
geometry
'
)
latitude
=
_Generic
Interferometer
Property
(
'
latitude
'
,
'
geometry
'
)
latitude_radians
=
_Generic
Interferometer
Property
(
'
latitude_radians
'
,
'
geometry
'
)
longitude
=
_Generic
Interferometer
Property
(
'
longitude
'
,
'
geometry
'
)
longitude_radians
=
_Generic
Interferometer
Property
(
'
longitude_radians
'
,
'
geometry
'
)
elevation
=
_Generic
Interferometer
Property
(
'
elevation
'
,
'
geometry
'
)
x
=
_Generic
Interferometer
Property
(
'
x
'
,
'
geometry
'
)
y
=
_Generic
Interferometer
Property
(
'
y
'
,
'
geometry
'
)
xarm_azimuth
=
_Generic
Interferometer
Property
(
'
xarm_azimuth
'
,
'
geometry
'
)
yarm_azimuth
=
_Generic
Interferometer
Property
(
'
yarm_azimuth
'
,
'
geometry
'
)
xarm_tilt
=
_Generic
Interferometer
Property
(
'
xarm_tilt
'
,
'
geometry
'
)
yarm_tilt
=
_Generic
Interferometer
Property
(
'
yarm_tilt
'
,
'
geometry
'
)
vertex
=
_Generic
Interferometer
Property
(
'
vertex
'
,
'
geometry
'
)
detector_tensor
=
_Generic
Interferometer
Property
(
'
detector_tensor
'
,
'
geometry
'
)
frequency_array
=
_Generic
Interferometer
Property
(
'
frequency_array
'
,
'
strain_data
'
)
time_array
=
_Generic
Interferometer
Property
(
'
time_array
'
,
'
strain_data
'
)
frequency_mask
=
_Generic
Interferometer
Property
(
'
frequency_mask
'
,
'
strain_data
'
)
frequency_domain_strain
=
_Generic
Interferometer
Property
(
'
frequency_domain_strain
'
,
'
strain_data
'
)
time_domain_strain
=
_Generic
Interferometer
Property
(
'
time_domain_strain
'
,
'
strain_data
'
)
def
__init__
(
self
,
name
,
power_spectral_density
,
minimum_frequency
,
maximum_frequency
,
length
,
latitude
,
longitude
,
elevation
,
xarm_azimuth
,
yarm_azimuth
,
xarm_tilt
=
0.
,
yarm_tilt
=
0.
,
calibration_model
=
Recalibrate
()):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment