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
18211360
Commit
18211360
authored
6 years ago
by
Gregory Ashton
Browse files
Options
Downloads
Plain Diff
Merge branch 'bug-fix-frequency-array-creation' into 'master'
minor fix to time/frequency series Closes
#353
See merge request
!428
parents
3265b9be
bae808d9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!428
minor fix to time/frequency series
Pipeline
#56843
passed
6 years ago
Stage: test
Stage: deploy
Changes
1
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bilby/core/series.py
+3
-2
3 additions, 2 deletions
bilby/core/series.py
with
3 additions
and
2 deletions
bilby/core/series.py
+
3
−
2
View file @
18211360
...
...
@@ -35,7 +35,7 @@ class CoupledTimeAndFrequencySeries(object):
-------
array_like: The frequency array
"""
if
self
.
_frequency_array_updated
is
False
:
if
not
self
.
_frequency_array_updated
:
if
self
.
sampling_frequency
and
self
.
duration
:
self
.
_frequency_array
=
utils
.
create_frequency_series
(
sampling_frequency
=
self
.
sampling_frequency
,
...
...
@@ -45,6 +45,7 @@ class CoupledTimeAndFrequencySeries(object):
'
legitimate sampling_frequency ({}) or duration ({})
'
.
format
(
self
.
sampling_frequency
,
self
.
duration
))
self
.
_frequency_array_updated
=
True
return
self
.
_frequency_array
@frequency_array.setter
...
...
@@ -63,7 +64,7 @@ class CoupledTimeAndFrequencySeries(object):
array_like: The time array
"""
if
self
.
_time_array_updated
is
False
:
if
not
self
.
_time_array_updated
:
if
self
.
sampling_frequency
and
self
.
duration
:
self
.
_time_array
=
utils
.
create_time_series
(
sampling_frequency
=
self
.
sampling_frequency
,
...
...
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