Import Geant4 10.4.1 source tree
This commit is contained in:
@@ -14,6 +14,24 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------*
|
||||
|
||||
09-02-2018, M.Asai tag emdna-V10-03-31
|
||||
- G4DNAMolecularMaterial.cc :
|
||||
GetDensityTableFor() and GetNumMolPerVolTableFor() methods are accepted
|
||||
at G4State_Init rather than G4State_Idle.
|
||||
- Co-works with run-V10-04-01 and global-V10-04-01.
|
||||
|
||||
21-12-2017, G.Cosmo
|
||||
- Fixed self-consistency in headers (missing #include) in G4IosFlagsSaver,
|
||||
G4KDNode, G4MoleculeIterator and G4LEPTSDiffXS.
|
||||
Fixed spurious definition of G4IT namespace in G4ITMultiNavigator header.
|
||||
Thanks to Raphael Isemann for reporting these.
|
||||
|
||||
01-11-2017, MK tag emdna-V10-03-30
|
||||
- remove models/test directory
|
||||
|
||||
31-10-2017, JA ( tag missing )
|
||||
- G4KDNode.hh: Add missing included file - needed in test
|
||||
|
||||
16-08-2017, SI tag emdna-V10-03-28
|
||||
- updated variable types in models
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
#include "G4TrackState.hh"
|
||||
#include "G4MultiNavigator.hh"
|
||||
|
||||
namespace G4IT
|
||||
namespace G4ITMN
|
||||
{
|
||||
enum ELimited
|
||||
{
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
#ifndef G4IosFlagsSaver_
|
||||
#define G4IosFlagsSaver_
|
||||
|
||||
#include <iostream>
|
||||
|
||||
class G4IosFlagsSaver
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4KDNode.hh 102616 2017-02-10 07:57:14Z gcosmo $
|
||||
// $Id: G4KDNode.hh 108498 2018-02-15 15:33:07Z gcosmo $
|
||||
//
|
||||
// Author: Mathieu Karamitros
|
||||
|
||||
@@ -48,13 +48,13 @@
|
||||
#define G4KDNODE_HH
|
||||
|
||||
#include <list>
|
||||
//#include <map>
|
||||
#include <vector>
|
||||
#include <deque>
|
||||
#include <ostream>
|
||||
|
||||
// geant4
|
||||
#include <G4Allocator.hh>
|
||||
#include "G4Types.hh"
|
||||
#include "G4Allocator.hh"
|
||||
|
||||
class G4KDTree;
|
||||
class G4KDMap;
|
||||
|
||||
+3
-3
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4DNAOneStepThermalizationModel.hh 101354 2016-11-15 08:27:51Z gcosmo $
|
||||
// $Id: G4DNAOneStepThermalizationModel.hh 108498 2018-02-15 15:33:07Z gcosmo $
|
||||
//
|
||||
// Author: Mathieu Karamitros
|
||||
|
||||
@@ -44,8 +44,8 @@
|
||||
// J. Comput. Phys. 274 (2014) 841-882
|
||||
// Prog. Nucl. Sci. Tec. 2 (2011) 503-508
|
||||
|
||||
#ifndef G4DNAOneStepThermalizationModel_
|
||||
#define G4DNAOneStepThermalizationModel_
|
||||
#ifndef G4DNAOneStepThermalizationModel_hh
|
||||
#define G4DNAOneStepThermalizationModel_hh
|
||||
|
||||
#include "G4VEmModel.hh"
|
||||
|
||||
|
||||
+2
-2
@@ -23,12 +23,12 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4DNAOneStepThermalizationModel.cc 96841 2016-05-12 13:40:37Z matkara $
|
||||
// $Id:$
|
||||
//
|
||||
// Author: Mathieu Karamitros
|
||||
//
|
||||
// WARNING : This class is released as a prototype.
|
||||
// It might strongly evolve or even disapear in the next releases.
|
||||
// It might strongly evolve or even disappear in the next releases.
|
||||
//
|
||||
// History:
|
||||
// -----------
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
#ifndef G4LEPTSDiffXS_h
|
||||
#define G4LEPTSDiffXS_h 1
|
||||
|
||||
|
||||
#include <string>
|
||||
#include "G4Types.hh"
|
||||
|
||||
class G4LEPTSDiffXS {
|
||||
|
||||
|
||||
+1
@@ -46,6 +46,7 @@
|
||||
#define G4MOLECULEITERATOR_HH_
|
||||
|
||||
#include <map>
|
||||
#include "globals.hh"
|
||||
|
||||
template<typename MOLECULE>
|
||||
class G4MoleculeIterator
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4DNAMolecularMaterial.cc 103042 2017-03-10 11:50:07Z gcosmo $
|
||||
// $Id: G4DNAMolecularMaterial.cc 108498 2018-02-15 15:33:07Z gcosmo $
|
||||
//
|
||||
// Author: Mathieu Karamitros
|
||||
//
|
||||
@@ -376,14 +376,14 @@ GetDensityTableFor(const G4Material* lookForMaterial) const
|
||||
exceptionDescription);
|
||||
}
|
||||
|
||||
if (G4StateManager::GetStateManager()->GetCurrentState() == G4State_Idle){
|
||||
if (G4StateManager::GetStateManager()->GetCurrentState() == G4State_Init){
|
||||
const_cast<G4DNAMolecularMaterial*>(this)->Initialize();
|
||||
}
|
||||
else{
|
||||
G4ExceptionDescription exceptionDescription;
|
||||
exceptionDescription
|
||||
<< "The geant4 application is at the wrong state. State must be: "
|
||||
"G4State_Idle."
|
||||
"G4State_Init."
|
||||
<< G4endl;
|
||||
G4Exception("G4DNAMolecularMaterial::GetDensityTableFor",
|
||||
"G4DNAMolecularMaterial_WRONG_STATE_APPLICATION",
|
||||
@@ -450,14 +450,14 @@ const std::vector<double>* G4DNAMolecularMaterial::GetNumMolPerVolTableFor(
|
||||
exceptionDescription);
|
||||
}
|
||||
|
||||
if (G4StateManager::GetStateManager()->GetCurrentState() == G4State_Idle){
|
||||
if (G4StateManager::GetStateManager()->GetCurrentState() == G4State_Init){
|
||||
const_cast<G4DNAMolecularMaterial*>(this)->Initialize();
|
||||
}
|
||||
else{
|
||||
G4ExceptionDescription exceptionDescription;
|
||||
exceptionDescription
|
||||
<< "The geant4 application is at the wrong state. State must be : "
|
||||
"G4State_Idle."
|
||||
"G4State_Init."
|
||||
<< G4endl;
|
||||
G4Exception("G4DNAMolecularMaterial::GetNumMolPerVolTableFor",
|
||||
"G4DNAMolecularMaterial_WRONG_STATE_APPLICATION",
|
||||
|
||||
Reference in New Issue
Block a user