Skip to content
Snippets Groups Projects

Full implementation of the twisted trapezoid shape

Merged Marilena Bandieramonte requested to merge geomodelkernel-twistedtrap into master

This merge request introduces a new shape in GeoModel: GeoTwistedTrap that is based on G4TwistedTrap shape. Correspondingly GDMLtoGM is updated with a handler for GeoTwistedTrap, and GeoModel2G4 can recognise the GeoTwistedTrap and create a G4TwistedTrap from it. Persistification of this shape is implemented in GeoModelRead and GeoModelWrite and DumpShape of GMEX. The visualisation in GMEX of the twisted trapezoid is handled by SbPolyhedrizeAction, SoVisualizeAction and SbPolyhedron classes. In particular some new classes have been introduced (SbTwistSurface, SbTwistTrapParallelSide, SbTwistTrapAlphaSide and SbTwistTrapFlatSide) for a better rendering of the twisted trapezoid within gmex.

It solves issue #8 (closed)

Edited by Marilena Bandieramonte

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 /*
2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
  • 1 1 /*
    2 2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
  • 1 1 /*
    2 2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
  • Thanks for the new shape, @mbandier! I think the MR is OK. I only left minor comments (and perhaps spot a potential typo, which you should verify).

    You could also update the documentation section on "Shapes", adding the new one:

    Thanks again, -- Ric.

  • added 12 commits

    • 39807531 - 1 commit from branch master
    • 2068d75c - This commit implements GeoTwistedTrap shape, based on the G4TwistedTrap class
    • cb069f61 - Code cosmetics
    • 239d2df9 - Add the twistedTrapHandler for GDMLtoGM
    • a3212e2a - Add GeoTwistedTrap to GeoModelRead and GeoModelWrite
    • 0f2097a9 - Add the GeoPolyhedronTwistedTrap, with respective GeoPolyhedrizeAction,...
    • fc7dd639 - Add TwistedTrap to GMEX
    • 11c5a0ba - DumpShape of GMEX handle the TwistedTrap case
    • 92f0935b - Add correct visualization of a twisted trapezoids.
    • d04797e4 - Introduce new more realistic visualization of TwistedTrapezoid
    • 10df95ab - Finalize visualization of TwistedTrapezoid with twisted surfaces
    • f829fdf7 - Code cosmetics

    Compare with previous version

  • added 2 commits

    • 4a1905dd - Atlas copyright update + code cosmetics
    • 5c4a34a5 - Add comment to code implementing the less precise way of rendering a twisted trap

    Compare with previous version

  • Hi @rbianchi, many thanks for reviewing this MR! I just pushed a new version that implements the changes that we discussed. I will correspondingly update the GeoModel documentation and add the new shape, thanks for the pointers!

    Cheers -- Marilena

    Edited by Marilena Bandieramonte
  • Thanks to you, @mbandier, for the very nice addition to GeoModel!!

  • added 1 commit

    • 5e4d850b - Bugfix in GeoTwistedTrap, tilt angle

    Compare with previous version

  • added 1 commit

    • e00dd24b - Add check on correctness of parameters for the GeoTwistedTrap

    Compare with previous version

  • added 1 commit

    • fd97f11b - Make sure that the twist angle is never equal to zero, to avoid division by zero

    Compare with previous version

  • added 76 commits

    • fd97f11b...2a9731e0 - 59 commits from branch master
    • 0ae7b8d4 - This commit implements GeoTwistedTrap shape, based on the G4TwistedTrap class
    • ec7c8162 - Code cosmetics
    • 525c4189 - Add the twistedTrapHandler for GDMLtoGM
    • c0f0daf2 - Add GeoTwistedTrap to GeoModelRead and GeoModelWrite
    • 097b643c - Add the GeoPolyhedronTwistedTrap, with respective GeoPolyhedrizeAction,...
    • 42e4b192 - Add TwistedTrap to GMEX
    • c65c119a - DumpShape of GMEX handle the TwistedTrap case
    • 4eedca1f - Add correct visualization of a twisted trapezoids.
    • b3b81769 - Introduce new more realistic visualization of TwistedTrapezoid
    • 1cf5b9d2 - Finalize visualization of TwistedTrapezoid with twisted surfaces
    • 253caf44 - Code cosmetics
    • 1203efbf - Atlas copyright update + code cosmetics
    • 1e8dec12 - Add comment to code implementing the less precise way of rendering a twisted trap
    • 2012af91 - Bugfix in GeoTwistedTrap, tilt angle
    • 82ec14ea - Add check on correctness of parameters for the GeoTwistedTrap
    • 2b2c98d5 - Make sure that the twist angle is never equal to zero, to avoid division by zero
    • 99bb6b85 - Expand exception message in case of non-calid parameters for twistedTrap

    Compare with previous version

  • added 1 commit

    • ec365534 - Add documentation for GeoTwistedTrap

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading