Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/materials/src/G4SurfaceProperty.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 /materials/src/G4SurfaceProperty.cc (Version 11.3.0) and /materials/src/G4SurfaceProperty.cc (Version 9.6.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 //
                                                   >>  27 // $Id: G4SurfaceProperty.cc 67044 2013-01-30 08:50:06Z gcosmo $
                                                   >>  28 //
                                                   >>  29 // 
 26 //////////////////////////////////////////////     30 ////////////////////////////////////////////////////////////////////////
 27 // G4SurfaceProperty Implementation                31 // G4SurfaceProperty Implementation
 28 //////////////////////////////////////////////     32 ////////////////////////////////////////////////////////////////////////
 29 //                                                 33 //
 30 // Class Description:                              34 // Class Description:
 31 //                                                 35 //
 32 // A base class describing a surface property.     36 // A base class describing a surface property.
 33 // Derived classes are G4Opticalsurface, G4Fir <<  37 // Derived classes are G4Opticalsurface, G4Firovsurface, etc.      
 34 //                                                 38 //
 35 // File:        G4SurfaceProperty.cc               39 // File:        G4SurfaceProperty.cc
 36 // Version:     1.0                                40 // Version:     1.0
 37 // Created:     16-11-2006                         41 // Created:     16-11-2006
 38 // Author:      Peter Gumplinger                   42 // Author:      Peter Gumplinger
 39 //                                                 43 //
 40 //////////////////////////////////////////////     44 ////////////////////////////////////////////////////////////////////////
 41                                                    45 
 42 #include "G4SurfaceProperty.hh"                << 
 43                                                << 
 44 #include "globals.hh"                              46 #include "globals.hh"
 45                                                    47 
 46 #include <utility>                             <<  48 #include "G4SurfaceProperty.hh"
 47                                                    49 
 48 G4SurfacePropertyTable G4SurfaceProperty::theS     50 G4SurfacePropertyTable G4SurfaceProperty::theSurfacePropertyTable;
 49                                                    51 
 50 G4SurfaceProperty::G4SurfaceProperty(const G4S <<  52 //
                                                   >>  53 // Constructor and destructor
                                                   >>  54 //
                                                   >>  55 G4SurfaceProperty::G4SurfaceProperty( const G4String& name,
                                                   >>  56                           G4SurfaceType type )
 51   : theName(name), theType(type)                   57   : theName(name), theType(type)
 52 {                                                  58 {
 53   theSurfacePropertyTable.push_back(this);         59   theSurfacePropertyTable.push_back(this);
 54 }                                                  60 }
 55                                                    61 
 56 G4SurfaceProperty::G4SurfaceProperty() : theNa <<  62 //
                                                   >>  63 // Dummy constructor
                                                   >>  64 //
                                                   >>  65 G4SurfaceProperty::G4SurfaceProperty()
                                                   >>  66   : theName("Dielectric"), theType(dielectric_metal)
 57 {                                                  67 {
 58   theSurfacePropertyTable.push_back(this);         68   theSurfacePropertyTable.push_back(this);
 59 }                                                  69 }
 60                                                    70 
                                                   >>  71 G4SurfaceProperty::~G4SurfaceProperty()
                                                   >>  72 {
                                                   >>  73 }
                                                   >>  74 
                                                   >>  75 //
                                                   >>  76 // Methods
                                                   >>  77 //
                                                   >>  78 
 61 const G4SurfacePropertyTable* G4SurfacePropert     79 const G4SurfacePropertyTable* G4SurfaceProperty::GetSurfacePropertyTable()
 62 {                                                  80 {
 63   return &theSurfacePropertyTable;                 81   return &theSurfacePropertyTable;
 64 }                                                  82 }
 65                                                    83 
 66 size_t G4SurfaceProperty::GetNumberOfSurfacePr <<  84 size_t G4SurfaceProperty::GetNumberOfSurfaceProperties()
                                                   >>  85 {
                                                   >>  86   return theSurfacePropertyTable.size();
                                                   >>  87 }
 67                                                    88 
 68 // Dump info for known surface properties          89 // Dump info for known surface properties
                                                   >>  90 //
 69 void G4SurfaceProperty::DumpTableInfo()            91 void G4SurfaceProperty::DumpTableInfo()
 70 {                                                  92 {
 71   G4cout << "***** Surface Property Table : Nb     93   G4cout << "***** Surface Property Table : Nb of Surface Properties = "
 72          << GetNumberOfSurfaceProperties() <<      94          << GetNumberOfSurfaceProperties() << " *****" << G4endl;
 73                                                    95 
 74   for (auto pSurfaceProperty : theSurfacePrope <<  96   for (size_t i=0; i<theSurfacePropertyTable.size(); i++)
                                                   >>  97   {
                                                   >>  98     G4SurfaceProperty* pSurfaceProperty = theSurfacePropertyTable[i];
 75     G4cout << pSurfaceProperty->GetName() << "     99     G4cout << pSurfaceProperty->GetName() << " : " << G4endl
 76            << "  Surface Property type   = " < << 100            << "  Surface Property type   = " 
                                                   >> 101            << pSurfaceProperty->GetType()
                                                   >> 102            << G4endl;
 77   }                                               103   }
 78   G4cout << G4endl;                               104   G4cout << G4endl;
 79 }                                                 105 }
 80                                                   106 
 81 void G4SurfaceProperty::CleanSurfacePropertyTa    107 void G4SurfaceProperty::CleanSurfacePropertyTable()
 82 {                                                 108 {
 83   DumpTableInfo();                                109   DumpTableInfo();
 84   G4SurfacePropertyTable::iterator pos;           110   G4SurfacePropertyTable::iterator pos;
 85   for (pos = theSurfacePropertyTable.begin();  << 111   for(pos=theSurfacePropertyTable.begin();
 86     if (*pos != nullptr) {                     << 112       pos!=theSurfacePropertyTable.end(); pos++)
 87       delete *pos;                             << 113   {
 88     }                                          << 114     if (*pos) delete *pos;
 89   }                                               115   }
 90   theSurfacePropertyTable.clear();                116   theSurfacePropertyTable.clear();
 91   DumpTableInfo();                                117   DumpTableInfo();
 92 }                                                 118 }
 93                                                   119