Import Geant4 10.3.1 source tree
This commit is contained in:
+10
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History 101679 2016-11-21 09:30:00Z gcosmo $
|
||||
$Id: History 102620 2017-02-10 08:11:22Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,15 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
February 9, 2017, M. Asai (run-V10-02-41)
|
||||
- Banner on worker RunManager will no longer be printed.
|
||||
|
||||
December 22, 2016, L. Desorgher (run-V10-02-40)
|
||||
-Modifications to solve bug with reverse track splitting. Works with tag tracking-V10-03-00.
|
||||
- Add G4AdjointSimManager::ResetDidOneAdjPartReachExtSourceDuringEvent()
|
||||
- Use G4AdjointSimManager::ResetDidOneAdjPartReachExtSourceDuringEvent() in
|
||||
G4AdjointPrimaryGeneratorAction.
|
||||
|
||||
November 15, 2016 A. Dotti (run-V10-02-38,-39)
|
||||
- Fix bug #1908: create unique names with logVol pointer value
|
||||
for G4MultiSD and avoid to register target SD implictly
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4AdjointSimManager.hh 98735 2016-08-09 10:54:06Z gcosmo $
|
||||
// $Id: G4AdjointSimManager.hh 102566 2017-02-09 08:35:24Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
// Class Name: G4AdjointSimManager.hh
|
||||
@@ -168,6 +168,7 @@ class G4AdjointSimManager: public G4UserRunAction
|
||||
G4bool GetDidAdjParticleReachTheExtSource();
|
||||
void RegisterAtEndOfAdjointTrack();
|
||||
void RegisterAdjointPrimaryWeight(G4double aWeight);
|
||||
void ResetDidOneAdjPartReachExtSourceDuringEvent();
|
||||
//to continue here
|
||||
inline G4int GetIDOfLastAdjParticleReachingExtSource(){return ID_of_last_particle_that_reach_the_ext_source;};
|
||||
G4ThreeVector GetPositionAtEndOfLastAdjointTrack(size_t i=0);
|
||||
@@ -262,6 +263,7 @@ class G4AdjointSimManager: public G4UserRunAction
|
||||
void SwitchToAdjointSimulationMode();
|
||||
void BackToFwdSimulationMode();
|
||||
|
||||
|
||||
private: //constructor and destructor
|
||||
|
||||
G4AdjointSimManager();
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4AdjointPrimaryGeneratorAction.cc 98735 2016-08-09 10:54:06Z gcosmo $
|
||||
// $Id: G4AdjointPrimaryGeneratorAction.cc 102566 2017-02-09 08:35:24Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Class Name: G4AdjointPrimaryGeneratorAction
|
||||
@@ -186,6 +186,7 @@ void G4AdjointPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
|
||||
//Call some methods of G4AdjointSimManager
|
||||
G4AdjointSimManager::GetInstance()->SetAdjointTrackingMode(true);
|
||||
G4AdjointSimManager::GetInstance()->ClearEndOfAdjointTrackInfoVectors();
|
||||
G4AdjointSimManager::GetInstance()->ResetDidOneAdjPartReachExtSourceDuringEvent();
|
||||
|
||||
/* if ( !last_generated_part_was_adjoint ) {
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4AdjointSimManager.cc 98735 2016-08-09 10:54:06Z gcosmo $
|
||||
// $Id: G4AdjointSimManager.cc 102566 2017-02-09 08:35:24Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Class Name: G4AdjointCrossSurfChecker
|
||||
@@ -693,5 +693,10 @@ void G4AdjointSimManager::EndOfRunAction(const G4Run* aRun)
|
||||
G4ParticleDefinition* G4AdjointSimManager::GetLastGeneratedFwdPrimaryParticle(){
|
||||
return theAdjointPrimaryGeneratorAction->GetLastGeneratedFwdPrimaryParticle();
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
void G4AdjointSimManager::ResetDidOneAdjPartReachExtSourceDuringEvent()
|
||||
{theAdjointSteppingAction->ResetDidOneAdjPartReachExtSourceDuringEvent();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RunManagerKernel.cc 99767 2016-10-05 08:54:01Z gcosmo $
|
||||
// $Id: G4RunManagerKernel.cc 102620 2017-02-10 08:11:22Z gcosmo $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -225,13 +225,15 @@ numberOfParallelWorld(0),geometryNeedsToBeClosed(true),
|
||||
<< G4endl;
|
||||
break;
|
||||
default:
|
||||
versionString = " Local thread RunManagerKernel version ";
|
||||
versionString += vs;
|
||||
G4cout << G4endl
|
||||
if(verboseLevel) {
|
||||
versionString = " Local thread RunManagerKernel version ";
|
||||
versionString += vs;
|
||||
G4cout << G4endl
|
||||
<< "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" << G4endl
|
||||
<< versionString << G4endl
|
||||
<< "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" << G4endl
|
||||
<< G4endl;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
|
||||
Reference in New Issue
Block a user