Commit 315a7684 authored by Paul Schütze's avatar Paul Schütze
Browse files

Cone: make inner radii optional (full cone / cone shell)

parent 2c1a21fe

src/modules/GeometryBuilderGeant4/README.md

+2 −2
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ A cone or partly made cone with an inner and an outer radius defined at the begi 
                starting_angle   : start-angle ( default 0)

                arc_length       : length-of the arc (360 deg default)

* The `outer_radius_begin` of the cone is the outer radius at the begin (negative z) of the cone

* (Optional) The `inner_radius_begin` of the cone is the inner radius at the begin (negative z) of the cone

* (Optional) The `inner_radius_begin` of the cone is the inner radius at the begin (negative z) of the cone. Defaults to 0mm.

* The `outer_radius_end` of the cone is the outer radius at the end (positive z) of the cone

* (Optional) The `inner_radius_end` of the cone is the inner radius at the end (positive z) of the cone

* (Optional) The `inner_radius_end` of the cone is the inner radius at the end (positive z) of the cone. Defaults to 0mm.

* The `length`  of the cone is the total length of the cone

* (Optional) The `starting_angle` of the cone is the azimuthal angle at which circumference of the cone will start in the XY-plane. 0 degrees refers to the point along the positive x-axis and the angle moves counter clockwise. Defaults to 0deg.

* (Optional) The `arc_length` of the cone is the arc-length of the cone that will be drawn

src/modules/GeometryBuilderGeant4/passive_models/ConeModel.hpp

+2 −2
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ namespace allpix { 
                arc_length       : length-of the arc (360 deg default)

            */



            inner_radius_begin_ = config_.get<double>("inner_radius_begin");

            outer_radius_begin_ = config_.get<double>("outer_radius_begin");

            inner_radius_end_ = config_.get<double>("inner_radius_end");

            inner_radius_begin_ = config_.get<double>("inner_radius_begin", 0);

            outer_radius_end_ = config_.get<double>("outer_radius_end");

            inner_radius_end_ = config_.get<double>("inner_radius_end", 0);



            length_ = config_.get<double>("length");

            starting_angle_ = config_.get<double>("starting_angle", 0);