Code

Random reward#1267

Code

Open

XX-Yin wants to merge 203 commits intodevelopAllenNeuralDynamics/dynamic-foraging-task:developfrom

random-rewardAllenNeuralDynamics/dynamic-foraging-task:random-rewardCopy head branch name to clipboard

Commits

Commits on Dec 23, 2024

• adding the optical tagging icon

  XX-Yin

  committed
  0c984e1

  Copy full SHA for 0c984e1

• adding optogenetics tagging to toolbar

  XX-Yin

  committed
  dba641c

  Copy full SHA for dba641c

• adding optical tagging to the main function

  XX-Yin

  committed
  2e12725

  Copy full SHA for 2e12725

• adding OpticalTaggingDialog

  XX-Yin

  committed
  d54b6aa

  Copy full SHA for d54b6aa

• adding OpticalTagging ui

  XX-Yin

  committed
  66debaf

  Copy full SHA for 66debaf

• loading OpticalTaggingDialog

  XX-Yin

  committed
  a37f269

  Copy full SHA for a37f269

• connected to _OpticalTagging

  XX-Yin

  committed
  11118db

  Copy full SHA for 11118db

• set it as checkable

  XX-Yin

  committed
  1f5143f

  Copy full SHA for 1f5143f

• updated the Optical Tagging ui

  XX-Yin

  committed
  37ea62c

  Copy full SHA for 37ea62c

• updated the optical tagging ui

  XX-Yin

  committed
  70a2e7c

  Copy full SHA for 70a2e7c

• set Start checkable

  XX-Yin

  committed
  fc6aa8e

  Copy full SHA for fc6aa8e

• toggle color and disable widgets

  XX-Yin

  committed
  6f6a191

  Copy full SHA for 6f6a191

• enable widgets

  XX-Yin

  committed
  c67388c

  Copy full SHA for c67388c

• updating the ui

  XX-Yin

  committed
  620ee2d

  Copy full SHA for 620ee2d

• separating laser 1 color and laser 2 color

  XX-Yin

  committed
  ff20908

  Copy full SHA for ff20908

• prototype

  XX-Yin

  committed
  1421618

  Copy full SHA for 1421618

• updated the name

  XX-Yin

  committed
  2c33e13

  Copy full SHA for 2c33e13

• produce waveform

  XX-Yin

  committed
  e63e1f1

  Copy full SHA for e63e1f1

• changed the data type to float

  XX-Yin

  committed
  964a838

  Copy full SHA for 964a838

• grammar

  XX-Yin

  committed
  7b434a2

  Copy full SHA for 7b434a2

Commits on Dec 24, 2024

• _generate_random_conditions

  XX-Yin

  committed
  9fd8f66

  Copy full SHA for 9fd8f66

• generate random conditions

  XX-Yin

  committed
  d6711f0

  Copy full SHA for d6711f0

• changing pulse duration to ms

  XX-Yin

  committed
  47dea1e

  Copy full SHA for 47dea1e

• get input voltage

  XX-Yin

  committed
  ca83df6

  Copy full SHA for ca83df6

• removing target power

  XX-Yin

  committed
  8761665

  Copy full SHA for 8761665

• updating fit_calibration_results

  XX-Yin

  committed
  4c9323c

  Copy full SHA for 4c9323c

• adding s

  XX-Yin

  committed
  d7b6eb6

  Copy full SHA for d7b6eb6

• produce the waveform

  XX-Yin

  committed
  7e89ece

  Copy full SHA for 7e89ece

• transfer to float

  XX-Yin

  committed
  f006eed

  Copy full SHA for f006eed

• updating duration_each_cycle

  XX-Yin

  committed
  8561395

  Copy full SHA for 8561395

• send waveform and initiate the laser

  XX-Yin

  committed
  9c45311

  Copy full SHA for 9c45311

• update the overview

  XX-Yin

  committed
  9e09619

  Copy full SHA for 9e09619

Commits on Dec 30, 2024

• adding interval

  XX-Yin

  committed
  e14f3fa

  Copy full SHA for e14f3fa

• adding interval

  XX-Yin

  committed
  1cb0374

  Copy full SHA for 1cb0374

• adding label show current

  XX-Yin

  committed
  c88d7c0

  Copy full SHA for c88d7c0

• adding show current cycle and parameters

  XX-Yin

  committed
  3954716

  Copy full SHA for 3954716

• adding emergency stop

  XX-Yin

  committed
  d92e7f0

  Copy full SHA for d92e7f0

• finish start

  XX-Yin

  committed
  fb98c6d

  Copy full SHA for fb98c6d

• saving optical tagging parameters

  XX-Yin

  committed
  e4eab19

  Copy full SHA for e4eab19

• open and save OpticalTagging_dialog

  XX-Yin

  committed
  e66c714

  Copy full SHA for e66c714

• set Start checkable

  XX-Yin

  committed
  98e2cfd

  Copy full SHA for 98e2cfd

• changing extend to append

  XX-Yin

  committed
  455bb4a

  Copy full SHA for 455bb4a

• adding epoch and iteration

  XX-Yin

  committed
  261c981

  Copy full SHA for 261c981

• changing name to Cycles_each_condition

  XX-Yin

  committed
  59e3750

  Copy full SHA for 59e3750

• changing the name

  XX-Yin

  committed
  19cdd7c

  Copy full SHA for 19cdd7c

• showing only cycles

  XX-Yin

  committed
  0e649f3

  Copy full SHA for 0e649f3

• correcting the syntax

  XX-Yin

  committed
  799a6ec

  Copy full SHA for 799a6ec

• correcting grammar and naming

  XX-Yin

  committed
  9beb543

  Copy full SHA for 9beb543

• Changing the channel name

  XX-Yin

  committed
  d6a288e

  Copy full SHA for d6a288e

• adding QApplication.processEvents()

  XX-Yin

  committed
  6a2e9c2

  Copy full SHA for 6a2e9c2

• adding unit

  XX-Yin

  committed
  24af493

  Copy full SHA for 24af493

• removing receive

  XX-Yin

  committed
  fc1fc90

  Copy full SHA for fc1fc90

• saving success_tag and laser_start_timestamp

  XX-Yin

  committed
  a478726

  Copy full SHA for a478726

• removing while

  XX-Yin

  committed
  68dd906

  Copy full SHA for 68dd906

• updating interval_between_cycles_sampled and location_tag_sampled_all

  XX-Yin

  committed
  048a938

  Copy full SHA for 048a938

• grammar

  XX-Yin

  committed
  536535b

  Copy full SHA for 536535b

• simplify

  XX-Yin

  committed
  28494ac

  Copy full SHA for 28494ac

• change the location of information label

  XX-Yin

  committed
  0ae42ad

  Copy full SHA for 0ae42ad

• changing the color of Start

  XX-Yin

  committed
  34d58cd

  Copy full SHA for 34d58cd

• changing the size of the information label

  XX-Yin

  committed
  f68ef0d

  Copy full SHA for f68ef0d

• adding the cycle finish tag

  XX-Yin

  committed
  8c87ffb

  Copy full SHA for 8c87ffb

• removing QApplication.processEvents()

  XX-Yin

  committed
  a5709d1

  Copy full SHA for a5709d1

• changing the location

  XX-Yin

  committed
  e50d4b1

  Copy full SHA for e50d4b1

• removing the thread finish tag

  XX-Yin

  committed
  5bd36dd

  Copy full SHA for 5bd36dd

• adding one to the tag

  XX-Yin

  committed
  661225a

  Copy full SHA for 661225a

• updating the worker

  XX-Yin

  committed
  a1677c5

  Copy full SHA for a1677c5

• changing the worker name

  XX-Yin

  committed
  a31546c

  Copy full SHA for a31546c

• updating the worker

  XX-Yin

  committed
  f9bb53d

  Copy full SHA for f9bb53d

• Merge branch 'optical_tagging' of https://github.com/AllenNeuralDynamics/dynamic-foraging-task into optical_tagging

  XX-Yin

  committed
  053800f

  Copy full SHA for 053800f

• removing progress call

  XX-Yin

  committed
  f5553fe

  Copy full SHA for f5553fe

• revert

  XX-Yin

  committed
  54b5c6b

  Copy full SHA for 54b5c6b

• adding WorkerTagging

  XX-Yin

  committed
  bc28938

  Copy full SHA for bc28938

• using the worker tagging

  XX-Yin

  committed
  8fd3b82

  Copy full SHA for 8fd3b82

• changing the WorkerSignalsTagging

  XX-Yin

  committed
  1a045c9

  Copy full SHA for 1a045c9

• toggle the Start button when finishing

  XX-Yin

  committed
  efc1db5

  Copy full SHA for efc1db5

• saving the laser_start_timestamp and success_tag

  XX-Yin

  committed
  3b97684

  Copy full SHA for 3b97684

• changing the font size

  XX-Yin

  committed
  997c6f1

  Copy full SHA for 997c6f1

• adjusting the font size

  XX-Yin

  committed
  bcea79b

  Copy full SHA for bcea79b

• changing the show order

  XX-Yin

  committed
  3ac5451

  Copy full SHA for 3ac5451

• adding the save button

  XX-Yin

  committed
  8d785db

  Copy full SHA for 8d785db

• disable checkable

  XX-Yin

  committed
  eefb2b2

  Copy full SHA for eefb2b2

• save the optical tagging results

  XX-Yin

  committed
  03bb740

  Copy full SHA for 03bb740

• ID typo

  XX-Yin

  committed
  a8e909c

  Copy full SHA for a8e909c

• changing the saving format

  XX-Yin

  committed
  9908c12

  Copy full SHA for 9908c12

• changing the position

  XX-Yin

  committed
  f96674c

  Copy full SHA for f96674c

• set button not default

  XX-Yin

  committed
  d41edd4

  Copy full SHA for d41edd4

• ID typo

  XX-Yin

  committed
  04ccdaa

  Copy full SHA for 04ccdaa

• correcting syntax error

  XX-Yin

  committed
  1584c5d

  Copy full SHA for 1584c5d

• adding the start and end time

  XX-Yin

  committed
  1e49bb6

  Copy full SHA for 1e49bb6

• toggle the start button

  XX-Yin

  committed
  d4a7c90

  Copy full SHA for d4a7c90

• adding the optical tagging to the metadata

  XX-Yin

  committed
  c93233d

  Copy full SHA for c93233d

• updating the optical tagging metadata

  XX-Yin

  committed
  d8ef049

  Copy full SHA for d8ef049

• check empty

  XX-Yin

  committed
  a00681d

  Copy full SHA for a00681d

• changing the outputparameters

  XX-Yin

  committed
  ebd969c

  Copy full SHA for ebd969c

• check empty optical_tagging_par

  XX-Yin

  committed
  4204771

  Copy full SHA for 4204771

• deduplicate

  XX-Yin

  committed
  6fb44b6

  Copy full SHA for 6fb44b6

• updating the behavior GUI

  XX-Yin

  committed
  186a85d

  Copy full SHA for 186a85d

Commits on Dec 31, 2024

• adding random reward ui

  XX-Yin

  committed
  f278aa2

  Copy full SHA for f278aa2

• adding random reward to the toolbar

  XX-Yin

  committed
  6f73ef7

  Copy full SHA for 6f73ef7

• adding random reward to the behavior GUI

  XX-Yin

  committed
  39a9390

  Copy full SHA for 39a9390

• adding fields to the random reward panel

  XX-Yin

  committed
  0e4cc86

  Copy full SHA for 0e4cc86

• adding RandomRewardDialog

  XX-Yin

  committed
  52a5616

  Copy full SHA for 52a5616

• adding random reward to main

  XX-Yin

  committed
  0bcb5e8

  Copy full SHA for 0bcb5e8

• set checkable

  XX-Yin

  committed
  6144ee0

  Copy full SHA for 6144ee0

• set checkable

  XX-Yin

  committed
  f147fc2

  Copy full SHA for f147fc2

• open random reward

  XX-Yin

  committed
  fcc4536

  Copy full SHA for fcc4536

• connecting random reward

  XX-Yin

  committed
  b1ee7b8

  Copy full SHA for b1ee7b8

• deleting dialogs copy

  XX-Yin

  committed
  bc2c1b4

  Copy full SHA for bc2c1b4

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  11b47ef

  Copy full SHA for 11b47ef

• toggle color and disable/enable fields

  XX-Yin

  committed
  85c60f9

  Copy full SHA for 85c60f9

• _generate_random_conditions

  XX-Yin

  committed
  ebc2009

  Copy full SHA for ebc2009

• _start_random_reward

  XX-Yin

  committed
  478be08

  Copy full SHA for 478be08

• adding multiple functions

  XX-Yin

  committed
  804d68f

  Copy full SHA for 804d68f

• adding emergency stop

  XX-Yin

  committed
  64cfe5d

  Copy full SHA for 64cfe5d

• adding emergency stop

  XX-Yin

  committed
  d8d72d9

  Copy full SHA for d8d72d9

• move sleep to the end

  XX-Yin

  committed
  5cef84c

  Copy full SHA for 5cef84c

• adding RandomWater_Left and RandomWater_Right

  XX-Yin

  committed
  eecee5a

  Copy full SHA for eecee5a

• adding random water to bonsai workflow

  XX-Yin

  committed
  cc2136b

  Copy full SHA for cc2136b

• giving reward

  XX-Yin

  committed
  79e8ed2

  Copy full SHA for 79e8ed2

• adding RandomWaterVolume to water suggestion

  XX-Yin

  committed
  1b8bf2e

  Copy full SHA for 1b8bf2e

• adding timestamp

  XX-Yin

  committed
  109e7be

  Copy full SHA for 109e7be

• adding MainWindow

  XX-Yin

  committed
  6a3257b

  Copy full SHA for 6a3257b

• adding random volume to random_reward_par

  XX-Yin

  committed
  f9d9580

  Copy full SHA for f9d9580

• changing the emergency stop to start over

  XX-Yin

  committed
  0c63b5a

  Copy full SHA for 0c63b5a

• adding clear data button and function

  XX-Yin

  committed
  ac228e3

  Copy full SHA for ac228e3

• changing dataformat to float

  XX-Yin

  committed
  1c971d8

  Copy full SHA for 1c971d8

• typo

  XX-Yin

  committed
  b9c206d

  Copy full SHA for b9c206d

• typo

  XX-Yin

  committed
  f909be4

  Copy full SHA for f909be4

• typo

  XX-Yin

  committed
  4b48761

  Copy full SHA for 4b48761

• changing the name

  XX-Yin

  committed
  0018307

  Copy full SHA for 0018307

• wait for the thread to finish

  XX-Yin

  committed
  8fd2baf

  Copy full SHA for 8fd2baf

• updating the reward volume when the thread finishes

  XX-Yin

  committed
  cd9675f

  Copy full SHA for cd9675f

• removing print

  XX-Yin

  committed
  2bb5300

  Copy full SHA for 2bb5300

• using the spout name

  XX-Yin

  committed
  9bd313d

  Copy full SHA for 9bd313d

• adding save button

  XX-Yin

  committed
  e46c782

  Copy full SHA for e46c782

• not checkable

  XX-Yin

  committed
  dd4e628

  Copy full SHA for dd4e628

Commits on Jan 1, 2025

• saving the random reward results

  XX-Yin

  committed
  717b1d2

  Copy full SHA for 717b1d2

• adding 0.2

  XX-Yin

  committed
  90d6ee1

  Copy full SHA for 90d6ee1

• saving random reward parameters

  XX-Yin

  committed
  baff49a

  Copy full SHA for baff49a

• loading random reward parameters

  XX-Yin

  committed
  452861f

  Copy full SHA for 452861f

• removing copy

  XX-Yin

  committed
  4106637

  Copy full SHA for 4106637

• adding random reward stimulus

  XX-Yin

  committed
  9733096

  Copy full SHA for 9733096

• handle edge cases

  XX-Yin

  committed
  296bc9d

  Copy full SHA for 296bc9d

• Saving is permitted when we only have random reward stimulus

  XX-Yin

  committed
  5be817c

  Copy full SHA for 5be817c

• changing the logic

  XX-Yin

  committed
  ae8dbbd

  Copy full SHA for ae8dbbd

• adding random reward to the session metadata

  XX-Yin

  committed
  fe6276a

  Copy full SHA for fe6276a

• get software name ealier

  XX-Yin

  committed
  9a0e342

  Copy full SHA for 9a0e342

Commits on Jan 2, 2025

• changing name to start over

  XX-Yin

  committed
  7c40576

  Copy full SHA for 7c40576

• changing name to start over

  XX-Yin

  committed
  ac3defb

  Copy full SHA for ac3defb

• adding clear data button

  XX-Yin

  committed
  d85c14c

  Copy full SHA for d85c14c

• changing the button name to Restart

  XX-Yin

  committed
  81d5cc7

  Copy full SHA for 81d5cc7

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  4de97c1

  Copy full SHA for 4de97c1

• changing the name to Restart

  XX-Yin

  committed
  0b6e9ff

  Copy full SHA for 0b6e9ff

• format

  XX-Yin

  committed
  d5e6b60

  Copy full SHA for d5e6b60

• adding random reward water to total water

  XX-Yin

  committed
  523a3ee

  Copy full SHA for 523a3ee

• saving the data

  XX-Yin

  committed
  b168bf3

  Copy full SHA for b168bf3

• adding the MainWindow

  XX-Yin

  committed
  f3c4c54

  Copy full SHA for f3c4c54

• restart logging

  XX-Yin

  committed
  9bf33a7

  Copy full SHA for 9bf33a7

• saving the data

  XX-Yin

  committed
  4fd3d43

  Copy full SHA for 4fd3d43

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  ee7bdea

  Copy full SHA for ee7bdea

• adding logging type check

  XX-Yin

  committed
  cbac6f0

  Copy full SHA for cbac6f0

• removing check logging type -1

  XX-Yin

  committed
  fa63486

  Copy full SHA for fa63486

• changing to currentText

  XX-Yin

  committed
  04a92b1

  Copy full SHA for 04a92b1

• move sleep to the end

  XX-Yin

  committed
  40dbb9d

  Copy full SHA for 40dbb9d

• check the optical tagging time

  XX-Yin

  committed
  c1c733c

  Copy full SHA for c1c733c

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  c041268

  Copy full SHA for c041268

• adding start and end time

  XX-Yin

  committed
  dcc2f29

  Copy full SHA for dcc2f29

• force the input_voltage to be 0

  XX-Yin

  committed
  ffa6fca

  Copy full SHA for ffa6fca

• adding check reward collection combobox

  XX-Yin

  committed
  df5be08

  Copy full SHA for df5be08

• checking reward collection

  XX-Yin

  committed
  89d7766

  Copy full SHA for 89d7766

• adding label_show_2

  XX-Yin

  committed
  375c914

  Copy full SHA for 375c914

• updating the reward collection check

  XX-Yin

  committed
  6a7d998

  Copy full SHA for 6a7d998

• removing information 2

  XX-Yin

  committed
  25bec31

  Copy full SHA for 25bec31

• adding user stop

  XX-Yin

  committed
  5439cba

  Copy full SHA for 5439cba

• adding not

  XX-Yin

  committed
  6cc4bca

  Copy full SHA for 6cc4bca

• check finish of the thread

  XX-Yin

  committed
  bdcb8e7

  Copy full SHA for bdcb8e7

• check index

  XX-Yin

  committed
  5a69e12

  Copy full SHA for 5a69e12

• sleep again only when the start is checked

  XX-Yin

  committed
  c6a1a04

  Copy full SHA for c6a1a04

• continue if received licks

  XX-Yin

  committed
  7b245b1

  Copy full SHA for 7b245b1

• don't start a new thread

  XX-Yin

  committed
  2eddeb2

  Copy full SHA for 2eddeb2

• adding thread finish tag

  XX-Yin

  committed
  4ccb062

  Copy full SHA for 4ccb062

• waiting for the finish of the current cycle

  XX-Yin

  committed
  025c54d

  Copy full SHA for 025c54d

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  71cb684

  Copy full SHA for 71cb684

• synchronize

  XX-Yin

  committed
  1e48a18

  Copy full SHA for 1e48a18

• changing the start_time and end_time

  XX-Yin

  committed
  6c9c700

  Copy full SHA for 6c9c700

• changing the start time and end time

  XX-Yin

  committed
  e69ca51

  Copy full SHA for e69ca51

• return in empty start or end time

  XX-Yin

  committed
  22e7e0c

  Copy full SHA for 22e7e0c

• check left or right licks

  XX-Yin

  committed
  eb48e51

  Copy full SHA for eb48e51

• typo

  XX-Yin

  committed
  6061643

  Copy full SHA for 6061643

• adding side

  XX-Yin

  committed
  d650a2f

  Copy full SHA for d650a2f

• changing the name

  XX-Yin

  committed
  2b48714

  Copy full SHA for 2b48714

Commits on Jan 13, 2025

• don't save optical_tagging_par if empty

  XX-Yin

  committed
  3071ee2

  Copy full SHA for 3071ee2

Commits on Jan 29, 2025

• changing the trigger 100ms

  XX-Yin

  committed
  bab66db

  Copy full SHA for bab66db

• Merge branch 'empty_old_data' into optical_tagging

  XX-Yin

  committed
  4e0968d

  Copy full SHA for 4e0968d

• force to receive timestamp

  XX-Yin

  committed
  2817d3b

  Copy full SHA for 2817d3b

• updating comments

  XX-Yin

  committed
  b8ee212

  Copy full SHA for b8ee212

• typo

  XX-Yin

  committed
  9ae5420

  Copy full SHA for 9ae5420

• enable disable GiveLeft and GiveRight button

  XX-Yin

  committed
  ab3c6d0

  Copy full SHA for ab3c6d0

• Merge branch 'optical_tagging' into random-reward

  XX-Yin

  committed
  e20fc3d

  Copy full SHA for e20fc3d

• Initializing RandomWaterVolume

  XX-Yin

  committed
  a7700f9

  Copy full SHA for a7700f9

Commits on Mar 21, 2025

• load random reward parameters

  XX-Yin

  committed
  0622600

  Copy full SHA for 0622600

• Merge branch 'develop' into random-reward

  XX-Yin

  authored
  c23c6d2

  Copy full SHA for c23c6d2

• updating bonsai error due to resolve conflict

  XX-Yin

  committed
  e9bdb4f

  Copy full SHA for e9bdb4f