Import Geant4 10.4.0.beta source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
$Id: History 104431 2017-05-31 07:45:11Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,7 +17,12 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
8 February, 2017 Makoto Asai (intercoms-V10-02-06)
|
||||
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
|
||||
built against Geant4 libraries compiled with MT enabled
|
||||
|
||||
8 February, 2017 Makoto Asai (intercoms-V10-03-00)
|
||||
- Introducing /control/useDoublePrecision command to use 17 digits
|
||||
print out for the current parameter values. Addressing to bug
|
||||
report #1921.
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcontrolMessenger.hh 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
// $Id: G4UIcontrolMessenger.hh 102561 2017-02-09 08:16:05Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4UIcontrolMessenger_h
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UImanager.hh 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
// $Id: G4UImanager.hh 102561 2017-02-09 08:16:05Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4UImanager_h
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "G4UIcmdWithADoubleAndUnit.hh"
|
||||
#include "G4UIcmdWith3VectorAndUnit.hh"
|
||||
#include "G4UIdirectory.hh"
|
||||
#include "G4Threading.hh"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -182,26 +183,26 @@ void G4GenericMessenger::SetGuidance(const G4String& s) {
|
||||
dircmd->SetGuidance(s);
|
||||
}
|
||||
|
||||
|
||||
G4GenericMessenger::Command& G4GenericMessenger::Command::SetUnit(const G4String& unit, UnitSpec spec) {
|
||||
// Change the type of command (unfortunatelly this is done a posteriory)
|
||||
// We need to delete the old command before creating the new one and therefore we need to recover the information
|
||||
// before the deletetion
|
||||
#ifdef G4MULTITHREADED
|
||||
G4String cmdpath = command->GetCommandPath();
|
||||
G4ExceptionDescription ed;
|
||||
ed<<"G4GenericMessenger::Command::SetUnit() is thread-unsafe and should not be used\n"
|
||||
<<"in multi-threaded mode. For your command <"<<cmdpath<<">, use\n"
|
||||
<<" DeclarePropertyWithUnit(const G4String& name, const G4String& defaultUnit,\n"
|
||||
<<" const G4AnyType& variable, const G4String& doc)\n"
|
||||
<<"or\n"
|
||||
<<" DeclareMethodWithUnit(const G4String& name, const G4String& defaultUnit,\n"
|
||||
<<" const G4AnyType& variable, const G4String& doc)\n"
|
||||
<<"to define a command with a unit <"<<unit<<">.";
|
||||
if(spec!=UnitDefault) { ed<<"\nPlease use a default unit instead of unit category."; }
|
||||
G4Exception("G4GenericMessenger::Command::SetUnit()","Intercom70001",FatalException,ed);
|
||||
return *this;
|
||||
#else
|
||||
if ( G4Threading::IsMultithreadedApplication() ) {
|
||||
G4String cmdpath = command->GetCommandPath();
|
||||
G4ExceptionDescription ed;
|
||||
ed<<"G4GenericMessenger::Command::SetUnit() is thread-unsafe and should not be used\n"
|
||||
<<"in multi-threaded mode. For your command <"<<cmdpath<<">, use\n"
|
||||
<<" DeclarePropertyWithUnit(const G4String& name, const G4String& defaultUnit,\n"
|
||||
<<" const G4AnyType& variable, const G4String& doc)\n"
|
||||
<<"or\n"
|
||||
<<" DeclareMethodWithUnit(const G4String& name, const G4String& defaultUnit,\n"
|
||||
<<" const G4AnyType& variable, const G4String& doc)\n"
|
||||
<<"to define a command with a unit <"<<unit<<">.";
|
||||
if(spec!=UnitDefault) { ed<<"\nPlease use a default unit instead of unit category."; }
|
||||
G4Exception("G4GenericMessenger::Command::SetUnit()","Intercom70001",FatalException,ed);
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4String cmdpath = command->GetCommandPath();
|
||||
G4UImessenger* messenger = command->GetMessenger();
|
||||
G4String range = command->GetRange();
|
||||
@@ -233,7 +234,6 @@ G4GenericMessenger::Command& G4GenericMessenger::Command::SetUnit(const G4String
|
||||
for (size_t i = 0; i < guidance.size(); i++) command->SetGuidance(guidance[i]);
|
||||
command->SetRange(range);
|
||||
return *this;
|
||||
#endif
|
||||
}
|
||||
|
||||
G4GenericMessenger::Command& G4GenericMessenger::Command::SetParameterName(const G4String& name,G4bool omittable, G4bool currentAsDefault) {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcommand.cc 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
// $Id: G4UIcommand.cc 102561 2017-02-09 08:16:05Z gcosmo $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcontrolMessenger.cc 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
// $Id: G4UIcontrolMessenger.cc 102561 2017-02-09 08:16:05Z gcosmo $
|
||||
//
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UImanager.cc 102562 2017-02-09 08:27:31Z gcosmo $
|
||||
// $Id: G4UImanager.cc 102561 2017-02-09 08:16:05Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user