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.

Sign up for GitHub

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

Jump to bottom

Creating a new fitting toolkit and examples of how to use it with Screen Profiles. #143

Draft
wants to merge 41 commits into
base: main
Choose a base branch
from
Draft

Creating a new fitting toolkit and examples of how to use it with Screen Profiles. #143

wants to merge 41 commits into from

Commits on Mar 12, 2024

  1. init commit of screen_beam_profile.py and supporting python files (p… 

    …rojection_fit and roi), also updated image_processing.py
    @phys-cgarnier
    phys-cgarnier committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    79ac28f View commit details
    Browse the repository at this point in the history

  2. same

    @phys-cgarnier
    phys-cgarnier committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    49088e7 View commit details
    Browse the repository at this point in the history

  3. updated measurement.py, renamed test_screen_beam_profile, added test… 

    …_measurements.py
    @phys-cgarnier
    phys-cgarnier committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    eacda2a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. initial commit of screen_beam_profile measurement and test notebook, … 

    …plan is to build out screen_beam_profile and make test notebook a unit test.
    @phys-cgarnier
    phys-cgarnier committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    204e14d View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. gave docstring to measurement.py simplified test_measurement.ipynb

    @phys-cgarnier
    phys-cgarnier committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    4545cc3 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. updating doc strings, and very minor details of python files

    @phys-cgarnier
    phys-cgarnier committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    8a6adcd View commit details
    Browse the repository at this point in the history

  2. updated return structure of screen_beam_profile_measurement.py, and a… 

    …dded to the test and example for screen_beam_profile_measurement.py
    @phys-cgarnier
    phys-cgarnier committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    732a972 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge branch 'dev' of https://github.com/phys-cgarnier/lcls-tools int… 

    …o dev
    @phys-cgarnier
    phys-cgarnier committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a402fd8 View commit details
    Browse the repository at this point in the history

  2. removed unused dependencies in an attemp to resolve some flake8 errors

    @phys-cgarnier
    phys-cgarnier committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a9ed3d6 View commit details
    Browse the repository at this point in the history

  3. more issues with flake8

    @phys-cgarnier
    phys-cgarnier committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    26fc338 View commit details
    Browse the repository at this point in the history

  4. more flake8

    @phys-cgarnier
    phys-cgarnier committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4b0523b View commit details
    Browse the repository at this point in the history

  5. black was unresolving some flake8 errors.... fixed that

    @phys-cgarnier
    phys-cgarnier committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b14877e View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. changed return type type hinting for projection_fit.fit_projection si… 

    …nce there is a conflict with python 3.8
    @phys-cgarnier
    phys-cgarnier committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    f2f0cb3 View commit details
    Browse the repository at this point in the history

  2. changed return type type hinting for projection_fit.fit_projection si… 

    …nce there is a conflict with python 3.8
    @phys-cgarnier
    phys-cgarnier committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    50d6263 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. cleaning up code for PR

    @phys-cgarnier
    phys-cgarnier committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c4b347a View commit details
    Browse the repository at this point in the history

  2. added docstrings in screenbeamprofile measurement started tests for r… 

    …oi and image processor
    @phys-cgarnier
    phys-cgarnier committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f955c01 View commit details
    Browse the repository at this point in the history

  3. updating unittests for test_image_processing and test_roi, still not … 

    …quite done
    @phys-cgarnier
    phys-cgarnier committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    44223a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. updated files to have TODO comments, also completed test_image_proces… 

    …sing and test_roi
    @phys-cgarnier
    phys-cgarnier committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    363ed99 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. updating code to no longer use distribution_data but instead use prof… 

    …ile_data, working through request to change self.init_values in methodBase from a list a dictionary
    @phys-cgarnier
    phys-cgarnier committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    713c324 View commit details
    Browse the repository at this point in the history

  2. implemented init_values dictionary correctly.

    @phys-cgarnier
    phys-cgarnier committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a576c0a View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. code is in broken state made a branch to save changes but revert back… 

    … to working code on main
    @phys-cgarnier
    phys-cgarnier committed May 7, 2024
    Configuration menu
    Copy the full SHA
    89dba3d View commit details
    Browse the repository at this point in the history

  2. cleaning example notebook

    @phys-cgarnier
    phys-cgarnier committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f343813 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. committing working version (plots included) resolved bug, next commit… 

    … will be used in merge
    @phys-cgarnier
    phys-cgarnier committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9ee6c08 View commit details
    Browse the repository at this point in the history

  2. setup fitting_tool.plot_fit()

    @phys-cgarnier
    phys-cgarnier committed May 8, 2024
    Configuration menu
    Copy the full SHA
    36a46bb View commit details
    Browse the repository at this point in the history

  3. merged feature requests discussed in PR notes

    @phys-cgarnier
    phys-cgarnier committed May 8, 2024
    Configuration menu
    Copy the full SHA
    76af0d6 View commit details
    Browse the repository at this point in the history

  4. moved example_measurement to examples folder

    @phys-cgarnier
    phys-cgarnier committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9ad190e View commit details
    Browse the repository at this point in the history

  5. changed model._forward to use scipy.stats.norm, fit looks okay, shoul… 

    …d maybe make norm a private variable of gaussModel.py and stop using _forward as a staticmethod
    @phys-cgarnier
    phys-cgarnier committed May 8, 2024
    2 Configuration menu
    Copy the full SHA
    92f4011 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. updated test_image_processing to include clipping, removed visualizat… 

    …iob pydantic fields.
    @phys-cgarnier
    phys-cgarnier committed May 10, 2024
    Configuration menu
    Copy the full SHA
    631541d View commit details
    Browse the repository at this point in the history

  2. ran black

    @phys-cgarnier
    phys-cgarnier committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e5cb4bf View commit details
    Browse the repository at this point in the history

  3. removed whitespace and unused dependencies

    @phys-cgarnier
    phys-cgarnier committed May 10, 2024
    Configuration menu
    Copy the full SHA
    69349b8 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. reorg fit methods, changed base model init to require data when class… 

    … is called
    @nneveu
    nneveu committed May 12, 2024
    Configuration menu
    Copy the full SHA
    5be4f7c View commit details
    Browse the repository at this point in the history

  2. fixing formatting

    @nneveu
    nneveu committed May 12, 2024
    Configuration menu
    Copy the full SHA
    84abf86 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. one more rename of fitting files before PR

    @nneveu
    nneveu committed May 14, 2024
    Configuration menu
    Copy the full SHA
    8b8b645 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. gaussian fit updates + test

    @nneveu
    nneveu committed May 15, 2024
    Configuration menu
    Copy the full SHA
    611eda1 View commit details
    Browse the repository at this point in the history

  2. made changes to GaussianModel find init values.

    @phys-cgarnier
    phys-cgarnier committed May 15, 2024
    Configuration menu
    Copy the full SHA
    29eef37 View commit details
    Browse the repository at this point in the history

  3. skipped tests in test_methods.py will fix

    @phys-cgarnier
    phys-cgarnier committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0523fe2 View commit details
    Browse the repository at this point in the history

  4. fixed flake8 syntax errors

    @phys-cgarnier
    phys-cgarnier committed May 15, 2024
    Configuration menu
    Copy the full SHA
    382e502 View commit details
    Browse the repository at this point in the history

  5. fixed flake8 syntax errors

    @phys-cgarnier
    phys-cgarnier committed May 15, 2024
    Configuration menu
    Copy the full SHA
    4ad8f45 View commit details
    Browse the repository at this point in the history

  6. fixed flake8 syntax errors

    @phys-cgarnier
    phys-cgarnier committed May 15, 2024
    Configuration menu
    Copy the full SHA
    964bcd8 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. committing changes made during previous meeting

    @phys-cgarnier
    phys-cgarnier committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f686f49 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. added kwargs to projection.plot_fit so that user can compare projecti… 

    …on to fit without displaying normalized values, changed fit_model method in scipy.optimize.minimize from default (BFGS) to Powell
    @phys-cgarnier
    phys-cgarnier committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8c85a56 View commit details
    Browse the repository at this point in the history