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

[FCCee] Centralize beampipe geometries in an MDI folder #344

Merged
merged 26 commits into from
Jul 19, 2024
Merged

[FCCee] Centralize beampipe geometries in an MDI folder #344

merged 26 commits into from
Jul 19, 2024

Commits on May 30, 2024

  1. CAD files for beampipe added

    @aciarma
    aciarma committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5f51f0e View commit details
    Browse the repository at this point in the history

  2. added materials for CAD beampipe, added CAD beampipe to main xml, add… 

    …ed solenoids + FFQs fields
    @aciarma
    aciarma committed May 30, 2024
    Configuration menu
    Copy the full SHA
    c9eed51 View commit details
    Browse the repository at this point in the history

  3. forgot dimensions for FFQs and solenoid

    @aciarma
    aciarma committed May 30, 2024
    Configuration menu
    Copy the full SHA
    e5ffc7a View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. move /CADbeampipe to /MDI

    @aciarma
    aciarma committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4e4e66a View commit details
    Browse the repository at this point in the history

  2. changed path of CAD pipe in ALLEGRO_o1_v03.xml

    @aciarma
    aciarma committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a1f423b View commit details
    Browse the repository at this point in the history

  3. solving conflicts

    @aciarma
    aciarma committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f16a479 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'key4hep-main' into CADpipe2 

    sync with main
    @aciarma
    aciarma committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    6d5434f View commit details
    Browse the repository at this point in the history

  5. add CAD pipe to IDEA

    @aciarma
    aciarma committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    bb2052e View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. fixed duplicate variables and commented out FFQ fields in ALLEGRO_o1_… 

    …v01.xml
    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    e641538 View commit details
    Browse the repository at this point in the history

  2. fixed tests

    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d241139 View commit details
    Browse the repository at this point in the history

  3. Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml 

    Co-authored-by: Andre Sailer <andre.philippe.sailer@cern.ch>
    @aciarma @andresailer
    aciarma and andresailer authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    0fad5ae View commit details
    Browse the repository at this point in the history

  4. Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml 

    Co-authored-by: Andre Sailer <andre.philippe.sailer@cern.ch>
    @aciarma @andresailer
    aciarma and andresailer authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    98090ee View commit details
    Browse the repository at this point in the history

  5. Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml 

    Co-authored-by: Andre Sailer <andre.philippe.sailer@cern.ch>
    @aciarma @andresailer
    aciarma and andresailer authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    64f3592 View commit details
    Browse the repository at this point in the history

  6. Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml 

    Co-authored-by: Andre Sailer <andre.philippe.sailer@cern.ch>
    @aciarma @andresailer
    aciarma and andresailer authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    799807d View commit details
    Browse the repository at this point in the history

  7. remove old beam pipe compacts, remove duplicate HCAL barrel import in… 

    … ALLEGRO
    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    358ac33 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'CADpipe2' of github.com:aciarma/k4geo into CADpipe2

    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    c6a2f0a View commit details
    Browse the repository at this point in the history

  9. remove beampipe.xml from ALLEGRO main

    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    72880e0 View commit details
    Browse the repository at this point in the history

  10. removed ALLEGRO_o1_v01/HOMAbsorber.xml

    @aciarma
    aciarma committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    8a91c1a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. changed Material01 to IronDens785

    @aciarma
    aciarma committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3dcb103 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. added MDI_o1_v00 and fixed READMEs

    @aciarma
    aciarma committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    de1406a View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. add back the shape based beampipe on IDEA and ALLEGRO

    @aciarma
    aciarma committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c9566cb View commit details
    Browse the repository at this point in the history

  2. removed stl files, README updated

    @aciarma
    aciarma committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    594fa9a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge branch 'master' into CADpipe2

    @aciarma
    aciarma committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    a014a0f View commit details
    Browse the repository at this point in the history

  2. Update FCCee/MDI/compact/README.md 

    Co-authored-by: Brieuc Francois <brieuc.francois@cern.ch>
    @aciarma @BrieucF
    aciarma and BrieucF authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    a7c8b9c View commit details
    Browse the repository at this point in the history

  3. Update FCCee/ALLEGRO/compact/README.md 

    Co-authored-by: Brieuc Francois <brieuc.francois@cern.ch>
    @aciarma @BrieucF
    aciarma and BrieucF authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    affc2cb View commit details
    Browse the repository at this point in the history

  4. fixed pipe dimensions for ALLEGRO

    @aciarma
    aciarma committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    4223801 View commit details
    Browse the repository at this point in the history