Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/global/management/src/G4GeometryTolerance.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 /global/management/src/G4GeometryTolerance.cc (Version 11.3.0) and /global/management/src/G4GeometryTolerance.cc (Version 10.4)


  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 // G4GeometryTolerance class implementation    << 
 27 //                                                 26 //
 28 // Author: G.Cosmo (CERN), 30 October 2006     <<  27 // $Id: G4GeometryTolerance.cc 96427 2016-04-14 09:37:29Z gcosmo $
                                                   >>  28 //
                                                   >>  29 // class G4GeometryTolerance
                                                   >>  30 //
                                                   >>  31 // Implementation
                                                   >>  32 //
                                                   >>  33 // Author:
                                                   >>  34 // 30.10.06 - G.Cosmo, first implementation
 29 // -------------------------------------------     35 // --------------------------------------------------------------------
 30                                                    36 
 31 #include "G4GeometryTolerance.hh"                  37 #include "G4GeometryTolerance.hh"
 32 #include "G4AutoDelete.hh"                     << 
 33 #include "G4SystemOfUnits.hh"                      38 #include "G4SystemOfUnits.hh"
                                                   >>  39 #include "G4AutoDelete.hh"
 34 #include "globals.hh"                              40 #include "globals.hh"
 35                                                    41 
                                                   >>  42 
 36 // *******************************************     43 // ***************************************************************************
 37 // Static class instance                           44 // Static class instance
 38 // *******************************************     45 // ***************************************************************************
 39 //                                                 46 //
 40 G4ThreadLocal G4GeometryTolerance* G4GeometryT <<  47 G4ThreadLocal G4GeometryTolerance* G4GeometryTolerance::fpInstance = 0;
 41                                                    48 
 42 // *******************************************     49 // ***************************************************************************
 43 // Constructor.                                    50 // Constructor.
 44 // *******************************************     51 // ***************************************************************************
 45 //                                                 52 //
 46 G4GeometryTolerance::G4GeometryTolerance()     <<  53 G4GeometryTolerance::G4GeometryTolerance() : fInitialised(false)
                                                   >>  54 {
                                                   >>  55   fCarTolerance = 1E-9*mm;
                                                   >>  56   fAngTolerance = 1E-9*rad;
                                                   >>  57   fRadTolerance = 1E-9*mm;
                                                   >>  58 }
                                                   >>  59 
                                                   >>  60 // ***************************************************************************
                                                   >>  61 // Empty destructor.
                                                   >>  62 // ***************************************************************************
                                                   >>  63 //
                                                   >>  64 G4GeometryTolerance::~G4GeometryTolerance()
 47 {                                                  65 {
 48   fCarTolerance = 1E-9 * mm;                   << 
 49   fAngTolerance = 1E-9 * rad;                  << 
 50   fRadTolerance = 1E-9 * mm;                   << 
 51 }                                                  66 }
 52                                                    67 
 53 // *******************************************     68 // ***************************************************************************
 54 // Returns the instance of the singleton.          69 // Returns the instance of the singleton.
 55 // Creates it in case it's called for the firs     70 // Creates it in case it's called for the first time.
 56 // *******************************************     71 // ***************************************************************************
 57 //                                                 72 //
 58 G4GeometryTolerance* G4GeometryTolerance::GetI     73 G4GeometryTolerance* G4GeometryTolerance::GetInstance()
 59 {                                                  74 {
 60   if(fpInstance == nullptr)                    <<  75   if (fpInstance == 0)
 61   {                                                76   {
 62     fpInstance = new G4GeometryTolerance;      <<  77     fpInstance = new  G4GeometryTolerance;
 63     G4AutoDelete::Register(fpInstance);            78     G4AutoDelete::Register(fpInstance);
 64   }                                                79   }
 65   return fpInstance;                           <<  80   return fpInstance;    
 66 }                                                  81 }
 67                                                    82 
 68 // *******************************************     83 // ***************************************************************************
 69 // Accessors.                                      84 // Accessors.
 70 // *******************************************     85 // ***************************************************************************
 71 //                                                 86 //
 72 G4double G4GeometryTolerance::GetSurfaceTolera     87 G4double G4GeometryTolerance::GetSurfaceTolerance() const
 73 {                                                  88 {
 74   return fCarTolerance;                            89   return fCarTolerance;
 75 }                                                  90 }
 76                                                    91 
 77 G4double G4GeometryTolerance::GetAngularTolera     92 G4double G4GeometryTolerance::GetAngularTolerance() const
 78 {                                                  93 {
 79   return fAngTolerance;                            94   return fAngTolerance;
 80 }                                                  95 }
 81                                                    96 
 82 G4double G4GeometryTolerance::GetRadialToleran     97 G4double G4GeometryTolerance::GetRadialTolerance() const
 83 {                                                  98 {
 84   return fRadTolerance;                            99   return fRadTolerance;
 85 }                                                 100 }
 86                                                   101 
 87 // *******************************************    102 // ***************************************************************************
 88 // Sets the tolerance to a value computed on t    103 // Sets the tolerance to a value computed on the basis of the world volume
 89 // extent provided as argument. The method can    104 // extent provided as argument. The method can be called only once.
 90 // *******************************************    105 // ***************************************************************************
 91 //                                                106 //
 92 void G4GeometryTolerance::SetSurfaceTolerance(    107 void G4GeometryTolerance::SetSurfaceTolerance(G4double worldExtent)
 93 {                                                 108 {
 94   if(!fInitialised)                            << 109   if (!fInitialised)
 95   {                                               110   {
 96     fCarTolerance = fRadTolerance = worldExten << 111     fCarTolerance = fRadTolerance = worldExtent*1E-11;
 97     fInitialised                  = true;      << 112     fInitialised = true;
 98   }                                               113   }
 99   else                                            114   else
100   {                                               115   {
101     G4cout << "WARNING - G4GeometryTolerance::    116     G4cout << "WARNING - G4GeometryTolerance::SetSurfaceTolerance()" << G4endl
102            << "          Tolerance can only be    117            << "          Tolerance can only be set once. Currently set to: "
103            << fCarTolerance / mm << " mm." <<  << 118            << fCarTolerance/mm << " mm." << G4endl;
104     G4Exception("G4GeometryTolerance::SetSurfa << 119     G4Exception("G4GeometryTolerance::SetSurfaceTolerance()",
105                 JustWarning, "The tolerance ha << 120                 "NotApplicable", JustWarning,
                                                   >> 121                 "The tolerance has been already set!");
106   }                                               122   }
107 }                                                 123 }
108                                                   124