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 9.6)


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