Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/volumes/src/G4LogicalBorderSurface.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/volumes/src/G4LogicalBorderSurface.cc (Version 11.3.0) and /geometry/volumes/src/G4LogicalBorderSurface.cc (Version 11.0.p4)


  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 // G4LogicalBorderSurface Implementation           26 // G4LogicalBorderSurface Implementation
 27 //                                                 27 //
 28 // A Logical Surface class for surfaces define     28 // A Logical Surface class for surfaces defined by the boundary
 29 // of two physical volumes.                        29 // of two physical volumes.
 30 //                                                 30 //
 31 // Author: John Apostolakis, CERN - 26-06-1997 <<  31 // Author: John Apostolakis (John.Apostolakis@cern.ch), 26-06-1997
 32 // -------------------------------------------     32 // --------------------------------------------------------------------
 33                                                    33 
 34 #include "G4LogicalBorderSurface.hh"               34 #include "G4LogicalBorderSurface.hh"
 35 #include "G4VPhysicalVolume.hh"                    35 #include "G4VPhysicalVolume.hh"
 36                                                    36 
 37 G4LogicalBorderSurfaceTable*                       37 G4LogicalBorderSurfaceTable*
 38 G4LogicalBorderSurface::theBorderSurfaceTable      38 G4LogicalBorderSurface::theBorderSurfaceTable = nullptr;
 39                                                    39 
 40 // ------------------------------------------- << 
 41 // Constructor                                 << 
 42 //                                                 40 //
                                                   >>  41 // Constructor & destructor
                                                   >>  42 //
                                                   >>  43 
 43 G4LogicalBorderSurface::                           44 G4LogicalBorderSurface::
 44 G4LogicalBorderSurface(const G4String& name,       45 G4LogicalBorderSurface(const G4String& name,
 45                              G4VPhysicalVolume     46                              G4VPhysicalVolume* vol1, 
 46                              G4VPhysicalVolume     47                              G4VPhysicalVolume* vol2,
 47                              G4SurfaceProperty     48                              G4SurfaceProperty* surfaceProperty)
 48   : G4LogicalSurface(name, surfaceProperty),       49   : G4LogicalSurface(name, surfaceProperty),
 49     Volume1(vol1), Volume2(vol2),                  50     Volume1(vol1), Volume2(vol2),
 50     Index(theBorderSurfaceTable != nullptr ? t     51     Index(theBorderSurfaceTable != nullptr ? theBorderSurfaceTable->size() : 0)
 51 {                                                  52 {
 52   if (theBorderSurfaceTable == nullptr)            53   if (theBorderSurfaceTable == nullptr)
 53   {                                                54   {
 54     theBorderSurfaceTable = new G4LogicalBorde     55     theBorderSurfaceTable = new G4LogicalBorderSurfaceTable;
 55   }                                                56   }
 56                                                    57 
 57   // Store in the table of Surfaces                58   // Store in the table of Surfaces
 58   //                                               59   //
 59   theBorderSurfaceTable->insert(std::make_pair     60   theBorderSurfaceTable->insert(std::make_pair(std::make_pair(vol1,vol2),this));
 60 }                                                  61 }
 61                                                    62 
 62 // ------------------------------------------- <<  63 G4LogicalBorderSurface::~G4LogicalBorderSurface()
 63 // Default destructor                          <<  64 {
                                                   >>  65 }
                                                   >>  66 
                                                   >>  67 //
                                                   >>  68 // Operators
 64 //                                                 69 //
 65 G4LogicalBorderSurface::~G4LogicalBorderSurfac << 
 66                                                    70 
 67 // ------------------------------------------- << 
 68 G4bool                                             71 G4bool
 69 G4LogicalBorderSurface::operator==(const G4Log     72 G4LogicalBorderSurface::operator==(const G4LogicalBorderSurface &right) const
 70 {                                                  73 {
 71   return (this == (G4LogicalBorderSurface *) &     74   return (this == (G4LogicalBorderSurface *) &right);
 72 }                                                  75 }
 73                                                    76 
 74 // ------------------------------------------- << 
 75 G4bool                                             77 G4bool
 76 G4LogicalBorderSurface::operator!=(const G4Log     78 G4LogicalBorderSurface::operator!=(const G4LogicalBorderSurface &right) const
 77 {                                                  79 {
 78   return (this != (G4LogicalBorderSurface *) &     80   return (this != (G4LogicalBorderSurface *) &right);
 79 }                                                  81 }
 80                                                    82 
 81 // ------------------------------------------- <<  83 //
                                                   >>  84 // Methods
                                                   >>  85 //
                                                   >>  86 
 82 const G4LogicalBorderSurfaceTable* G4LogicalBo     87 const G4LogicalBorderSurfaceTable* G4LogicalBorderSurface::GetSurfaceTable()
 83 {                                                  88 {
 84   if (theBorderSurfaceTable == nullptr)            89   if (theBorderSurfaceTable == nullptr)
 85   {                                                90   {
 86     theBorderSurfaceTable = new G4LogicalBorde     91     theBorderSurfaceTable = new G4LogicalBorderSurfaceTable;
 87   }                                                92   }
 88   return theBorderSurfaceTable;                    93   return theBorderSurfaceTable;
 89 }                                                  94 }
 90                                                    95 
 91 // ------------------------------------------- << 
 92 std::size_t G4LogicalBorderSurface::GetNumberO     96 std::size_t G4LogicalBorderSurface::GetNumberOfBorderSurfaces()
 93 {                                                  97 {
 94   if (theBorderSurfaceTable != nullptr)            98   if (theBorderSurfaceTable != nullptr)
 95   {                                                99   {
 96     return theBorderSurfaceTable->size();         100     return theBorderSurfaceTable->size();
 97   }                                               101   }
 98   return 0;                                       102   return 0;
 99 }                                                 103 }
100                                                   104 
101 // ------------------------------------------- << 
102 G4LogicalBorderSurface*                           105 G4LogicalBorderSurface*
103 G4LogicalBorderSurface::GetSurface(const G4VPh    106 G4LogicalBorderSurface::GetSurface(const G4VPhysicalVolume* vol1,
104                                    const G4VPh    107                                    const G4VPhysicalVolume* vol2)
105 {                                                 108 {
106   if (theBorderSurfaceTable != nullptr)           109   if (theBorderSurfaceTable != nullptr)
107   {                                               110   {
108     auto pos = theBorderSurfaceTable->find(std    111     auto pos = theBorderSurfaceTable->find(std::make_pair(vol1,vol2));
109     if(pos != theBorderSurfaceTable->cend()) r    112     if(pos != theBorderSurfaceTable->cend()) return pos->second;
110   }                                               113   }
111   return nullptr;                                 114   return nullptr;
112 }                                                 115 }
113                                                   116 
114 // ------------------------------------------- << 
115 // Dump info for known surfaces                   117 // Dump info for known surfaces
116 //                                                118 //
117 void G4LogicalBorderSurface::DumpInfo()           119 void G4LogicalBorderSurface::DumpInfo()
118 {                                                 120 {
119   G4cout << "***** Surface Table : Nb of Surfa    121   G4cout << "***** Surface Table : Nb of Surfaces = "
120          << GetNumberOfBorderSurfaces() << " *    122          << GetNumberOfBorderSurfaces() << " *****" << G4endl;
121                                                   123 
122   if (theBorderSurfaceTable != nullptr)           124   if (theBorderSurfaceTable != nullptr)
123   {                                               125   {
124     for(const auto & pos : *theBorderSurfaceTa << 126     for(auto pos = theBorderSurfaceTable->cbegin();
                                                   >> 127         pos != theBorderSurfaceTable->cend(); ++pos)
125     {                                             128     {
126       G4LogicalBorderSurface* pSurf = pos.seco << 129       G4LogicalBorderSurface* pSurf = pos->second;
127       G4cout << pSurf->GetName() << " : " << G    130       G4cout << pSurf->GetName() << " : " << G4endl
128              << " Border of volumes "             131              << " Border of volumes "
129              << pSurf->GetVolume1()->GetName()    132              << pSurf->GetVolume1()->GetName() << " and " 
130              << pSurf->GetVolume2()->GetName()    133              << pSurf->GetVolume2()->GetName() << G4endl;
131     }                                             134     }
132   }                                               135   }
133   G4cout << G4endl;                               136   G4cout << G4endl;
134 }                                                 137 }
135                                                   138 
136 // ------------------------------------------- << 
137 void G4LogicalBorderSurface::CleanSurfaceTable    139 void G4LogicalBorderSurface::CleanSurfaceTable()
138 {                                                 140 {
139   if (theBorderSurfaceTable != nullptr)           141   if (theBorderSurfaceTable != nullptr)
140   {                                               142   {
141     for(const auto & pos : *theBorderSurfaceTa << 143     for(auto pos = theBorderSurfaceTable->cbegin();
                                                   >> 144         pos != theBorderSurfaceTable->cend(); ++pos)
142     {                                             145     {
143       delete pos.second;                       << 146       if (pos->second)  { delete pos->second; }
144     }                                             147     }
145     theBorderSurfaceTable->clear();               148     theBorderSurfaceTable->clear();
146   }                                               149   }
147   return;                                         150   return;
148 }                                                 151 }
149                                                   152