Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/volumes/src/G4LogicalSkinSurface.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/G4LogicalSkinSurface.cc (Version 11.3.0) and /geometry/volumes/src/G4LogicalSkinSurface.cc (Version 10.6.p1)


  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 // G4LogicalSkinSurface Implementation             26 // G4LogicalSkinSurface Implementation
 27 //                                                 27 //
 28 // A Logical Surface class for the surface sur     28 // A Logical Surface class for the surface surrounding a single
 29 // logical volume.                                 29 // logical volume.
 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 "G4LogicalSkinSurface.hh"                 34 #include "G4LogicalSkinSurface.hh"
 35 #include "G4LogicalVolume.hh"                      35 #include "G4LogicalVolume.hh"
 36                                                    36 
 37 G4LogicalSkinSurfaceTable *G4LogicalSkinSurfac     37 G4LogicalSkinSurfaceTable *G4LogicalSkinSurface::theSkinSurfaceTable = nullptr;
 38                                                    38 
 39 // ------------------------------------------- << 
 40 // Constructor                                 << 
 41 //                                                 39 //
                                                   >>  40 // Constructors & destructor
                                                   >>  41 //
                                                   >>  42 
 42 G4LogicalSkinSurface::G4LogicalSkinSurface(con     43 G4LogicalSkinSurface::G4LogicalSkinSurface(const G4String&  name,
 43                                            G4L     44                                            G4LogicalVolume* logicalVolume,
 44                                            G4S     45                                            G4SurfaceProperty* surfaceProperty)
 45   : G4LogicalSurface(name, surfaceProperty),       46   : G4LogicalSurface(name, surfaceProperty),
 46     LogVolume(logicalVolume)                       47     LogVolume(logicalVolume)
 47 {                                                  48 {
 48   if (theSkinSurfaceTable == nullptr)              49   if (theSkinSurfaceTable == nullptr)
 49   {                                                50   {
 50     theSkinSurfaceTable = new G4LogicalSkinSur     51     theSkinSurfaceTable = new G4LogicalSkinSurfaceTable;
 51   }                                                52   }
 52   // Store in the table of Surfaces                53   // Store in the table of Surfaces
 53   //                                               54   //
 54   theSkinSurfaceTable->insert(std::make_pair(l <<  55   theSkinSurfaceTable->push_back(this);
                                                   >>  56 }
                                                   >>  57 
                                                   >>  58 G4LogicalSkinSurface::~G4LogicalSkinSurface()
                                                   >>  59 {
 55 }                                                  60 }
 56                                                    61 
 57 // ------------------------------------------- << 
 58 // Default destructor                          << 
 59 //                                                 62 //
 60 G4LogicalSkinSurface::~G4LogicalSkinSurface()  <<  63 // Operators
                                                   >>  64 //
 61                                                    65 
 62 // ------------------------------------------- << 
 63 G4bool                                             66 G4bool
 64 G4LogicalSkinSurface::operator==(const G4Logic     67 G4LogicalSkinSurface::operator==(const G4LogicalSkinSurface& right) const
 65 {                                                  68 {
 66   return (this == (G4LogicalSkinSurface *) &ri     69   return (this == (G4LogicalSkinSurface *) &right);
 67 }                                                  70 }
 68                                                    71 
 69 // ------------------------------------------- << 
 70 G4bool                                             72 G4bool
 71 G4LogicalSkinSurface::operator!=(const G4Logic     73 G4LogicalSkinSurface::operator!=(const G4LogicalSkinSurface& right) const
 72 {                                                  74 {
 73   return (this != (G4LogicalSkinSurface *) &ri     75   return (this != (G4LogicalSkinSurface *) &right);
 74 }                                                  76 }
 75                                                    77 
 76 // ------------------------------------------- <<  78 //
                                                   >>  79 // Methods
                                                   >>  80 //
                                                   >>  81 
 77 const G4LogicalSkinSurfaceTable* G4LogicalSkin     82 const G4LogicalSkinSurfaceTable* G4LogicalSkinSurface::GetSurfaceTable()
 78 {                                                  83 {
 79   if (theSkinSurfaceTable == nullptr)              84   if (theSkinSurfaceTable == nullptr)
 80   {                                                85   {
 81     theSkinSurfaceTable = new G4LogicalSkinSur     86     theSkinSurfaceTable = new G4LogicalSkinSurfaceTable;
 82   }                                                87   }
 83   return theSkinSurfaceTable;                      88   return theSkinSurfaceTable;
 84 }                                                  89 }
 85                                                    90 
 86 // ------------------------------------------- << 
 87 size_t G4LogicalSkinSurface::GetNumberOfSkinSu     91 size_t G4LogicalSkinSurface::GetNumberOfSkinSurfaces()
 88 {                                                  92 {
 89   if (theSkinSurfaceTable != nullptr)              93   if (theSkinSurfaceTable != nullptr)
 90   {                                                94   {
 91     return theSkinSurfaceTable->size();            95     return theSkinSurfaceTable->size();
 92   }                                                96   }
 93   return 0;                                        97   return 0;
 94 }                                                  98 }
 95                                                    99 
 96 // ------------------------------------------- << 
 97 G4LogicalSkinSurface*                             100 G4LogicalSkinSurface*
 98 G4LogicalSkinSurface::GetSurface(const G4Logic    101 G4LogicalSkinSurface::GetSurface(const G4LogicalVolume* vol)
 99 {                                                 102 {
100   if (theSkinSurfaceTable != nullptr)             103   if (theSkinSurfaceTable != nullptr)
101   {                                               104   {
102     auto pos = theSkinSurfaceTable->find(vol); << 105     for(auto pos = theSkinSurfaceTable->cbegin();
103     if(pos != theSkinSurfaceTable->cend()) ret << 106         pos != theSkinSurfaceTable->cend(); ++pos)
                                                   >> 107     {
                                                   >> 108       if ((*pos)->GetLogicalVolume() == vol)  { return *pos; }
                                                   >> 109     }
104   }                                               110   }
105   return nullptr;                                 111   return nullptr;
106 }                                                 112 }
107                                                   113 
108 // ------------------------------------------- << 
109 // Dump info for known surfaces                   114 // Dump info for known surfaces
110 //                                                115 //
111 void G4LogicalSkinSurface::DumpInfo()             116 void G4LogicalSkinSurface::DumpInfo() 
112 {                                                 117 {
113   G4cout << "***** Skin Surface Table : Nb of     118   G4cout << "***** Skin Surface Table : Nb of Surfaces = "
114          << GetNumberOfSkinSurfaces() << " ***    119          << GetNumberOfSkinSurfaces() << " *****" << G4endl;
115                                                   120 
116   if (theSkinSurfaceTable != nullptr)             121   if (theSkinSurfaceTable != nullptr)
117   {                                               122   {
118     for(const auto & pos : *theSkinSurfaceTabl << 123     for(auto pos = theSkinSurfaceTable->cbegin();
                                                   >> 124         pos != theSkinSurfaceTable->cend(); ++pos)
119     {                                             125     {
120       G4LogicalSkinSurface* pSurf = pos.second << 126       G4cout << (*pos)->GetName() << " : " << G4endl
121       G4cout << pSurf->GetName() << " : " << G << 
122              << " Skin of logical volume "        127              << " Skin of logical volume "
123              << pSurf->GetLogicalVolume()->Get << 128              << (*pos)->GetLogicalVolume()->GetName()
124              << G4endl;                           129              << G4endl;
125     }                                             130     }
126   }                                               131   }
127   G4cout << G4endl;                               132   G4cout << G4endl;
128 }                                                 133 }
129                                                   134 
130 // ------------------------------------------- << 
131 void G4LogicalSkinSurface::CleanSurfaceTable()    135 void G4LogicalSkinSurface::CleanSurfaceTable()
132 {                                                 136 {
133   if (theSkinSurfaceTable != nullptr)          << 137   if (theSkinSurfaceTable)
134   {                                               138   {
135     for(const auto & pos : *theSkinSurfaceTabl << 139     for(auto pos = theSkinSurfaceTable->cbegin();
                                                   >> 140         pos != theSkinSurfaceTable->cend(); ++pos)
136     {                                             141     {
137       delete pos.second;                       << 142       if (*pos) { delete *pos; }
138     }                                             143     }
139     theSkinSurfaceTable->clear();                 144     theSkinSurfaceTable->clear();
140   }                                               145   }
141   return;                                         146   return;
142 }                                                 147 }
143                                                   148