Full implementation of the twisted trapezoid shape
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)
Merge request reports
Activity
added GDMLtoGM GeoModel GeoModelG4 GeoModelVisualization labels
1 /* 2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Thanks @rbianchi, I am going to update all of them.
changed this line in version 4 of the diff
1 1 /* 2 2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration changed this line in version 4 of the diff
1 1 /* 2 2 Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration changed this line in version 4 of the diff
- Resolved by Riccardo Maria Bianchi
- Resolved by Riccardo Maria Bianchi
- Resolved by Riccardo Maria Bianchi
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:
- an entry for the new shape should go here:
- and you should include the new file at the end of this file:
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
Toggle commit list-
39807531 - 1 commit from branch
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 BandieramonteThanks to you, @mbandier, for the very nice addition to GeoModel!!
added 1 commit
- e00dd24b - Add check on correctness of parameters for the GeoTwistedTrap
added 1 commit
- fd97f11b - Make sure that the twist angle is never equal to zero, to avoid division by zero
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
Toggle commit list-
fd97f11b...2a9731e0 - 59 commits from branch