afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Use Emane.version directly instead of checking if EventService

Browse source 
exists.
This commit is contained in:
Tom Goff 2015-09-30 14:41:13 -04:00
parent 026f54d658
commit 3a13b8c92d
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/emane/universal.py
View file

@ -18,7 +18,7 @@ except:
pass
from core.api import coreapi
from core.constants import *
from emane import EmaneModel
from emane import Emane, EmaneModel
class EmaneUniversalModel(EmaneModel):
''' This Univeral PHY model is meant to be imported by other models,
@ -80,7 +80,7 @@ class EmaneUniversalModel(EmaneModel):
("propagationmodel", coreapi.CONF_DATA_TYPE_STRING, '2ray',
'precomputed,2ray,freespace','path loss mode'),
]
if 'EventService' in globals():
if Emane.version >= Emane.EMANE091:
_confmatrix = _confmatrix_base + _confmatrix_091
else:
_confmatrix = _confmatrix_base + _confmatrix_081