← Back to branch summary

~chris-rogers/maus/emr_mc_digitization

« back to all changes in this revision

Viewing changes to src/legacy/EngModel/MultipoleAperture.cc

  • Committer: Chris Rogers
  • Date: 2014-04-16 11:48:45 UTC
  • mfrom: (707 merge)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: chris.rogers@stfc.ac.uk-20140416114845-h3u3q7pdcxkxvovs
Update to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/legacy/EngModel/MultipoleAperture.cc
4
4
#include "Geant4/G4Tubs.hh"
5
5
#include "Geant4/G4SubtractionSolid.hh"
6
6
#include "Geant4/G4UnionSolid.hh"
7
 
#include "Interface/Squeal.hh"
 
7
#include "Utils/Exception.hh"
8
8
 
9
9
MultipoleAperture::MultipoleAperture(MiceModule * mod)
10
10
                  : _innerHeight(0), _innerWidth(0), _outerHeight(0), _outerWidth(0), 
51
51
 
52
52
G4VSolid * MultipoleAperture::AddPole(int poleNumber, G4VSolid* inputSolid, bool isCurved)
53
53
{
54
 
        if(isCurved) throw(Squeal(Squeal::recoverable, "Could not build curved pole", "MultipoleAperture::AddPole") );
 
54
        if(isCurved) throw(MAUS::Exception(MAUS::Exception::recoverable, "Could not build curved pole", "MultipoleAperture::AddPole") );
55
55
        double            angle         = (poleNumber+0.5)*360.*degree/double(_numberOfPoles);
56
56
        double            xCentre       = sin(angle)*_poleCenterRadius;
57
57
        double            yCentre       = cos(angle)*_poleCenterRadius;