Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consolidate timetagger development #42

Open
mvbnano opened this issue May 11, 2018 · 2 comments
Open

consolidate timetagger development #42

mvbnano opened this issue May 11, 2018 · 2 comments
Assignees

Comments

@mvbnano
Copy link
Member

mvbnano commented May 11, 2018

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?

  • qudi/hardware/swabian_instruments/timetagger_fast_counter.py
  • qudi/hardware/timetagger_counter.py

Expected behavior (i.e. solution)

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

@mvbnano
Copy link
Member Author

mvbnano commented May 11, 2018

@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
Copy link
Member Author

mvbnano commented Jun 21, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants