Commit ef608c35 authored by Naomi Davis's avatar Naomi Davis Committed by Simon Spannagel
Browse files

Added a new class of different particle beam shapes (circle, ellipse, 

rectangle).
An exception is now thrown, if the beam shape is not combined with the
correct beam type (e.g. flat_beam).
parent ceef5fa6

src/modules/DepositionGeant4/GeneratorActionG4.cpp

+12 −5
Original line number Diff line number Diff line
@@ -139,23 +139,30 @@ GeneratorActionG4::GeneratorActionG4(const Configuration& config) 
                beam_size = {size, size};

            }



            if(config_.get<bool>("flat_beam", false) == true) {

                if(config_.get<std::string>("beam_shape", "Circle") == "Rectangle") {

            auto beam_shape = config_.get<BeamShape>("beam_shape", BeamShape::CIRCLE);

            if(config_.get<bool>("flat_beam", false)) {

                if(beam_shape == BeamShape::RECTANGLE) {

                    single_source->GetPosDist()->SetPosDisType("Plane"); //?

                    single_source->GetPosDist()->SetPosDisShape("Rectangle");

                    single_source->GetPosDist()->SetHalfX((beam_size.x()) / 2);

                    single_source->GetPosDist()->SetHalfY((beam_size.y()) / 2);

                } else {

                } else if(beam_shape == BeamShape::CIRCLE) {

                    single_source->GetPosDist()->SetPosDisShape("Circle");

                    single_source->GetPosDist()->SetRadius(beam_size.x());

                } else {

                    throw InvalidValueError(config_, "beam_shape", "Cannot use this beam shape with flat beams");

                }

            } else {

                if(config_.get<std::string>("beam_shape", "Circle") == "Ellipse"){

                if(beam_shape == BeamShape::CIRCLE) {

                    single_source->GetPosDist()->SetBeamSigmaInR(beam_size.x());

                } else if(beam_shape == BeamShape::ELLIPSE){

                    single_source->GetPosDist()->SetBeamSigmaInX((beam_size.x()) / 2);

                    single_source->GetPosDist()->SetBeamSigmaInY((beam_size.y()) / 2);

                }  else {

                    throw InvalidValueError(config_, "beam_shape", "This beam shape can only be used with flat beams");

                }

                single_source->GetPosDist()->SetBeamSigmaInR(beam_size.x());

            }



            single_source->GetPosDist()->SetPosRot1(angref1);

            single_source->GetPosDist()->SetPosRot2(angref2);

src/modules/DepositionGeant4/GeneratorActionG4.hpp

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ namespace allpix { 
            POINT,  ///< Point source

        };



        /**

         * @brief Different shapes of particle beams

         */

        enum class BeamShape {

            CIRCLE,    ///< Circular beam

            ELLIPSE,   ///< Elliptical beam

            RECTANGLE, ///< Rectangular beam

        };



        /**

         * @brief Constructs the generator action

         * @param config Configuration of the \ref DepositionGeant4Module module