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

Acc-Models Creation #432

Merged
merged 89 commits into from
Dec 19, 2023
Merged

Acc-Models Creation #432

merged 89 commits into from
Dec 19, 2023

Commits on Jul 20, 2021

  1. try to print out some useful help messages

    @awegsche
    awegsche committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    b2e5a34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    2a14b04 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2021

  1. add fetchers 

    - help message
- show modifiers
    @awegsche
    awegsche committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    61c603d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    5b9a70a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2021

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    78e7d5b View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    87fffe9 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    7436659 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. comments, formatting, add CreatedModel

    @awegsche
    awegsche committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    d834c11 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    ab22144 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. comments, fix in CreatedModel

    @awegsche
    awegsche committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    81b0953 View commit details
    Browse the repository at this point in the history

  2. start restructuring lhc_model_creator to reflect acc-models 

    moving debug prints to logging
checked symlinking and folder creation
create empty knobs.txt at folder creation
    @awegsche
    awegsche committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    a4c133e View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. add require_param and refactor model creation

    @awegsche
    awegsche committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    b422e0c View commit details
    Browse the repository at this point in the history

  2. also print available accelerators in help message

    @awegsche
    awegsche committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    1a3408e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Refactoring model creation 

    - bringing parts of the process into the right order
- fixing tests
- non-existent modifiers are caught earlier than before, this breaks tests (change?)
- remove some obsolete code
    @awegsche
    awegsche committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    66f94e0 View commit details
    Browse the repository at this point in the history

  2. some comments

    @awegsche
    awegsche committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    4f69d02 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. no silence

    @awegsche
    awegsche committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    e720bf8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    00e2c05 View commit details
    Browse the repository at this point in the history

  3. error type

    @awegsche
    awegsche committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    fbab08e View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    f8213c2 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. add PSB model creation

    @awegsche
    awegsche committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    07c9642 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. refactoring PS and PSB modelcreation to use acc-models

    @awegsche
    awegsche committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    33af415 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. bugfixes, 

    - k1/kf
- clarification comments
    @awegsche
    awegsche committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    bd7f74a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Remove debug prints and wrong comments

    @awegsche
    awegsche committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    cc863ad View commit details
    Browse the repository at this point in the history

  2. formatting

    @awegsche
    awegsche committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    00cad93 View commit details
    Browse the repository at this point in the history

  3. improve comments and structure of PS base mask

    @awegsche
    awegsche committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    c7d382e View commit details
    Browse the repository at this point in the history

  4. Remove some more debug prints

    @awegsche
    awegsche committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    d6b835c View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. PsBase and PsBaseModelcreator

    @awegsche
    awegsche committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    cedbc32 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    1993827 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. query model creation args 

    and update lhc model creator to use this
    @awegsche
    awegsche committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    aeef18a View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. suppress output from base sequence loading in lhc

    @awegsche
    awegsche committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    3c4b6c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. add tests for new modelcreator

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    1488cca View commit details
    Browse the repository at this point in the history

  2. Path or String?

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    8c61d9e View commit details
    Browse the repository at this point in the history

  3. Set beam energy 

    - to be checked for relevance
- depends on the user actually setting the correct energy value in model creation
    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    6674d11 View commit details
    Browse the repository at this point in the history

  4. find integer tune

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    7e740f2 View commit details
    Browse the repository at this point in the history

  5. new modelcreator tests

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    a5094dd View commit details
    Browse the repository at this point in the history

  6. remove debug prints

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    03cc468 View commit details
    Browse the repository at this point in the history

  7. add input folders for modelcreation tests

    @awegsche
    awegsche committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    f57b5f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. revert beam energy setting (didn't work with fullesponse)

    @awegsche
    awegsche committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    74389ec View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. read acc-models from model_dir

    @awegsche
    awegsche committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    abe3d5b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. job filename by type (avoids overwriting)

    @awegsche
    awegsche committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    d967139 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. madx job filename fix

    @JoschD
    JoschD committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6beb318 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    9cc86d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Merge branch 'master' into model_creation_merged_with_master 

    # Conflicts:
#	omc3/model/accelerators/lhc.py
#	omc3/utils/iotools.py
    @JoschD
    JoschD committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    52cf37c View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch 'master' into model_creation_merged_with_master

    @JoschD
    JoschD committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    a27e7d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. HL acc-models lattice and fix for deprecated optics

    @awegsche
    awegsche committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    49133d1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    c945876 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge branch 'master' into model_creation_merged_with_master

    @JoschD
    JoschD committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    c578da5 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    4ce013a View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Merge branch 'master' into enhancement/292/modelcreation

    @awegsche
    awegsche committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    8c76af8 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Make model creator tests working

    @awegsche
    awegsche committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    a9f7e6e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. make best knowledge test extended

    @awegsche
    awegsche committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    92f025a View commit details
    Browse the repository at this point in the history

  2. maybe get

    @awegsche
    awegsche committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    c58d496 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. formatting

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    2a2a6dc View commit details
    Browse the repository at this point in the history

  2. remove ps test

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4466fb3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'enhancement/292/modelcreation' into model_creation_merg… 

    …ed_with_master
    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a714e6c View commit details
    Browse the repository at this point in the history

  4. Move knobs.madx creation to model_creator

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a7e7cfa View commit details
    Browse the repository at this point in the history

  5. Add clones to workflows extended and coverage

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c9bfed4 View commit details
    Browse the repository at this point in the history

  6. no best knowledge tests yet

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    1a8e796 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into model_creation_merged_with_master

    @awegsche
    awegsche authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    7f1beea View commit details
    Browse the repository at this point in the history

  8. remove lattice files

    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c755e1e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'model_creation_merged_with_master' of github.com:pylhc/… 

    …omc3 into model_creation_merged_with_master
    @awegsche
    awegsche committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    1d19e18 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. add ps test

    @awegsche
    awegsche committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    41726e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. add test for parsertools

    @awegsche
    awegsche committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    11f782a View commit details
    Browse the repository at this point in the history

  2. test missing best knowledge for PS/PSB

    @awegsche
    awegsche committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    1a4d4b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. remove debug prints

    @awegsche
    awegsche committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    668a595 View commit details
    Browse the repository at this point in the history

  2. not (a or b) = not a and not b

    @awegsche
    awegsche committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    ae7aa72 View commit details
    Browse the repository at this point in the history

  3. removed unused code

    @awegsche
    awegsche committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    6dd9fc3 View commit details
    Browse the repository at this point in the history

  4. Added doc to accel model creators 

    - explaining how they should behave for certain kinds of options (e.g.
  print help)
    @awegsche
    awegsche committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    cb1c86f View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. move git clones to fixture 

    - and fix PS test (2018 tune matching doesn't work)
    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    be24451 View commit details
    Browse the repository at this point in the history

  2. add gitpython as dependency 

    - written by AI, not sure it it's the right version
    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    7f9b4e3 View commit details
    Browse the repository at this point in the history

  3. remove prints

    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    be6baf4 View commit details
    Browse the repository at this point in the history

  4. Add best_knowledge_model test

    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    28c584c View commit details
    Browse the repository at this point in the history

  5. Check best knowledge creation

    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    478df4a View commit details
    Browse the repository at this point in the history

  6. moved B2 root to constants

    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    dd9e78b View commit details
    Browse the repository at this point in the history

  7. Add doc to check_folder_choices

    @awegsche
    awegsche committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    1ad7592 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. add cli tests

    @awegsche
    awegsche committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    6a93665 View commit details
    Browse the repository at this point in the history

  2. add a few more tests

    @awegsche
    awegsche committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f023e00 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. SKEKB tests

    @awegsche
    awegsche committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7127d76 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @awegsche
    awegsche committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1db6ee6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into model_creation_merged_with_master

    @awegsche
    awegsche authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    04e5be0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'model_creation_merged_with_master' of github.com:pylhc/… 

    …omc3 into model_creation_merged_with_master
    @awegsche
    awegsche committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5e05d96 View commit details
    Browse the repository at this point in the history

  5. version bump and changelog

    @awegsche
    awegsche committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    05dbb00 View commit details
    Browse the repository at this point in the history

  6. add explanation for the modifier tag

    @awegsche
    awegsche committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7f89fd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. implemented suggestions

    @awegsche
    awegsche committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    514034e View commit details
    Browse the repository at this point in the history

  2. pyright missed one replace

    @awegsche
    awegsche committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    800d355 View commit details
    Browse the repository at this point in the history

  3. restructure acc-models check in from_model_dir

    @awegsche
    awegsche committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    9a8873b View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. comment about PS tunematching <= 2018

    @awegsche
    awegsche committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5f692e8 View commit details
    Browse the repository at this point in the history

  2. implemented suggestion on docstring

    @awegsche
    awegsche committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    0ba0a6d View commit details
    Browse the repository at this point in the history

  3. add (flaky) exception checks

    @awegsche
    awegsche committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    4099470 View commit details
    Browse the repository at this point in the history