Skip to content

Integration junk removal#18

Merged
viktorpm merged 132 commits intomainfrom
integration-junk-removal
Sep 29, 2025
Merged

Integration junk removal#18
viktorpm merged 132 commits intomainfrom
integration-junk-removal

Conversation

@viktorpm
Copy link
Member

@viktorpm viktorpm commented May 9, 2025

Description

This PR integrates:

  • New behavioral protocols and changes from 2_step_soundcat_arpit
  • Repository cleanup and early refactoring from junk-removal
  • All recent updates from main to ensure no regressions

This replaces and extends #17 , which has been closed to consolidate all work in one clean integration branch.

Type of Change

  • Bug fix
  • New feature
  • Documentation update
  • Breaking change
  • Other (please specify): removing unused files, folders

Checklist

  • I have tested the changes locally.
  • I have updated the documentation accordingly.
  • I have added necessary tests to cover the changes.
  • I have followed the code style guidelines.
  • I have verified that the code works in all target environments.
  • I have made sure the technicians are comfortable using the new feature (if applicable).

Related Issues

Closes # (issue number)

ArpitAgarwal and others added 30 commits March 18, 2025 15:59
…ted training stages, renamed overall performance section to sessionperformance with some added data to be tracked over sessions and among others
… stage for running session with user setting.
…ser action. Need to remove the changes in stage 1.
…f runtime error of same name of varivale and function
…ted a new file for loading the automated training.
viktorpm added 11 commits May 14, 2025 08:57
… ExperPort cleanup effort to better organize deprecated protocols
…de to legacy

Moved olfactory-related analysis code and protocols to their respective legacy folders:

Analysis/legacy/:
- Odor_Segm/
- Odor2AFC/
- NL2AFC_MIX/
- state_colors_olf.m

Protocols/legacy/:
- @gf2afcobj (uses OdorNames.mat)

Other related protocols (@odorsegm2obj, @odorsegm3obj, @odorsegmobj, @adil2afcobj)
were already in legacy from previous olfip.mat related moves.

This change helps organize deprecated olfactory-related code while preserving
it for reference. The .mat files themselves remain in place as they may be
needed by other components.
Moved two categories of files to ExperPort/legacy:

1. Confirmed unused files:
- start_script.m
- beginit.m
- remove_protocol_preferences.m
- reporter.m
- RPbox_realbox.m
- ExperRPBox.m
- ExperStart.m
- ExperValveCheck.m

2. Files requiring further investigation:
- end_script.m
- RExper.m

These files have no direct references in the active codebase or have limited/indirect usage.
Moving them to legacy preserves the code while cleaning up the main directory.
Files requiring investigation will be analyzed further before any potential removal.
@viktorpm viktorpm force-pushed the integration-junk-removal branch from 0758942 to 30b6855 Compare May 15, 2025 11:36
viktorpm and others added 5 commits May 15, 2025 13:14
Moved the following .mat files to the ExperPort/legacy directory:
- olfip.mat
- bgnames.mat
- OdorNames.mat
- OdorSet.mat

This completes the previous refactoring efforts where we moved the protocols and
analysis code that depend on these files to legacy folders (commits 1c8b5d7, b714b18).
The .mat files were initially kept in place to prevent potential disruption, but
after verification that no active code depends on them, they are now properly
moved to the legacy directory.

This change improves the organization of the codebase by ensuring all deprecated
olfactory-related components are consistently stored in legacy folders.
@viktorpm viktorpm marked this pull request as ready for review May 15, 2025 14:00
@viktorpm viktorpm merged commit beacbf9 into main Sep 29, 2025
3 checks passed
@viktorpm viktorpm deleted the integration-junk-removal branch September 29, 2025 17:16
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