From efd0d9887677399bbcad2a0fc5cc68a98dc470d9 Mon Sep 17 00:00:00 2001 From: corbennett Date: Tue, 26 Mar 2019 18:10:43 -0700 Subject: [PATCH 1/3] added stage for recording with image set B --- regimen.yml | 550 +++++++++++++++++++++++++++------------------------- 1 file changed, 282 insertions(+), 268 deletions(-) diff --git a/regimen.yml b/regimen.yml index 1b888b3..ca6aa83 100644 --- a/regimen.yml +++ b/regimen.yml @@ -1,268 +1,282 @@ -_change_detection_script: &change_detection_script - http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/change_detection_with_fingerprint.py?at=021ec55fbbdbb05aad1681c016e83066fe5aa1dd - -_change_detection_script_md5: &change_detection_script_md5 - e0535f3b6f03ccc8eeccaed2118f3c1d - -_movie_clips_script: &movie_clips_script - http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/receptive_field_mapping.py?at=46ae5481552b2ab22ffa580260426399ae40ffba - -_movie_clips_script_md5: &movie_clips_script_md5 - 8cab71e3cf5acdeef9a4660b09e52798 - -_full_field_gratings_stimulus: &full_field_gratings - class: grating - params: - sf: 0.04 - tex: sqr - size: [200, 150,] - units: deg - phase: 0.25 - groups: - vertical: - Ori: [0, 180] - horizontal: - Ori: [90, 270] - -_image_set_a_stimulus: &image_set_a - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_training_2017.07.14.pkl - sampling: even - -_image_set_b_stimulus: &image_set_b - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_3_2017.07.14.pkl - sampling: even - -_image_set_c_stimulus: &image_set_c - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_6_2017.07.14.pkl - sampling: even - -_image_set_d_stimulus: &image_set_d - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_5_2017.07.14.pkl - sampling: even - -_fingerprint_movie: &fingerprint_movie - name: fingerprint - params: - movie_path: //allen/programs/braintv/workgroups/neuralcoding/Saskia/Visual Stimuli 151207/Movie_TOE1.npy - frame_length: 0.03333333333333333 - size: [1920, 1080] - runs: 10 - - -_flash_parameters: &flash_parameters - task_id: DoC - - catch_frequency: 0.25 - failure_repeats: 5 - - # rewards (mL) - reward_volume: 0.007 - volume_limit: 5.0 - - # auto rewards - auto_reward_vol: 0.005 - warm_up_trials: 5 - auto_reward_delay: 0.150 - free_reward_trials: 10000 - - # trial timing - min_no_lick_time: 0.0 - timeout_duration: 0.3 - pre_change_time: 0.0 - stimulus_window: 6.0 - max_task_duration_min: 60.0 - start_stop_padding: 20.0 - periodic_flash: [0.25, 0.5] - response_window: [0.15,0.75] - end_after_response: True - end_after_response_sec: 3.5 - - # timing of changes - change_time_dist: geometric - change_time_scale: 0.3 - change_flashes_min: 4 # inclusive - change_flashes_max: 12 # exclusive - -_no_flash_parameters: &no_flash_parameters - <<: *flash_parameters - periodic_flash: null - response_window: [0.15,1.0] - reward_volume: 0.010 - free_reward_trials: 10 - pre_change_time: 2.25 - - # timing of changes - change_time_dist: exponential - change_time_scale: 2.0 - change_flashes_min: null - change_flashes_max: null - - -_image_set_a_parameters: &image_set_a_parameters - <<: *flash_parameters - stimulus: *image_set_a - catch_frequency: null - -_image_set_b_parameters: &image_set_b_parameters - <<: *flash_parameters - stimulus: *image_set_b - catch_frequency: null - -_image_set_c_parameters: &image_set_c_parameters - <<: *flash_parameters - stimulus: *image_set_c - catch_frequency: null - -_image_set_d_parameters: &image_set_d_parameters - <<: *flash_parameters - stimulus: *image_set_d - catch_frequency: null - -### mtrain definitions -#based on VisualBehavior_Task1A_v1.0.3 -name: VisualBehaviorEPHYS_Task1A_v0.0.2 - -transitions: - - - trigger: progress - source: TRAINING_0_gratings_autorewards_15min - dest: TRAINING_1_gratings - conditions: one_complete - - - trigger: progress - source: TRAINING_1_gratings - dest: TRAINING_2_gratings_flashed - conditions: [two_out_of_three_aint_bad, yesterday_was_good] - - - trigger: progress - source: TRAINING_2_gratings_flashed - dest: TRAINING_3_images_A_10uL_reward - conditions: [two_out_of_three_aint_bad, yesterday_was_good] - - - trigger: progress - source: TRAINING_3_images_A_10uL_reward - dest: TRAINING_4_images_A_training - conditions: three_complete - - - trigger: progress - source: TRAINING_4_images_A_training - dest: TRAINING_4_images_A_handoff_ready - conditions: meets_engagement_criteria - - - trigger: progress - source: TRAINING_4_images_A_handoff_ready - dest: TRAINING_4_images_A_handoff_lapsed - unless: meets_engagement_criteria - - - trigger: progress - source: TRAINING_4_images_A_handoff_lapsed - dest: TRAINING_4_images_A_handoff_ready - conditions: meets_engagement_criteria - - - trigger: manual - source: TRAINING_4_images_A_handoff_ready - dest: EPHYS_1_images_A - -stages: - - TRAINING_0_gratings_autorewards_15min: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *no_flash_parameters - stage: TRAINING_0_gratings_autorewards_15min - stimulus: *full_field_gratings - - # auto rewards - warm_up_trials: -1 #infinite - abort_on_early_response: False - catch_frequency: 0.0 - - response_window: [0.0, 0.0] - min_no_lick_time: 0.0 - failure_repeats: 0 - - # trial timing - max_task_duration_min: 15.0 - - # rewards (mL) - reward_volume: 0.0 - - - TRAINING_1_gratings: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *no_flash_parameters - stage: TRAINING_1_gratings - - stimulus: *full_field_gratings - - - TRAINING_2_gratings_flashed: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *flash_parameters - stage: TRAINING_2_gratings_flashed - task_id: DoC - - stimulus: *full_field_gratings - free_reward_trials: 10 - - # rewards (mL) - reward_volume: 0.01 - - - TRAINING_3_images_A_10uL_reward: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_3_images_A_10uL_reward - - # rewards (mL) - reward_volume: 0.01 - free_reward_trials: 10 - - TRAINING_4_images_A_training: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_training - - TRAINING_4_images_A_handoff_ready: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_handoff_ready - warm_up_trials: 0 - - TRAINING_4_images_A_handoff_lapsed: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_handoff_lapsed - free_reward_trials: 10 - - EPHYS_1_images_A: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: EPHYS_1_images_A - warm_up_trials: 2 - flash_omit_probability: 0.05 - - + +_change_detection_script: &change_detection_script + http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/change_detection_with_fingerprint.py?at=021ec55fbbdbb05aad1681c016e83066fe5aa1dd + +_change_detection_script_md5: &change_detection_script_md5 + e0535f3b6f03ccc8eeccaed2118f3c1d + +_movie_clips_script: &movie_clips_script + http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/receptive_field_mapping.py?at=46ae5481552b2ab22ffa580260426399ae40ffba + +_movie_clips_script_md5: &movie_clips_script_md5 + 8cab71e3cf5acdeef9a4660b09e52798 + +_full_field_gratings_stimulus: &full_field_gratings + class: grating + params: + sf: 0.04 + tex: sqr + size: [200, 150,] + units: deg + phase: 0.25 + groups: + vertical: + Ori: [0, 180] + horizontal: + Ori: [90, 270] + +_image_set_a_stimulus: &image_set_a + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_training_2017.07.14.pkl + sampling: even + +_image_set_b_stimulus: &image_set_b + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_3_2017.07.14.pkl + sampling: even + +_image_set_c_stimulus: &image_set_c + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_6_2017.07.14.pkl + sampling: even + +_image_set_d_stimulus: &image_set_d + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_5_2017.07.14.pkl + sampling: even + +_fingerprint_movie: &fingerprint_movie + name: fingerprint + params: + movie_path: //allen/programs/braintv/workgroups/neuralcoding/Saskia/Visual Stimuli 151207/Movie_TOE1.npy + frame_length: 0.03333333333333333 + size: [1920, 1080] + runs: 10 + + +_flash_parameters: &flash_parameters + task_id: DoC + + catch_frequency: 0.25 + failure_repeats: 5 + + # rewards (mL) + reward_volume: 0.007 + volume_limit: 5.0 + + # auto rewards + auto_reward_vol: 0.005 + warm_up_trials: 5 + auto_reward_delay: 0.150 + free_reward_trials: 10000 + + # trial timing + min_no_lick_time: 0.0 + timeout_duration: 0.3 + pre_change_time: 0.0 + stimulus_window: 6.0 + max_task_duration_min: 60.0 + start_stop_padding: 20.0 + periodic_flash: [0.25, 0.5] + response_window: [0.15,0.75] + end_after_response: True + end_after_response_sec: 3.5 + + # timing of changes + change_time_dist: geometric + change_time_scale: 0.3 + change_flashes_min: 4 # inclusive + change_flashes_max: 12 # exclusive + +_no_flash_parameters: &no_flash_parameters + <<: *flash_parameters + periodic_flash: null + response_window: [0.15,1.0] + reward_volume: 0.010 + free_reward_trials: 10 + pre_change_time: 2.25 + + # timing of changes + change_time_dist: exponential + change_time_scale: 2.0 + change_flashes_min: null + change_flashes_max: null + + +_image_set_a_parameters: &image_set_a_parameters + <<: *flash_parameters + stimulus: *image_set_a + catch_frequency: null + +_image_set_b_parameters: &image_set_b_parameters + <<: *flash_parameters + stimulus: *image_set_b + catch_frequency: null + +_image_set_c_parameters: &image_set_c_parameters + <<: *flash_parameters + stimulus: *image_set_c + catch_frequency: null + +_image_set_d_parameters: &image_set_d_parameters + <<: *flash_parameters + stimulus: *image_set_d + catch_frequency: null + +### mtrain definitions +#based on VisualBehavior_Task1A_v1.0.3 +name: VisualBehaviorEPHYS_Task1A_v0.0.3 + +transitions: + + - trigger: progress + source: TRAINING_0_gratings_autorewards_15min + dest: TRAINING_1_gratings + conditions: one_complete + + - trigger: progress + source: TRAINING_1_gratings + dest: TRAINING_2_gratings_flashed + conditions: [two_out_of_three_aint_bad, yesterday_was_good] + + - trigger: progress + source: TRAINING_2_gratings_flashed + dest: TRAINING_3_images_A_10uL_reward + conditions: [two_out_of_three_aint_bad, yesterday_was_good] + + - trigger: progress + source: TRAINING_3_images_A_10uL_reward + dest: TRAINING_4_images_A_training + conditions: three_complete + + - trigger: progress + source: TRAINING_4_images_A_training + dest: TRAINING_4_images_A_handoff_ready + conditions: meets_engagement_criteria + + - trigger: progress + source: TRAINING_4_images_A_handoff_ready + dest: TRAINING_4_images_A_handoff_lapsed + unless: meets_engagement_criteria + + - trigger: progress + source: TRAINING_4_images_A_handoff_lapsed + dest: TRAINING_4_images_A_handoff_ready + conditions: meets_engagement_criteria + + - trigger: manual + source: TRAINING_4_images_A_handoff_ready + dest: EPHYS_1_images_A + + - trigger: manual + source: EPHYS_1_images_A + dest: EPHYS_1_images_B + +stages: + + TRAINING_0_gratings_autorewards_15min: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *no_flash_parameters + stage: TRAINING_0_gratings_autorewards_15min + stimulus: *full_field_gratings + + # auto rewards + warm_up_trials: -1 #infinite + abort_on_early_response: False + catch_frequency: 0.0 + + response_window: [0.0, 0.0] + min_no_lick_time: 0.0 + failure_repeats: 0 + + # trial timing + max_task_duration_min: 15.0 + + # rewards (mL) + reward_volume: 0.0 + + + TRAINING_1_gratings: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *no_flash_parameters + stage: TRAINING_1_gratings + + stimulus: *full_field_gratings + + + TRAINING_2_gratings_flashed: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *flash_parameters + stage: TRAINING_2_gratings_flashed + task_id: DoC + + stimulus: *full_field_gratings + free_reward_trials: 10 + + # rewards (mL) + reward_volume: 0.01 + + + TRAINING_3_images_A_10uL_reward: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_3_images_A_10uL_reward + + # rewards (mL) + reward_volume: 0.01 + free_reward_trials: 10 + + TRAINING_4_images_A_training: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_training + + TRAINING_4_images_A_handoff_ready: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_handoff_ready + warm_up_trials: 0 + + TRAINING_4_images_A_handoff_lapsed: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_handoff_lapsed + free_reward_trials: 10 + + EPHYS_1_images_A: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: EPHYS_1_images_A + warm_up_trials: 2 + flash_omit_probability: 0.05 + + + EPHYS_1_images_B: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_b_parameters + stage: EPHYS_1_images_B + warm_up_trials: 2 + flash_omit_probability: 0.05 + \ No newline at end of file From f3d1121ad804f49a529eb6ebf929c825332b3864 Mon Sep 17 00:00:00 2001 From: Corbett Bennett Date: Tue, 26 Mar 2019 18:29:44 -0700 Subject: [PATCH 2/3] Revert "added stage for recording with image set B" This reverts commit efd0d9887677399bbcad2a0fc5cc68a98dc470d9. --- regimen.yml | 550 +++++++++++++++++++++++++--------------------------- 1 file changed, 268 insertions(+), 282 deletions(-) diff --git a/regimen.yml b/regimen.yml index ca6aa83..1b888b3 100644 --- a/regimen.yml +++ b/regimen.yml @@ -1,282 +1,268 @@ - -_change_detection_script: &change_detection_script - http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/change_detection_with_fingerprint.py?at=021ec55fbbdbb05aad1681c016e83066fe5aa1dd - -_change_detection_script_md5: &change_detection_script_md5 - e0535f3b6f03ccc8eeccaed2118f3c1d - -_movie_clips_script: &movie_clips_script - http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/receptive_field_mapping.py?at=46ae5481552b2ab22ffa580260426399ae40ffba - -_movie_clips_script_md5: &movie_clips_script_md5 - 8cab71e3cf5acdeef9a4660b09e52798 - -_full_field_gratings_stimulus: &full_field_gratings - class: grating - params: - sf: 0.04 - tex: sqr - size: [200, 150,] - units: deg - phase: 0.25 - groups: - vertical: - Ori: [0, 180] - horizontal: - Ori: [90, 270] - -_image_set_a_stimulus: &image_set_a - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_training_2017.07.14.pkl - sampling: even - -_image_set_b_stimulus: &image_set_b - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_3_2017.07.14.pkl - sampling: even - -_image_set_c_stimulus: &image_set_c - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_6_2017.07.14.pkl - sampling: even - -_image_set_d_stimulus: &image_set_d - class: images - params: - image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_5_2017.07.14.pkl - sampling: even - -_fingerprint_movie: &fingerprint_movie - name: fingerprint - params: - movie_path: //allen/programs/braintv/workgroups/neuralcoding/Saskia/Visual Stimuli 151207/Movie_TOE1.npy - frame_length: 0.03333333333333333 - size: [1920, 1080] - runs: 10 - - -_flash_parameters: &flash_parameters - task_id: DoC - - catch_frequency: 0.25 - failure_repeats: 5 - - # rewards (mL) - reward_volume: 0.007 - volume_limit: 5.0 - - # auto rewards - auto_reward_vol: 0.005 - warm_up_trials: 5 - auto_reward_delay: 0.150 - free_reward_trials: 10000 - - # trial timing - min_no_lick_time: 0.0 - timeout_duration: 0.3 - pre_change_time: 0.0 - stimulus_window: 6.0 - max_task_duration_min: 60.0 - start_stop_padding: 20.0 - periodic_flash: [0.25, 0.5] - response_window: [0.15,0.75] - end_after_response: True - end_after_response_sec: 3.5 - - # timing of changes - change_time_dist: geometric - change_time_scale: 0.3 - change_flashes_min: 4 # inclusive - change_flashes_max: 12 # exclusive - -_no_flash_parameters: &no_flash_parameters - <<: *flash_parameters - periodic_flash: null - response_window: [0.15,1.0] - reward_volume: 0.010 - free_reward_trials: 10 - pre_change_time: 2.25 - - # timing of changes - change_time_dist: exponential - change_time_scale: 2.0 - change_flashes_min: null - change_flashes_max: null - - -_image_set_a_parameters: &image_set_a_parameters - <<: *flash_parameters - stimulus: *image_set_a - catch_frequency: null - -_image_set_b_parameters: &image_set_b_parameters - <<: *flash_parameters - stimulus: *image_set_b - catch_frequency: null - -_image_set_c_parameters: &image_set_c_parameters - <<: *flash_parameters - stimulus: *image_set_c - catch_frequency: null - -_image_set_d_parameters: &image_set_d_parameters - <<: *flash_parameters - stimulus: *image_set_d - catch_frequency: null - -### mtrain definitions -#based on VisualBehavior_Task1A_v1.0.3 -name: VisualBehaviorEPHYS_Task1A_v0.0.3 - -transitions: - - - trigger: progress - source: TRAINING_0_gratings_autorewards_15min - dest: TRAINING_1_gratings - conditions: one_complete - - - trigger: progress - source: TRAINING_1_gratings - dest: TRAINING_2_gratings_flashed - conditions: [two_out_of_three_aint_bad, yesterday_was_good] - - - trigger: progress - source: TRAINING_2_gratings_flashed - dest: TRAINING_3_images_A_10uL_reward - conditions: [two_out_of_three_aint_bad, yesterday_was_good] - - - trigger: progress - source: TRAINING_3_images_A_10uL_reward - dest: TRAINING_4_images_A_training - conditions: three_complete - - - trigger: progress - source: TRAINING_4_images_A_training - dest: TRAINING_4_images_A_handoff_ready - conditions: meets_engagement_criteria - - - trigger: progress - source: TRAINING_4_images_A_handoff_ready - dest: TRAINING_4_images_A_handoff_lapsed - unless: meets_engagement_criteria - - - trigger: progress - source: TRAINING_4_images_A_handoff_lapsed - dest: TRAINING_4_images_A_handoff_ready - conditions: meets_engagement_criteria - - - trigger: manual - source: TRAINING_4_images_A_handoff_ready - dest: EPHYS_1_images_A - - - trigger: manual - source: EPHYS_1_images_A - dest: EPHYS_1_images_B - -stages: - - TRAINING_0_gratings_autorewards_15min: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *no_flash_parameters - stage: TRAINING_0_gratings_autorewards_15min - stimulus: *full_field_gratings - - # auto rewards - warm_up_trials: -1 #infinite - abort_on_early_response: False - catch_frequency: 0.0 - - response_window: [0.0, 0.0] - min_no_lick_time: 0.0 - failure_repeats: 0 - - # trial timing - max_task_duration_min: 15.0 - - # rewards (mL) - reward_volume: 0.0 - - - TRAINING_1_gratings: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *no_flash_parameters - stage: TRAINING_1_gratings - - stimulus: *full_field_gratings - - - TRAINING_2_gratings_flashed: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *flash_parameters - stage: TRAINING_2_gratings_flashed - task_id: DoC - - stimulus: *full_field_gratings - free_reward_trials: 10 - - # rewards (mL) - reward_volume: 0.01 - - - TRAINING_3_images_A_10uL_reward: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_3_images_A_10uL_reward - - # rewards (mL) - reward_volume: 0.01 - free_reward_trials: 10 - - TRAINING_4_images_A_training: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_training - - TRAINING_4_images_A_handoff_ready: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_handoff_ready - warm_up_trials: 0 - - TRAINING_4_images_A_handoff_lapsed: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: TRAINING_4_images_A_handoff_lapsed - free_reward_trials: 10 - - EPHYS_1_images_A: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_a_parameters - stage: EPHYS_1_images_A - warm_up_trials: 2 - flash_omit_probability: 0.05 - - - EPHYS_1_images_B: - script: *change_detection_script - script_md5: *change_detection_script_md5 - parameters: - <<: *image_set_b_parameters - stage: EPHYS_1_images_B - warm_up_trials: 2 - flash_omit_probability: 0.05 - \ No newline at end of file +_change_detection_script: &change_detection_script + http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/change_detection_with_fingerprint.py?at=021ec55fbbdbb05aad1681c016e83066fe5aa1dd + +_change_detection_script_md5: &change_detection_script_md5 + e0535f3b6f03ccc8eeccaed2118f3c1d + +_movie_clips_script: &movie_clips_script + http://stash.corp.alleninstitute.org/projects/VB/repos/visual_behavior_scripts/raw/receptive_field_mapping.py?at=46ae5481552b2ab22ffa580260426399ae40ffba + +_movie_clips_script_md5: &movie_clips_script_md5 + 8cab71e3cf5acdeef9a4660b09e52798 + +_full_field_gratings_stimulus: &full_field_gratings + class: grating + params: + sf: 0.04 + tex: sqr + size: [200, 150,] + units: deg + phase: 0.25 + groups: + vertical: + Ori: [0, 180] + horizontal: + Ori: [90, 270] + +_image_set_a_stimulus: &image_set_a + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_training_2017.07.14.pkl + sampling: even + +_image_set_b_stimulus: &image_set_b + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_3_2017.07.14.pkl + sampling: even + +_image_set_c_stimulus: &image_set_c + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_6_2017.07.14.pkl + sampling: even + +_image_set_d_stimulus: &image_set_d + class: images + params: + image_set: //allen/programs/braintv/workgroups/nc-ophys/visual_behavior/image_dictionaries/Natural_Images_Lum_Matched_set_ophys_5_2017.07.14.pkl + sampling: even + +_fingerprint_movie: &fingerprint_movie + name: fingerprint + params: + movie_path: //allen/programs/braintv/workgroups/neuralcoding/Saskia/Visual Stimuli 151207/Movie_TOE1.npy + frame_length: 0.03333333333333333 + size: [1920, 1080] + runs: 10 + + +_flash_parameters: &flash_parameters + task_id: DoC + + catch_frequency: 0.25 + failure_repeats: 5 + + # rewards (mL) + reward_volume: 0.007 + volume_limit: 5.0 + + # auto rewards + auto_reward_vol: 0.005 + warm_up_trials: 5 + auto_reward_delay: 0.150 + free_reward_trials: 10000 + + # trial timing + min_no_lick_time: 0.0 + timeout_duration: 0.3 + pre_change_time: 0.0 + stimulus_window: 6.0 + max_task_duration_min: 60.0 + start_stop_padding: 20.0 + periodic_flash: [0.25, 0.5] + response_window: [0.15,0.75] + end_after_response: True + end_after_response_sec: 3.5 + + # timing of changes + change_time_dist: geometric + change_time_scale: 0.3 + change_flashes_min: 4 # inclusive + change_flashes_max: 12 # exclusive + +_no_flash_parameters: &no_flash_parameters + <<: *flash_parameters + periodic_flash: null + response_window: [0.15,1.0] + reward_volume: 0.010 + free_reward_trials: 10 + pre_change_time: 2.25 + + # timing of changes + change_time_dist: exponential + change_time_scale: 2.0 + change_flashes_min: null + change_flashes_max: null + + +_image_set_a_parameters: &image_set_a_parameters + <<: *flash_parameters + stimulus: *image_set_a + catch_frequency: null + +_image_set_b_parameters: &image_set_b_parameters + <<: *flash_parameters + stimulus: *image_set_b + catch_frequency: null + +_image_set_c_parameters: &image_set_c_parameters + <<: *flash_parameters + stimulus: *image_set_c + catch_frequency: null + +_image_set_d_parameters: &image_set_d_parameters + <<: *flash_parameters + stimulus: *image_set_d + catch_frequency: null + +### mtrain definitions +#based on VisualBehavior_Task1A_v1.0.3 +name: VisualBehaviorEPHYS_Task1A_v0.0.2 + +transitions: + + - trigger: progress + source: TRAINING_0_gratings_autorewards_15min + dest: TRAINING_1_gratings + conditions: one_complete + + - trigger: progress + source: TRAINING_1_gratings + dest: TRAINING_2_gratings_flashed + conditions: [two_out_of_three_aint_bad, yesterday_was_good] + + - trigger: progress + source: TRAINING_2_gratings_flashed + dest: TRAINING_3_images_A_10uL_reward + conditions: [two_out_of_three_aint_bad, yesterday_was_good] + + - trigger: progress + source: TRAINING_3_images_A_10uL_reward + dest: TRAINING_4_images_A_training + conditions: three_complete + + - trigger: progress + source: TRAINING_4_images_A_training + dest: TRAINING_4_images_A_handoff_ready + conditions: meets_engagement_criteria + + - trigger: progress + source: TRAINING_4_images_A_handoff_ready + dest: TRAINING_4_images_A_handoff_lapsed + unless: meets_engagement_criteria + + - trigger: progress + source: TRAINING_4_images_A_handoff_lapsed + dest: TRAINING_4_images_A_handoff_ready + conditions: meets_engagement_criteria + + - trigger: manual + source: TRAINING_4_images_A_handoff_ready + dest: EPHYS_1_images_A + +stages: + + TRAINING_0_gratings_autorewards_15min: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *no_flash_parameters + stage: TRAINING_0_gratings_autorewards_15min + stimulus: *full_field_gratings + + # auto rewards + warm_up_trials: -1 #infinite + abort_on_early_response: False + catch_frequency: 0.0 + + response_window: [0.0, 0.0] + min_no_lick_time: 0.0 + failure_repeats: 0 + + # trial timing + max_task_duration_min: 15.0 + + # rewards (mL) + reward_volume: 0.0 + + + TRAINING_1_gratings: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *no_flash_parameters + stage: TRAINING_1_gratings + + stimulus: *full_field_gratings + + + TRAINING_2_gratings_flashed: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *flash_parameters + stage: TRAINING_2_gratings_flashed + task_id: DoC + + stimulus: *full_field_gratings + free_reward_trials: 10 + + # rewards (mL) + reward_volume: 0.01 + + + TRAINING_3_images_A_10uL_reward: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_3_images_A_10uL_reward + + # rewards (mL) + reward_volume: 0.01 + free_reward_trials: 10 + + TRAINING_4_images_A_training: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_training + + TRAINING_4_images_A_handoff_ready: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_handoff_ready + warm_up_trials: 0 + + TRAINING_4_images_A_handoff_lapsed: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: TRAINING_4_images_A_handoff_lapsed + free_reward_trials: 10 + + EPHYS_1_images_A: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_a_parameters + stage: EPHYS_1_images_A + warm_up_trials: 2 + flash_omit_probability: 0.05 + + From 743b1f147d850a91d4dad7f9bb65cbac7aae8018 Mon Sep 17 00:00:00 2001 From: Corbett Bennett Date: Tue, 26 Mar 2019 18:34:38 -0700 Subject: [PATCH 3/3] added stage for recording with image set B --- regimen.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/regimen.yml b/regimen.yml index 1b888b3..c93ebfa 100644 --- a/regimen.yml +++ b/regimen.yml @@ -128,7 +128,7 @@ _image_set_d_parameters: &image_set_d_parameters ### mtrain definitions #based on VisualBehavior_Task1A_v1.0.3 -name: VisualBehaviorEPHYS_Task1A_v0.0.2 +name: VisualBehaviorEPHYS_Task1A_v0.0.3 transitions: @@ -171,6 +171,12 @@ transitions: source: TRAINING_4_images_A_handoff_ready dest: EPHYS_1_images_A + - trigger: manual + source: EPHYS_1_images_A + dest: EPHYS_1_images_B + + + stages: TRAINING_0_gratings_autorewards_15min: @@ -265,4 +271,11 @@ stages: warm_up_trials: 2 flash_omit_probability: 0.05 - + EPHYS_1_images_B: + script: *change_detection_script + script_md5: *change_detection_script_md5 + parameters: + <<: *image_set_b_parameters + stage: EPHYS_1_images_B + warm_up_trials: 2 + flash_omit_probability: 0.05