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

Merge pull request #141 from ojnas/automatic-spacing

Browse Source 
Simplify automatic spacing
This commit is contained in:
James
2018-10-30 11:59:20 -04:00
committed by GitHub
parent e94fd9590e 48198bdd89
commit b2b500c5dc
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gnpy/core/equipment.py
View File

@@ -182,13 +182,7 @@ def automatic_spacing(baud_rate):
"""return the min possible channel spacing for a given baud rate""" """return the min possible channel spacing for a given baud rate"""
spacing_list = [(38e9,50e9), (67e9,75e9), (92e9,100e9)] #list of possible tuples spacing_list = [(38e9,50e9), (67e9,75e9), (92e9,100e9)] #list of possible tuples
#[(max_baud_rate, spacing_for_this_baud_rate)] #[(max_baud_rate, spacing_for_this_baud_rate)]
acceptable_spacing_list = list(filter(lambda x : x[0]>baud_rate, spacing_list)) return next((s[1] for s in spacing_list if s[0] > baud_rate), baud_rate*1.2)
if len(acceptable_spacing_list) < 1:
#can't find an adequate spacing from the list, so default to:
return baud_rate*1.2
else:
#chose the lowest possible spacing
return min(acceptable_spacing_list, key=itemgetter(0))[1]
def automatic_nch(f_min, f_max, spacing): def automatic_nch(f_min, f_max, spacing):
return int((f_max - f_min)//spacing) return int((f_max - f_min)//spacing)