Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/solids/CSG/src/G4CSGSolid.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /geometry/solids/CSG/src/G4CSGSolid.cc (Version 11.3.0) and /geometry/solids/CSG/src/G4CSGSolid.cc (Version 9.0.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 // Implementation of G4CSGSolid                << 
 27 //                                                 26 //
 28 // 27.03.98 J.Apostolakis - First version.     <<  27 // $Id: G4CSGSolid.cc,v 1.13 2006/10/19 15:33:37 gcosmo Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-03-patch-01 $
                                                   >>  29 //
 29 // -------------------------------------------     30 // --------------------------------------------------------------------
 30                                                    31 
 31 #include <cmath>                               << 
 32                                                << 
 33 #include "G4CSGSolid.hh"                           32 #include "G4CSGSolid.hh"
 34 #include "G4QuickRand.hh"                      << 
 35 #include "G4Polyhedron.hh"                     << 
 36                                                << 
 37 #include "G4AutoLock.hh"                       << 
 38                                                    33 
 39 namespace                                      <<  34 #include "G4Polyhedron.hh"
 40 {                                              << 
 41   G4Mutex polyhedronMutex = G4MUTEX_INITIALIZE << 
 42 }                                              << 
 43                                                    35 
 44 //////////////////////////////////////////////     36 //////////////////////////////////////////////////////////////////////////
 45 //                                                 37 //
 46 // Constructor                                     38 // Constructor
 47 //  - Base class constructor                   <<  39 //  - Base class constructor 
 48                                                    40 
 49 G4CSGSolid::G4CSGSolid(const G4String& name) :     41 G4CSGSolid::G4CSGSolid(const G4String& name) :
 50   G4VSolid(name)                               <<  42   G4VSolid(name), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0)
 51 {                                                  43 {
 52 }                                                  44 }
 53                                                    45 
 54 //////////////////////////////////////////////     46 //////////////////////////////////////////////////////////////////////////
 55 //                                                 47 //
 56 // Fake default constructor - sets only member     48 // Fake default constructor - sets only member data and allocates memory
 57 //                            for usage restri     49 //                            for usage restricted to object persistency.
 58                                                    50 
 59 G4CSGSolid::G4CSGSolid( __void__& a )              51 G4CSGSolid::G4CSGSolid( __void__& a )
 60   : G4VSolid(a)                                <<  52   : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0)
 61 {                                              << 
 62 }                                              << 
 63                                                << 
 64 ////////////////////////////////////////////// << 
 65 //                                             << 
 66 // Destructor                                  << 
 67 //                                             << 
 68                                                << 
 69 G4CSGSolid::~G4CSGSolid()                      << 
 70 {                                                  53 {
 71   delete fpPolyhedron; fpPolyhedron = nullptr; << 
 72 }                                              << 
 73                                                << 
 74 ////////////////////////////////////////////// << 
 75 //                                             << 
 76 // Copy constructor                            << 
 77 //                                             << 
 78                                                << 
 79 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs)  << 
 80   : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolu << 
 81     fSurfaceArea(rhs.fSurfaceArea)             << 
 82 {                                              << 
 83 }                                              << 
 84                                                << 
 85 ////////////////////////////////////////////// << 
 86 //                                             << 
 87 // Assignment operator                         << 
 88                                                << 
 89 G4CSGSolid& G4CSGSolid::operator = (const G4CS << 
 90 {                                              << 
 91    // Check assignment to self                 << 
 92    //                                          << 
 93    if (this == &rhs)  { return *this; }        << 
 94                                                << 
 95    // Copy base class data                     << 
 96    //                                          << 
 97    G4VSolid::operator=(rhs);                   << 
 98                                                << 
 99    // Copy data                                << 
100    //                                          << 
101    fCubicVolume = rhs.fCubicVolume;            << 
102    fSurfaceArea = rhs.fSurfaceArea;            << 
103    fRebuildPolyhedron = false;                 << 
104    delete fpPolyhedron; fpPolyhedron = nullptr << 
105                                                << 
106    return *this;                               << 
107 }                                                  54 }
108                                                    55 
109 G4double G4CSGSolid::GetRadiusInRing(G4double  <<  56 G4CSGSolid::~G4CSGSolid() 
110 {                                                  57 {
111   G4double k = G4QuickRand();                  <<  58   delete fpPolyhedron;
112   return (rmin <= 0) ? rmax*std::sqrt(k)       << 
113                      : std::sqrt(k*rmax*rmax + << 
114 }                                                  59 }
115                                                    60 
116 std::ostream& G4CSGSolid::StreamInfo(std::ostr     61 std::ostream& G4CSGSolid::StreamInfo(std::ostream& os) const
117 {                                                  62 {
118   os << "-------------------------------------     63   os << "-----------------------------------------------------------\n"
119      << "    *** Dump for solid - " << GetName     64      << "    *** Dump for solid - " << GetName() << " ***\n"
120      << "    =================================     65      << "    ===================================================\n"
121      << " Solid type: " << GetEntityType() <<      66      << " Solid type: " << GetEntityType() << "\n"
122      << " Parameters: \n"                          67      << " Parameters: \n"
123      << "   NOT available !\n"                     68      << "   NOT available !\n"
124      << "-------------------------------------     69      << "-----------------------------------------------------------\n";
125                                                    70 
126   return os;                                       71   return os;
127 }                                                  72 }
128                                                    73 
129 G4Polyhedron* G4CSGSolid::GetPolyhedron () con     74 G4Polyhedron* G4CSGSolid::GetPolyhedron () const
130 {                                                  75 {
131   if (fpPolyhedron == nullptr ||               <<  76   if (!fpPolyhedron ||
132       fRebuildPolyhedron ||                    << 
133       fpPolyhedron->GetNumberOfRotationStepsAt     77       fpPolyhedron->GetNumberOfRotationStepsAtTimeOfCreation() !=
134       fpPolyhedron->GetNumberOfRotationSteps()     78       fpPolyhedron->GetNumberOfRotationSteps())
135     {                                              79     {
136       G4AutoLock l(&polyhedronMutex);          << 
137       delete fpPolyhedron;                         80       delete fpPolyhedron;
138       fpPolyhedron = CreatePolyhedron();           81       fpPolyhedron = CreatePolyhedron();
139       fRebuildPolyhedron = false;              << 
140       l.unlock();                              << 
141     }                                              82     }
142   return fpPolyhedron;                             83   return fpPolyhedron;
143 }                                                  84 }
144                                                    85