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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/History
+12 -1
View File
@@ -1,4 +1,4 @@
$Id: History 91269 2015-06-29 07:05:59Z gcosmo $
$Id: History 96231 2016-03-30 10:35:46Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,17 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
30th Jan 2016 A. Dotti (tracking-V10-02-02)
- G4VTrajectory.cc: Added std::endl at end of ShowTrajectory.
18th Jan 2016 A. Dotti (tracking-V10-02-01)
- New G4Multi{Stepping,Tracking}Action to allow multiple user-actions in
the same job
27th January 2016 M. Asai (tracking-V10-02-00)
- G4SteppingManager.cc: Set OriginTouchableHandle for primary track.
Addressing to Bug report #1773.
26th June 2015 J. Allison (tracking-V10-01-01)
- G4RichTrajectory.cc: Coverity fix.
source/tracking/include/G4MultiSteppingAction.hh
+73
View File
@@ -0,0 +1,73 @@
//
// ********************************************************************
// * 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: G4MultiSteppingAction.hh 90212 2016-01-27 18:33:12Z adotti $
//
//---------------------------------------------------------------
//
// G4MultiSteppingAction.hh
//
// Created on: Jan 17, 2016
// Author: adotti
//
//
// class description:
// This class extends G4UserSteppingAction and allows multiple
// user-defined tracking actions to be used in the same job.
// The class is a vector of user-defined tracking actions.
// This class owns and manages the dependent user-actions.
// Usage:
// There is no need to explicitly use this class as long as the
// user actions are set via G4UserActionInitialization::SetUserAction
// that can be called several times. Explicitly this is what is happening:
// In user-defined action initialization:
// G4MultiSteppingAction* action = new G4MultiSteppingAction;
// action->push_back( G4UserSteppingActionUPtr( new MyUserSteppingAction );
// [... add as many as needed ...]
// SetUserAction( action );
// ---------------------------------------------------------------
//
#ifndef G4MULTISTEPPINGACTION_HH_
#define G4MULTISTEPPINGACTION_HH_
#include "G4UserSteppingAction.hh"
#include <vector>
#include <memory>
using G4UserSteppingActionUPtr=std::unique_ptr<G4UserSteppingAction>;
using G4UserSteppingActionVector=std::vector<G4UserSteppingActionUPtr>;
class G4MultiSteppingAction : public G4UserSteppingAction , public G4UserSteppingActionVector
{
public:
G4MultiSteppingAction() = default;
virtual ~G4MultiSteppingAction() override = default;
virtual void UserSteppingAction(const G4Step*) override;
virtual void SetSteppingManagerPointer(G4SteppingManager* pValue) override;
};
#endif /* SOURCE_TRACKING_INCLUDE_G4MULTISTEPPINGACTION_HH_ */
source/tracking/include/G4MultiTrackingAction.hh
+73
View File
@@ -0,0 +1,73 @@
//
// ********************************************************************
// * 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: G4MultiTrackingAction.hh 90212 2016-01-27 18:33:12Z adotti $
//
//---------------------------------------------------------------
//
// G4MultiTrackingAction.hh
//
// Created on: Jan 17, 2016
// Author: adotti
//
//
// class description:
// This class extends G4UserTrackingAction and allows multiple
// user-defined tracking actions to be used in the same job.
// The class is a vector of user-defined tracking actions.
// This class owns and manages the dependent user-actions.
// Usage:
// There is no need to explicitly use this class as long as the
// user actions are set via G4UserActionInitialization::SetUserAction
// that can be called several times. Explicitly this is what is happening:
// In user-defined action initialization:
// G4MultiTrackingAction* action = new G4MultiTrackingAction;
// action->push_back( G4UserTrackingActionUPtr( new MyUserTrackingAction );
// [... add as many as needed ...]
// SetUserAction( action );
// ---------------------------------------------------------------
#ifndef G4MULTITRACKINGACTION_HH_
#define G4MULTITRACKINGACTION_HH_
#include "G4UserTrackingAction.hh"
#include <vector>
#include <memory>
using G4UserTrackingActionUPtr=std::unique_ptr<G4UserTrackingAction>;
using G4UserTrackingActionVector=std::vector<G4UserTrackingActionUPtr>;
class G4MultiTrackingAction : public G4UserTrackingAction , public G4UserTrackingActionVector
{
public:
G4MultiTrackingAction() = default;
virtual ~G4MultiTrackingAction() override = default;
virtual void SetTrackingManagerPointer(G4TrackingManager* pValue) override;
virtual void PreUserTrackingAction(const G4Track*) override;
virtual void PostUserTrackingAction(const G4Track*) override;
};
#endif /* G4MULTITRACKINGACTION_HH_ */
source/tracking/include/G4UserSteppingAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UserSteppingAction.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4UserSteppingAction.hh 95247 2016-02-02 09:36:27Z gcosmo $
//
//---------------------------------------------------------------
//
@@ -61,7 +61,7 @@ public: // with description
virtual ~G4UserSteppingAction();
// Member functions
void SetSteppingManagerPointer(G4SteppingManager* pValue);
virtual void SetSteppingManagerPointer(G4SteppingManager* pValue);
virtual void UserSteppingAction(const G4Step*){;}
//-----------
source/tracking/include/G4UserTrackingAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UserTrackingAction.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4UserTrackingAction.hh 95247 2016-02-02 09:36:27Z gcosmo $
//
//
//---------------------------------------------------------------
@@ -64,7 +64,7 @@ public: // with description
virtual ~G4UserTrackingAction();
// Member functions
void SetTrackingManagerPointer(G4TrackingManager* pValue);
virtual void SetTrackingManagerPointer(G4TrackingManager* pValue);
virtual void PreUserTrackingAction(const G4Track*){;}
virtual void PostUserTrackingAction(const G4Track*){;}
source/tracking/sources.cmake
+6 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake 77241 2013-11-22 09:55:47Z gcosmo $
# $Id: sources.cmake 95247 2016-02-02 09:36:27Z gcosmo $
#
#------------------------------------------------------------------------------
@@ -58,7 +58,9 @@ GEANT4_DEFINE_MODULE(NAME G4tracking
G4Trajectory.hh
G4TrajectoryPoint.hh
G4UserSteppingAction.hh
G4MultiSteppingAction.hh
G4UserTrackingAction.hh
G4MultiTrackingAction.hh
G4VSteppingVerbose.hh
G4VTrajectory.hh
G4VTrajectoryPoint.hh
@@ -79,10 +81,13 @@ GEANT4_DEFINE_MODULE(NAME G4tracking
G4Trajectory.cc
G4TrajectoryPoint.cc
G4UserSteppingAction.cc
G4MultiSteppingAction.cc
G4UserTrackingAction.cc
G4MultiTrackingAction.cc
G4VSteppingVerbose.cc
G4VTrajectory.cc
G4VTrajectoryPoint.cc
G4MultiSteppingAction.cc
GRANULAR_DEPENDENCIES
G4csg
G4cuts
source/tracking/src/G4MultiSteppingAction.cc
+49
View File
@@ -0,0 +1,49 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
//
// ---------------------------------------------------------------
//
// G4MultiUserSteppingAction.cc
//
// Created on: Jan 17, 2016
// Author: adotti
//
// ---------------------------------------------------------------
#include <G4MultiSteppingAction.hh>
#include <algorithm>
void G4MultiSteppingAction::UserSteppingAction(const G4Step* step) {
std::for_each( begin() , end() ,
[step](G4UserSteppingActionUPtr& e) { e->UserSteppingAction(step); }
);
}
void G4MultiSteppingAction::SetSteppingManagerPointer(G4SteppingManager* pValue) {
std::for_each( begin() , end() ,
[pValue](G4UserSteppingActionUPtr& e) { e->SetSteppingManagerPointer(pValue); }
);
}
source/tracking/src/G4MultiTrackingAction.cc
+56
View File
@@ -0,0 +1,56 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
//
// ---------------------------------------------------------------
//
// G4MultiTrackingAction.cc
//
// Created on: Jan 17, 2016
// Author: adotti
//
// ---------------------------------------------------------------
#include "G4MultiTrackingAction.hh"
#include <algorithm>
void G4MultiTrackingAction::SetTrackingManagerPointer(G4TrackingManager* pValue) {
std::for_each( begin(), end() ,
[pValue](G4UserTrackingActionUPtr& e) { e->SetTrackingManagerPointer(pValue); }
);
}
void G4MultiTrackingAction::PreUserTrackingAction(const G4Track* trk) {
std::for_each( begin(), end() ,
[trk](G4UserTrackingActionUPtr& e) { e->PreUserTrackingAction(trk); }
);
}
void G4MultiTrackingAction::PostUserTrackingAction(const G4Track* trk) {
std::for_each( begin(), end() ,
[trk](G4UserTrackingActionUPtr& e) { e->PostUserTrackingAction(trk); }
);
}
source/tracking/src/G4SteppingManager.cc
+6 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4SteppingManager.cc 77790 2013-11-28 09:52:16Z gcosmo $
// $Id: G4SteppingManager.cc 95198 2016-01-29 08:28:27Z gcosmo $
//
//---------------------------------------------------------------
//
@@ -318,6 +318,11 @@ void G4SteppingManager::SetInitialStep(G4Track* valueTrack)
fTrack->SetNextTouchableHandle( fTouchableHandle );
}
}
// Set OriginTouchableHandle for primary track
if(fTrack->GetParentID()==0){
fTrack->SetOriginTouchableHandle(fTrack->GetTouchableHandle());
}
// Set vertex information of G4Track at here
if ( fTrack->GetCurrentStepNumber() == 0 ) {
fTrack->SetVertexPosition( fTrack->GetPosition() );
source/tracking/src/G4VTrajectory.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VTrajectory.cc 78003 2013-12-02 08:26:54Z gcosmo $
// $Id: G4VTrajectory.cc 96231 2016-03-30 10:35:46Z gcosmo $
//
// ---------------------------------------------------------------
//
@@ -109,7 +109,7 @@ void G4VTrajectory::ShowTrajectory(std::ostream& os) const
delete attValues; // AttValues must be deleted after use.
}
os << "\n";
os << std::endl;
}
void G4VTrajectory::DrawTrajectory() const