scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-11-01 10:38:10 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #312 from jktjkt/fixes

Browse Source 
Small refactoring for itufs/utifl
This commit is contained in:
Jan Kundrát
2019-10-16 05:38:37 +00:00
committed by GitHub
parent 0ccbb2960c 029bac4b03
commit a21f3fe6ee
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnpy/core/elements.py
View File

@@ -25,7 +25,7 @@ from collections import namedtuple
from gnpy.core.node import Node from gnpy.core.node import Node
from gnpy.core.units import UNITS from gnpy.core.units import UNITS
from gnpy.core.utils import lin2db, db2lin, itufs, itufl, snr_sum from gnpy.core.utils import lin2db, db2lin, arrange_frequencies, snr_sum
from gnpy.core.science_utils import propagate_raman_fiber, _psi from gnpy.core.science_utils import propagate_raman_fiber, _psi
class Transceiver(Node): class Transceiver(Node):
@@ -615,7 +615,7 @@ class Edfa(Node):
self.channel_freq, self.nf, self.interpol_dgt and self.interpol_gain_ripple self.channel_freq, self.nf, self.interpol_dgt and self.interpol_gain_ripple
""" """
# TODO|jla: read amplifier actual frequencies from additional params in json # TODO|jla: read amplifier actual frequencies from additional params in json
amplifier_freq = itufl(len(self.params.dgt), self.params.f_min, self.params.f_max) # Hz amplifier_freq = arrange_frequencies(len(self.params.dgt), self.params.f_min, self.params.f_max) # Hz
self.channel_freq = frequencies self.channel_freq = frequencies
self.interpol_dgt = interp(self.channel_freq, amplifier_freq, self.params.dgt) self.interpol_dgt = interp(self.channel_freq, amplifier_freq, self.params.dgt)

32
gnpy/core/utils.py
View File

@@ -73,35 +73,19 @@ def c():
return constants.c return constants.c
def itufs(spacing, startf=191.35, stopf=196.10): def arrange_frequencies(length, start, stop):
"""Creates an array of frequencies whose default range is """Create an array of frequencies
191.35-196.10 THz
:param spacing: Frequency spacing in THz
:param starf: Start frequency in THz
:param stopf: Stop frequency in THz
:type spacing: float
:type startf: float
:type stopf: float
:return an array of frequnecies determined by the spacing parameter
:rtype: numpy.ndarray
"""
return np.arange(startf, stopf + spacing / 2, spacing)
def itufl(length, startf=191.35, stopf=196.10):
"""Creates an array of frequencies whose default range is
191.35-196.10 THz
:param length: number of elements :param length: number of elements
:param starf: Start frequency in THz :param star: Start frequency in THz
:param stopf: Stop frequency in THz :param stop: Stop frequency in THz
:type length: integer :type length: integer
:type startf: float :type start: float
:type stopf: float :type stop: float
:return an array of frequnecies determined by the spacing parameter :return an array of frequencies determined by the spacing parameter
:rtype: numpy.ndarray :rtype: numpy.ndarray
""" """
return np.linspace(startf, stopf, length) return np.linspace(start, stop, length)
def h(): def h():
""" """