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

update raman model to work in auto-design

Browse Source 
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
This commit is contained in:
Jean-Luc Auge
2019-01-30 16:31:19 +01:00
parent 70066de390
commit 46aae9486e
3 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gnpy/core/network.py
View File

@@ -51,15 +51,7 @@ def network_from_json(json_data, equipment):
typ = el_config.pop('type')
variety = el_config.pop('type_variety', 'default')
if typ in equipment and variety in equipment[typ]:
extra_params = equipment[typ][variety]._asdict()
if extra_params.get('type_def','') == 'hybrid':
raman_model = extra_params['nf_model']
type_variety = extra_params['type_variety']
extra_params_edfa = equipment['Edfa'][raman_model.edfa_variety]._asdict()
extra_params.update(extra_params_edfa)
extra_params['type_def'] = 'hybrid'
extra_params['raman_model'] = raman_model
extra_params['type_variety'] = type_variety
extra_params = equipment[typ][variety]
el_config.setdefault('params', {}).update(extra_params.__dict__)
elif typ in ['Edfa', 'Fiber']: #catch it now because the code will crash later!
print( f'The {typ} of variety type {variety} was not recognized:'