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

Importing CLD models from FCCDetectors, new CLD Model with overlaps fixed #280

Merged
merged 53 commits into from
Aug 23, 2023
Merged

Importing CLD models from FCCDetectors, new CLD Model with overlaps fixed #280

merged 53 commits into from
Aug 23, 2023

Commits on Aug 22, 2023

  1. FCCee_o1_v06: start new CLD model for fixing overlaps

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    744a61b View commit details
    Browse the repository at this point in the history

  2. FCCee_o1_v06: update desription

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    158cb76 View commit details
    Browse the repository at this point in the history

  3. FCCee_o1_v06: fix overlap in vertex detector envelop

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6b49404 View commit details
    Browse the repository at this point in the history

  4. FCC_o2_v03: copy of FCCDetectors FCCee_o2_v02

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3741f79 View commit details
    Browse the repository at this point in the history

  5. FCC_o2_v03: HCalBarrel: make like original file

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    1c8deb5 View commit details
    Browse the repository at this point in the history

  6. FCC_o2_v03: Dimensions: layout like FCC_o2_v02 

    The vertex and beampipe radii are larger than they should be for an option 2 model
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    491c995 View commit details
    Browse the repository at this point in the history

  7. FCC_o2_v03: Vertex rename, parameters are for larger Vertex Detector

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    270e69d View commit details
    Browse the repository at this point in the history

  8. FCC_o2_v04: Based on FCCDetectors FCCee_o2_v03

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    da27dbd View commit details
    Browse the repository at this point in the history

  9. FCC_o2_v04: rename to old versioned filenames

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    58eed10 View commit details
    Browse the repository at this point in the history

  10. FCC_o2_v04: re-align yokeendcap

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    03eb2f5 View commit details
    Browse the repository at this point in the history

  11. FCC_o2_v04: re-align YokeBarrel

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    d9bb125 View commit details
    Browse the repository at this point in the history

  12. FCC_o2_v04: re-align ECalBarrel

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    26ada27 View commit details
    Browse the repository at this point in the history

  13. FCC_o2_v04: re-align ECalEndcap

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    78ee0c0 View commit details
    Browse the repository at this point in the history

  14. FCC_o2_v04: re-align HCalBarrel

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    8d15c58 View commit details
    Browse the repository at this point in the history

  15. FCC_o2_v04: re-align HCalEndcap

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    74f40b5 View commit details
    Browse the repository at this point in the history

  16. FCC_o2_v04: re-align InnerTracker

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6fba948 View commit details
    Browse the repository at this point in the history

  17. FCC_o2_v04: re-align OuterTracker

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    d0a8e29 View commit details
    Browse the repository at this point in the history

  18. FCC_o2_v04: re-align Solenoid

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3ee90b7 View commit details
    Browse the repository at this point in the history

  19. FCC_o2_v04: re-align LumiCal

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    b05a78e View commit details
    Browse the repository at this point in the history

  20. FCC_o2_v04: vertex detector: re-align and restructure for easier diff… 

    … to layout in FCCee_o2_v02

The vertex detector layer sizes were scaled down to preserve angular converage.
Width was preserved from FCCee_o1_v0X, but number of ladders was reduced in the first layer
First radius also differs 1.3cm vs 1.25cm in FCCee_o2_v04
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    808844b View commit details
    Browse the repository at this point in the history

  21. FCC_o2_v04: add BeamPipe from FCCDetectors common

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e347517 View commit details
    Browse the repository at this point in the history

  22. FCC_o2_v04: re-aling beam-pipe for better comparison

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    03a8116 View commit details
    Browse the repository at this point in the history

  23. FCC_o2_v04: beampipe more alignment with previous beampipe, just whit… 

    …espace, dropping commented parts
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e068440 View commit details
    Browse the repository at this point in the history

  24. FCC_o2_v04: Beampipe: add/replace from SRShielding.xml, essentially u… 

    …ncommenting that part of the XML again
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a819bb3 View commit details
    Browse the repository at this point in the history

  25. FCC_o2_v04: beampipe: drop random whitespace, align with DD4hep mask … 

    …(lowercase phi), rotationX
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    abf3bad View commit details
    Browse the repository at this point in the history

  26. FCC_o2_v04: beaminstrumentation, HOMAbsorber, copy from FCCDetectors,… 

    … align with existing
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ec8e80e View commit details
    Browse the repository at this point in the history

  27. FCCee_o2_v04: remove HOMAbsorber, no longer needed for low-impedance … 

    …beam pipe
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ed34257 View commit details
    Browse the repository at this point in the history

  28. FCC_o2_v04: SRShield is part of the beampipe, NOTE the Overlap! use B… 

    …eamInstrumentation
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    428db40 View commit details
    Browse the repository at this point in the history

  29. FCCee_o2_v04: add final focus quadrupoles

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    0322132 View commit details
    Browse the repository at this point in the history

  30. CLD: add Readme for different versions

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    10b731c View commit details
    Browse the repository at this point in the history

  31. CLD_o2_v05: start based o FCCee_o2_v05

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a549da8 View commit details
    Browse the repository at this point in the history

  32. CLD_o2_v05: rename base file

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    97ad390 View commit details
    Browse the repository at this point in the history

  33. CLD_o2_v05: adapt detector description

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3749f88 View commit details
    Browse the repository at this point in the history

  34. CLD_o2_v05: HOMAbsorber not needed for low-impedance beampipe

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    8e33866 View commit details
    Browse the repository at this point in the history

  35. CLD_o2_v05: Rename in view of coming changes

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    872d552 View commit details
    Browse the repository at this point in the history

  36. FCCee_o2_v04: mark that VXD and beampipe are different

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e7d89f8 View commit details
    Browse the repository at this point in the history

  37. CLD_o2_v05: implement beam pipe model

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    b4c2d49 View commit details
    Browse the repository at this point in the history

  38. CLD_o2_v05: new Vertex detector layout, respecting constraints from l… 

    …umical and beampipe design with parafin cooling
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ce83584 View commit details
    Browse the repository at this point in the history

  39. CLD_o2_v05: beampipe layout, so far so good

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4995c9f View commit details
    Browse the repository at this point in the history

  40. CLD_o2_v05: VertexDetector: tweak envelope to remove overlap with bea… 

    …mpipe
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    531d4c2 View commit details
    Browse the repository at this point in the history

  41. CLD_o2_v05: Beampipe: implement beampipe as far as we understand 

    The geant version in LCG_103 prints some verbose warnings about the
fourth TA Shield, this seems to be spurious and due to a faulty check
of rmin vs rmax? This only happens when the detector is drawn.
Overlap check is clean
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    42cc5e7 View commit details
    Browse the repository at this point in the history

  42. CLD_o2_v05: Beampipe: add AlBeMet and A paraffin (G4_Paraffin), to be… 

    … clarified
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    93ecaae View commit details
    Browse the repository at this point in the history

  43. CLD_o2_v05: InnerTracker: re-implement Envelope as PolyCone 

    Fix overlap of modules going outside the envelope by reducing the inner clearance to 149 mrad half opening angle
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a80dc41 View commit details
    Browse the repository at this point in the history

  44. CLD_o2_v05: InnerTracker: fix overlap of some modules 

    The number of modules around phi has to be the same for all radii, use the correct module to cover the complete phi angle
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    343c4db View commit details
    Browse the repository at this point in the history

  45. CLD_o2_v05: OuterTracker: fix overlap in EndcapSupport: layer4 was go… 

    …ing to too large radius
    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4fd0962 View commit details
    Browse the repository at this point in the history

  46. CLD_o2_v05: rename inner and outer tracker to mark changes

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    50dccff View commit details
    Browse the repository at this point in the history

  47. CLD_o2_v05: add to README

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c2b939d View commit details
    Browse the repository at this point in the history

  48. CLD_o2_v05: rename vertex detector to unique name

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    fc2db0f View commit details
    Browse the repository at this point in the history

  49. CLD_o2_v05: use the correct paraffin for the BeamPipe

    @andresailer
    andresailer committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    30cb11c View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. CLD_o2_v05: use three rings for vertex detector beampipe instead of a… 

    …verage material
    @andresailer
    andresailer committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    52f6586 View commit details
    Browse the repository at this point in the history

  2. CLD_o2_v05: Vertex: move to 1.3 mm from beam pipe

    @andresailer
    andresailer committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    eff894d View commit details
    Browse the repository at this point in the history

  3. CLD_o2_v05: BeamPipe: use variables for central chamber thicknesses

    @andresailer
    andresailer committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    f21f12d View commit details
    Browse the repository at this point in the history

  4. Tests: replace fccee tests with test for CLD_o2_v05

    @andresailer
    andresailer committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    85627ca View commit details
    Browse the repository at this point in the history