diff --git a/iblrig/alyx.py b/iblrig/alyx.py index 730f64851..8f5214e64 100644 --- a/iblrig/alyx.py +++ b/iblrig/alyx.py @@ -1,5 +1,6 @@ import logging from one.registration import RegistrationClient +import iblrig log = logging.getLogger("iblrig") @@ -24,7 +25,7 @@ def ensure_list(x): 'n_correct_trials': settings_dict['NTRIALS_CORRECT'], 'n_trials': settings_dict['NTRIALS'], 'projects': ensure_list(settings_dict['PROJECTS']), - 'task_protocol': settings_dict['PYBPOD_PROTOCOL'], + 'task_protocol': settings_dict['PYBPOD_PROTOCOL'] + iblrig.__version__, 'lab': settings_dict['ALYX_LAB'], 'start_time': settings_dict['SESSION_START_TIME'], 'end_time': settings_dict['SESSION_END_TIME'] @@ -51,8 +52,8 @@ def ensure_list(x): session=ses['url'][-36:], subject=settings_dict['SUBJECT_NAME'], water_type=settings_dict.get('REWARD_TYPE', None), - water_administered=settings_dict['TOTAL_WATER_DELIVERED'], + water_administered=settings_dict['TOTAL_WATER_DELIVERED'] / 1000, ) one.alyx.rest('water-administrations', 'create', data=wa_data) log.info(f"Water administered registered in Alyx database: {ses['subject']}," - f"{settings_dict['TOTAL_WATER_DELIVERED']}mL") + f"{settings_dict['TOTAL_WATER_DELIVERED'] / 1000}mL") diff --git a/iblrig/test/tasks/test_biased_choice_world.py b/iblrig/test/tasks/test_biased_choice_world.py index b486bd424..bcd88ab83 100644 --- a/iblrig/test/tasks/test_biased_choice_world.py +++ b/iblrig/test/tasks/test_biased_choice_world.py @@ -105,7 +105,7 @@ def test_task_biased(self): date=task.session_info['SESSION_START_TIME'][:10], number=task.session_info['SESSION_NUMBER']) full_session = self.one.alyx.rest('sessions', 'read', id=ses[0]['id']) # and the water administered - assert full_session['wateradmin_session_related'][0]['water_administered'] == init_water + assert full_session['wateradmin_session_related'][0]['water_administered'] == init_water / 1000 # and the related weighing wei = self.one.alyx.rest('weighings', 'list', nickname=self.kwargs['subject'], date=task.session_info['SESSION_START_TIME'][:10])