Skip to content

Commit

Permalink
Merge 737cf4e into dfdca26
Browse files Browse the repository at this point in the history
  • Loading branch information
sfallek1 committed Nov 27, 2019
2 parents dfdca26 + 737cf4e commit 42960eb
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions QGL/ChannelLibraries.py
Expand Up @@ -526,6 +526,42 @@ def new_APS2_rack(self, label, ip_addresses, tdm_ip=None, **kwargs):
self.add_and_update_dict(this_transceiver)
return this_transceiver

@check_for_duplicates
def new_transceiver(self, model, label, address, numtx=1, numrx=1, nummark=4, record_length = 1024, **kwargs):
translator = model+"Pattern"
stream_sel = model+"StreamSelector"

chans = []
for i in range(numtx):
chan = Channels.PhysicalQuadratureChannel(label=f"{label}-Tx{i+1}-1", instrument=label, channel=i, translator=translator, channel_db=self.channelDatabase)
chans.append(chan)
for i in range(nummark):
chan = Channels.PhysicalMarkerChannel(label=f"{label}-Tx{i+1}-M", channel=i, instrument=label, translator=translator, channel_db=self.channelDatabase)
chans.append(chan)

transmitter = Channels.Transmitter(label=f"{label}-Tx", model=model, address=address, channels=chans, channel_db=self.channelDatabase)
transmitter.trigger_source = "external"
transmitter.address = address

chans = []
for i in range(numrx):
chan = Channels.ReceiverChannel(label=f"RecvChan-{label}-{i+1}", channel=i, channel_db=self.channelDatabase)
chans.append(chan)

receiver = Channels.Receiver(label=f"{label}-Rx", model=model, address=address, channels=chans, record_length=record_length, channel_db=self.channelDatabase)
receiver.trigger_source = "external"
receiver.stream_types = "raw"
receiver.address = address
receiver.stream_sel = stream_sel

transceiver = Channels.Transceiver(label=label, address=address, model=model, transmitters=[transmitter], receivers = [receiver], initialize_separately=False, channel_db=self.channelDatabase)
transmitter.transceiver = transceiver
receiver.transceiver = transceiver

self.add_and_update_dict(transceiver)
return transceiver


@check_for_duplicates
def new_X6(self, label, address, dsp_channel=0, record_length=1024, **kwargs):

Expand Down

0 comments on commit 42960eb

Please sign in to comment.