QMAPP-mq / qudi

A modular laboratory experiment management suite.
GNU General Public License v3.0
4 stars 0 forks source link

consolidate timetagger development #42

Open mvbnano opened 6 years ago

mvbnano commented 6 years ago

What is affected by this bug?

There are presently 2 timetagger hardware files; one in master (qudi/hardware/swabian_instruments/timetagger_fast_counter.py) and another in dev_timetagger (qudi/hardware/timetagger_counter.py). We should consolidate these two files as it is confusing as to what the difference is.

Where on the platform does it happen?

Expected behavior (i.e. solution)

Consolidate the two files, with separate slow counter and fast counter classes if required.

mvbnano commented 6 years ago

@latchr is there a reason that you removed the way channels are fetched from the config?

Lines 41 --> 56 are shown below. I have reinstated the second APD channel, but hardcoding is not a good solution. I would like to change them back to being fetched by ConfigOption.

    #_channel_apd_0 = ConfigOption('timetagger_channel_apd_0', missing='error')
    #_channel_apd_1 = ConfigOption('timetagger_channel_apd_1', None, missing='warn')
    #_sum_channels = ConfigOption('timetagger_sum_channels', False)

    def on_activate(self):
        """ Start up TimeTagger interface
        """
        self._tagger = tt.createTimeTagger()
        self._count_frequency = 50  # Hz

        # Read HW from config
        config = self.getConfiguration()

        self._channel_apd_0 = config['timetagger_channel_apd_0']
        self._channel_apd_1 = config['timetagger_channel_apd_1']
        self._sum_channels = False
mvbnano commented 6 years ago

All timetagger hardware files should be in a single timetagger.,py file. which in turn satisfies all the required interfaces.