Import Geant4 10.4.0 source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4AttDefStore.hh 78306 2013-12-11 10:53:30Z gcosmo $
|
||||
// $Id: G4AttDefStore.hh 105754 2017-08-16 13:47:18Z gcosmo $
|
||||
|
||||
#ifndef G4ATTDEFSTORE_HH
|
||||
#define G4ATTDEFSTORE_HH
|
||||
@@ -49,8 +49,7 @@ namespace G4AttDefStore {
|
||||
// Returns true and assigns key if definitions are amongst those
|
||||
// maintained in the store.
|
||||
|
||||
extern G4ThreadLocal
|
||||
std::map<G4String,std::map<G4String,G4AttDef>*> *m_defsmaps;
|
||||
extern std::map<G4String,std::map<G4String,G4AttDef>*> *m_defsmaps;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Colour.hh 104093 2017-05-11 07:29:45Z gcosmo $
|
||||
// $Id: G4Colour.hh 106385 2017-10-09 09:36:33Z gcosmo $
|
||||
//
|
||||
//
|
||||
// John Allison 20th October 1996
|
||||
@@ -127,24 +127,25 @@ public: // With description
|
||||
static G4Colour Magenta();
|
||||
static G4Colour Yellow();
|
||||
|
||||
static G4bool GetColour(const G4String& key, G4Colour& result);
|
||||
// Get colour for given key, placing it in result.
|
||||
// The key is usually the name of the colour.
|
||||
// The key is not case sensitive.
|
||||
// Returns false if key doesn't exist, leaving result unchanged.
|
||||
|
||||
static void AddToMap(const G4String& key, const G4Colour& colour);
|
||||
// Add user defined colour to colour map with given key. Standard
|
||||
// colours are added to map by default.
|
||||
|
||||
static G4bool GetColour(const G4String& key, G4Colour& result);
|
||||
// Get colour for given key. Returns false if key doesn't exist
|
||||
// in colour map, leaving result unchanged. Colour map
|
||||
// is not sensitive to key case.
|
||||
|
||||
static void InitialiseColourMap();
|
||||
static const std::map<G4String, G4Colour>& GetMap();
|
||||
|
||||
|
||||
private:
|
||||
G4double red, green, blue, alpha;
|
||||
|
||||
static G4ThreadLocal std::map<G4String, G4Colour> *fColourMap;
|
||||
static G4ThreadLocal G4bool fInitColourMap;
|
||||
static void InitialiseColourMap();
|
||||
|
||||
static std::map<G4String, G4Colour> fColourMap;
|
||||
static G4bool fInitColourMap;
|
||||
|
||||
};
|
||||
|
||||
inline G4double G4Colour::GetRed () const {return red;}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: HepPolyhedron.h 101022 2016-11-04 08:25:50Z gcosmo $
|
||||
// $Id: HepPolyhedron.h 106123 2017-09-13 12:53:03Z gcosmo $
|
||||
//
|
||||
//
|
||||
// Class Description:
|
||||
@@ -174,7 +174,7 @@
|
||||
#include "G4Transform3D.hh"
|
||||
|
||||
#ifndef DEFAULT_NUMBER_OF_STEPS
|
||||
#define DEFAULT_NUMBER_OF_STEPS 72
|
||||
#define DEFAULT_NUMBER_OF_STEPS 24
|
||||
#endif
|
||||
|
||||
class G4Facet {
|
||||
|
||||
Reference in New Issue
Block a user