Skip to content

Commit

Permalink
Merge pull request #281 from BBN-Q/feature/aps3-amc599
Browse files Browse the repository at this point in the history
Feature/aps3 amc599
  • Loading branch information
grahamrow authored May 4, 2021
2 parents cb0a6dd + f163a4a commit da965ce
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions QGL/ChannelLibraries.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,12 +519,11 @@ def build_connectivity_graph(self):
self.connectivityG[chan.source][chan.target]['channel'] = chan

@check_for_duplicates
def new_APS3(self, label, address, serial_port, **kwargs):
def new_APS3(self, label, address, serial_port, dac, **kwargs):
chan1 = Channels.PhysicalQuadratureChannel(label=f"{label}-1", channel=0, instrument=label, translator="APS3Pattern", sampling_rate=2.5e9, channel_db=self.channelDatabase)
chan2 = Channels.PhysicalQuadratureChannel(label=f"{label}-2", channel=1, instrument=label, translator="APS3Pattern", sampling_rate=2.5e9, channel_db=self.channelDatabase)
m1 = Channels.PhysicalMarkerChannel(label=f"{label}-m1", channel=0, instrument=label, translator="APS3Pattern", sampling_rate=2.5e9, channel_db=self.channelDatabase)

this_transmitter = Channels.Transmitter(label=label, model="APS3", address=address, serial_port=serial_port, channels=[chan1, chan2, m1], channel_db=self.channelDatabase, **kwargs)
this_transmitter = Channels.Transmitter(label=label, model="APS3", address=address, serial_port=serial_port, dac=dac, channels=[chan1, m1], channel_db=self.channelDatabase, **kwargs)
this_transmitter.trigger_source = 'external' if 'trigger_source' not in kwargs else kwargs['trigger_source']

self.add_and_update_dict(this_transmitter)
Expand Down

0 comments on commit da965ce

Please sign in to comment.