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

Dev #62

Merged
merged 141 commits into from
Jan 9, 2025
Merged

Dev #62

merged 141 commits into from
Jan 9, 2025

Conversation

jonathanoesterle
Copy link
Collaborator

No description provided.

jonathanoesterle and others added 28 commits October 28, 2024 14:09
# Conflicts:
#	djimaging/autorois/roi_canvas.py
#	djimaging/schemas/full_rgc_autorois_schema.py
#	djimaging/schemas/tutorial_schema.py
#	djimaging/tables/classifier/baden16_traces.py
#	djimaging/tables/classifier/rgc_classifier.py
#	djimaging/tables/clustering/clustering.py
#	djimaging/tables/clustering/decomposition.py
#	djimaging/tables/color_flicker/center_surround.py
#	djimaging/tables/core/experiment.py
#	djimaging/tables/core/field.py
#	djimaging/tables/core/preprocesstraces.py
#	djimaging/tables/core/presentation.py
#	djimaging/tables/core/snippets.py
#	djimaging/tables/core/stimulus.py
#	djimaging/tables/core/userinfo.py
#	djimaging/tables/core_autorois/field.py
#	djimaging/tables/core_autorois/presentation.py
#	djimaging/tables/ipl/ipl.py
#	djimaging/tables/location/location.py
#	djimaging/tables/misc/brightness.py
#	djimaging/tables/misc/corr_map.py
#	djimaging/tables/misc/highresolution.py
#	djimaging/tables/misc/light_artifact.py
#	djimaging/tables/receptivefield/__init__.py
#	djimaging/tables/receptivefield/glm.py
#	djimaging/tables/receptivefield/noise_traces.py
#	djimaging/tables/receptivefield/rf_properties.py
#	djimaging/tables/receptivefield/rf_utils.py
#	djimaging/tables/receptivefield/sta.py
#	djimaging/tables/response/__init__.py
#	djimaging/tables/response/chirp/chirp_features_bc.py
#	djimaging/tables/response/chirp/chirp_features_rgc.py
#	djimaging/tables/response/chirp/chirp_qi.py
#	djimaging/tables/response/csl.py
#	djimaging/tables/response/orientation_v1.py
#	djimaging/tables/response/orientation_v2.py
#	djimaging/tables/response/sinespot/sinespot_features.py
#	djimaging/tables/response/sinespot/sinespot_qi.py
#	djimaging/tables/rf_glm/__init__.py
#	djimaging/tables/selection/roi_filter.py
#	djimaging/utils/datafile_utils.py
#	djimaging/utils/image_utils.py
#	djimaging/utils/mask_utils.py
#	djimaging/utils/plot_utils.py
#	djimaging/utils/receptive_fields/plot_rf_utils.py
#	djimaging/utils/receptive_fields/spatial_rf_utils.py
#	djimaging/utils/scanm_utils.py
#	setup.cfg
#	tests/tables/test_orientation.py
#	tests/utils/test_scanm_utils.py
@jonathanoesterle jonathanoesterle merged commit dbc5757 into master Jan 9, 2025
4 checks passed
@jonathanoesterle jonathanoesterle deleted the dev branch January 9, 2025 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants