lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/intercoms/CMakeLists.txt
+5 -1
View File
@@ -7,11 +7,15 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
# $Id: CMakeLists.txt 106172 2017-09-15 13:03:57Z gcosmo $
#
#------------------------------------------------------------------------------
include(Geant4MacroLibraryTargets)
# Add allocation export symbol for the geometry category
add_definitions(-DG4ICOMS_ALLOC_EXPORT)
if(GEANT4_BUILD_GRANULAR_LIBS)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
else()
source/intercoms/GNUmakefile
+2 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# $Id: GNUmakefile 106172 2017-09-15 13:03:57Z gcosmo $
# -------------------------------------------------------------
# GNUmakefile for intercoms library. Gabriele Cosmo, 11/11/96.
# -------------------------------------------------------------
@@ -13,6 +13,7 @@ GLOBLIBS = libG4global.lib
include $(G4INSTALL)/config/architecture.gmk
CPPFLAGS += -DG4ICOMS_ALLOC_EXPORT
CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include
source/intercoms/History
+12 -1
View File
@@ -1,4 +1,4 @@
$Id: History 104431 2017-05-31 07:45:11Z gcosmo $
$Id: History 106172 2017-09-15 13:03:57Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,17 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
15 September, 2017 Gabriele Cosmo (intercoms-V10-03-04)
- More cases of static symbols to export for DLLs.
- Removed inline specification for two static methods in G4UImanager.
15 September, 2017 Gabriele Cosmo (intercoms-V10-03-03)
- Use DLL export flags for static symbols in G4UImanager.
27 July, 2017 Ivana Hrivnacova (intercoms-V10-03-02)
- Explicitly remove constness by means of remove_const.
Fixing problem report #1803 (with the patch provided here).
30 May, 2017 Ivana Hrivnacova (intercoms-V10-03-01)
- Fixed G4GenericMessenger::Command::SetUnit:
Do not ignore setting and issue a warning when running sequantial application
source/intercoms/include/G4AnyMethod.hh
+6 -7
View File
@@ -59,6 +59,7 @@ public:
#if defined(G4USE_STD11) || defined(G4USE_STD14)
#include <type_traits>
using std::remove_reference;
using std::remove_const;
// original usage below in G4AnyMethod (pre C++11) was without namespace std::
// so if compiler has them, make them available without the namespace
#else
@@ -71,6 +72,7 @@ public:
template<typename T> struct remove_reference {typedef T type;};
template<typename T> struct remove_reference<T&> {typedef T type;};
template<typename T> struct remove_reference<const T&> {typedef T type;};
template<typename T> struct remove_const<const T> {typedef T type;};
#endif
/**
@@ -172,8 +174,8 @@ private:
};
template <class S, class T, class A0> struct FuncRef1: public Placeholder {
typedef typename remove_reference<A0>::type nakedA0;
typedef typename remove_const<typename remove_reference<A0>::type>::type nakedA0;
FuncRef1(S (T::*f)(A0)) : fRef(f) {}
virtual void operator()(void*) {
@@ -195,8 +197,8 @@ private:
};
template <class S, class T, class A0, class A1> struct FuncRef2: public Placeholder {
typedef typename remove_reference<A0>::type nakedA0;
typedef typename remove_reference<A1>::type nakedA1;
typedef typename remove_const<typename remove_reference<A0>::type>::type nakedA0;
typedef typename remove_const<typename remove_reference<A1>::type>::type nakedA1;
FuncRef2(S (T::*f)(A0, A1)) : fRef(f) {}
@@ -223,7 +225,4 @@ private:
size_t narg;
};
#endif
source/intercoms/include/G4UImanager.hh
+10 -9
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UImanager.hh 102561 2017-02-09 08:16:05Z gcosmo $
// $Id: G4UImanager.hh 106172 2017-09-15 13:03:57Z gcosmo $
//
#ifndef G4UImanager_h
@@ -34,8 +34,10 @@
#include <vector>
#include <fstream>
#include "icomsdefs.hh"
#include "G4VStateDependent.hh"
#include "G4UIcommandStatus.hh"
class G4UIcommandTree;
class G4UIcommand;
class G4UIsession;
@@ -145,9 +147,9 @@ class G4UImanager : public G4VStateDependent
// void Interact(const char * promptCharacters);
private:
static G4ThreadLocal G4UImanager * fUImanager;
static G4ThreadLocal G4bool fUImanagerHasBeenKilled;
static G4UImanager * fMasterUImanager;
G4ICOMS_DLL static G4ThreadLocal G4UImanager * fUImanager;
G4ICOMS_DLL static G4ThreadLocal G4bool fUImanagerHasBeenKilled;
G4ICOMS_DLL static G4UImanager * fMasterUImanager;
G4UIcommandTree * treeTop;
G4UIsession * session;
G4UIsession * g4UIWindow;
@@ -282,7 +284,7 @@ class G4UImanager : public G4VStateDependent
private:
G4int threadID;
G4MTcoutDestination* threadCout;
static G4int igThreadID;
G4ICOMS_DLL static G4int igThreadID;
public:
void SetCoutFileName(const G4String& fileN = "G4cout.txt", G4bool ifAppend = true);
@@ -294,12 +296,11 @@ class G4UImanager : public G4VStateDependent
inline G4MTcoutDestination* GetThreadCout() {return threadCout;};
private:
static G4bool doublePrecisionStr;
G4ICOMS_DLL static G4bool doublePrecisionStr;
public:
inline static void UseDoublePrecisionStr(G4bool val) { doublePrecisionStr = val; }
inline static G4bool DoublePrecisionStr() { return doublePrecisionStr; }
static void UseDoublePrecisionStr(G4bool val);
static G4bool DoublePrecisionStr();
};
#endif
source/intercoms/include/G4UIsession.hh
+3 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIsession.hh 98731 2016-08-09 10:49:49Z gcosmo $
// $Id: G4UIsession.hh 106172 2017-09-15 13:03:57Z gcosmo $
//
// $id$
@@ -33,6 +33,7 @@
#include "G4coutDestination.hh"
#include "globals.hh"
#include "icomsdefs.hh"
// class description:
//
@@ -62,7 +63,7 @@ class G4UIsession : public G4coutDestination
// These two methods will be invoked by G4strstreambuf.
protected:
static G4int inSession;
G4ICOMS_DLL static G4int inSession;
G4int ifBatch;
public:
static G4int InSession() { return inSession; }
source/intercoms/include/G4VGlobalFastSimulationManager.hh
+4 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VGlobalFastSimulationManager.hh 67965 2013-03-13 09:35:29Z gcosmo $
// $Id: G4VGlobalFastSimulationManager.hh 106172 2017-09-15 13:03:57Z gcosmo $
//
//
// Abstract interface for GEANT4 Global Fast Simulation Manager.
@@ -54,7 +54,9 @@
#ifndef G4VGLOBALFASTSIMULATIONMANAGER_HH
#define G4VGLOBALFASTSIMULATIONMANAGER_HH
#include "G4Types.hh"
#include "icomsdefs.hh"
class G4VFlavoredParallelWorld;
class G4ParticleDefinition;
@@ -79,7 +81,7 @@ protected:
static void SetConcreteInstance (G4VGlobalFastSimulationManager*);
// Sets the pointer to actual Global Fast Simulation manager.
static G4ThreadLocal G4VGlobalFastSimulationManager* fpConcreteInstance;
G4ICOMS_DLL static G4ThreadLocal G4VGlobalFastSimulationManager* fpConcreteInstance;
// Pointer to real G4GlobalFastSimulationManager.
};
source/intercoms/include/icomsdefs.hh
+51
View File
@@ -0,0 +1,51 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
// $Id: $
//
//
// Defines for Windows DLLs import/export
//
#ifndef G4ICOMSWDEFS_HH
#define G4ICOMSWDEFS_HH
#include "G4Types.hh"
#ifdef WIN32
//
// Unique identifier for intercoms module
//
#if defined G4ICOMS_ALLOC_EXPORT
#define G4ICOMS_DLL G4DLLEXPORT
#else
#define G4ICOMS_DLL G4DLLIMPORT
#endif
#else
#define G4ICOMS_DLL
#endif
#endif /* G4ICOMSWDEFS_HH */
source/intercoms/sources.cmake
+2 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake 80403 2014-04-16 07:56:30Z gcosmo $
# $Id: sources.cmake 106172 2017-09-15 13:03:57Z gcosmo $
#
#------------------------------------------------------------------------------
@@ -57,6 +57,7 @@ GEANT4_DEFINE_MODULE(NAME G4intercoms
G4UnitsMessenger.hh
G4VFlavoredParallelWorld.hh
G4VGlobalFastSimulationManager.hh
icomsdefs.hh
SOURCES
G4LocalThreadCoutMessenger.cc
G4GenericMessenger.cc
source/intercoms/src/G4UImanager.cc
+6 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UImanager.cc 102561 2017-02-09 08:16:05Z gcosmo $
// $Id: G4UImanager.cc 106172 2017-09-15 13:03:57Z gcosmo $
//
//
// ---------------------------------------------------------------------
@@ -168,6 +168,11 @@ G4int G4UImanager::operator==(const G4UImanager &right) const
G4int G4UImanager::operator!=(const G4UImanager &right) const
{ return (this!=&right); }
void G4UImanager::UseDoublePrecisionStr(G4bool val)
{ doublePrecisionStr = val; }
G4bool G4UImanager::DoublePrecisionStr()
{ return doublePrecisionStr; }
G4String G4UImanager::GetCurrentValues(const char * aCommand)
{
G4String theCommand = aCommand;