M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

coredevice.dds: update from obsolete int(width=) syntax (fixes #621).

This commit is contained in:
whitequark 2016-11-20 09:47:43 +00:00
parent 4a62e09bd4
commit d7f4397924
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/coredevice/dds.py
View File

@ -1,6 +1,7 @@
from artiq.language.core import * from artiq.language.core import *
from artiq.language.types import * from artiq.language.types import *
from artiq.language.units import * from artiq.language.units import *
from numpy import int64
_PHASE_MODE_DEFAULT = -1 _PHASE_MODE_DEFAULT = -1
@ -111,14 +112,14 @@ class _DDSGeneric:
"""Returns the frequency tuning word corresponding to the given """Returns the frequency tuning word corresponding to the given
frequency. frequency.
""" """
return round(int(2, width=64)**32*frequency/self.core_dds.sysclk) return round(int64(2)**32*frequency/self.core_dds.sysclk)
@portable(flags=["fast-math"]) @portable(flags=["fast-math"])
def ftw_to_frequency(self, ftw): def ftw_to_frequency(self, ftw):
"""Returns the frequency corresponding to the given frequency tuning """Returns the frequency corresponding to the given frequency tuning
word. word.
""" """
return ftw*self.core_dds.sysclk/int(2, width=64)**32 return ftw*self.core_dds.sysclk/int64(2)**32
@portable(flags=["fast-math"]) @portable(flags=["fast-math"])
def turns_to_pow(self, turns): def turns_to_pow(self, turns):