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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/intercoms/src/G4GenericMessenger.cc
+17 -17
View File
@@ -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) {
source/intercoms/src/G4UIcommand.cc
+1 -1
View File
@@ -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 $
//
//
source/intercoms/src/G4UIcontrolMessenger.cc
+1 -1
View File
@@ -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>
source/intercoms/src/G4UImanager.cc
+1 -1
View File
@@ -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 $
//
//
// ---------------------------------------------------------------------