Import Geant4 4.1.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-08 16:39:52 +02:00
parent 921d3b1cda
commit 330b82b769
4524 changed files with 178689 additions and 43575 deletions
@@ -22,7 +22,7 @@
//
//
// $Id: G4CollectionNameVector.hh,v 1.2 2001/07/11 09:58:42 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4CollectionNameVector_H
@@ -22,7 +22,7 @@
//
//
// $Id: G4HCtable.hh,v 1.6 2001/07/11 09:58:42 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4HCtable_H
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDManager.hh,v 1.4 2001/07/11 09:58:43 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4SDManager_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDStructure.hh,v 1.7 2001/07/13 15:00:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4SDStructure_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDmessenger.hh,v 1.4 2001/07/11 09:58:43 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4SDmessenger_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4SensitiveVolumeList.hh,v 1.6 2001/07/11 09:58:43 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ------------------------------------------------------------
// GEANT 4 class header file --- Copyright CERN 1996
@@ -22,7 +22,7 @@
//
//
// $Id: G4SensitiveVolumeList.icc,v 1.5 2001/07/11 09:58:43 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// -----------------------------------------------------------
// Inline functions of GEANT 4 class header file.
@@ -22,7 +22,7 @@
//
//
// $Id: G4VReadOutGeometry.hh,v 1.3 2001/07/11 09:58:43 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ------------------------------------------------------------
@@ -22,7 +22,7 @@
//
//
// $Id: G4VSensitiveDetector.hh,v 1.7 2001/07/13 15:00:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VSensitiveDetector_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HCtable.cc,v 1.6 2001/07/13 15:00:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4HCtable.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDManager.cc,v 1.4 2001/07/13 15:00:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4SDManager.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDStructure.cc,v 1.6 2001/07/13 15:00:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4SDStructure
@@ -22,7 +22,7 @@
//
//
// $Id: G4SDmessenger.cc,v 1.3 2001/07/11 09:58:44 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ---------------------------------------------------------------------
@@ -22,7 +22,7 @@
//
//
// $Id: G4SensitiveVolumeList.cc,v 1.5 2001/07/13 15:00:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// --------------------------------------------------------------
// GEANT 4 class implementation file
@@ -22,7 +22,7 @@
//
//
// $Id: G4VReadOutGeometry.cc,v 1.5 2001/07/13 15:00:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4VReadOutGeometry.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4VSensitiveDetector.cc,v 1.5 2001/07/13 15:00:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VSensitiveDetector
#include "G4VSensitiveDetector.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4DCofThisEvent.hh,v 1.7 2001/07/13 15:00:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4DCofThisEvent_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4TDigiCollection.hh,v 1.10 2001/07/13 15:00:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4TDigiCollection_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VDigi.hh,v 1.7 2001/07/13 15:00:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VDigi_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4VDigiCollection.hh,v 1.7 2001/07/13 15:00:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VDigiCollection_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4DCofThisEvent.cc,v 1.6 2001/07/13 15:00:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4DCofThisEvent.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4TDigiCollection.cc,v 1.4 2001/07/13 15:00:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4TDigiCollection.hh"
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VDigi.cc,v 1.6 2001/07/13 15:00:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VDigi
@@ -22,7 +22,7 @@
//
//
// $Id: G4VDigiCollection.cc,v 1.6 2001/07/13 15:00:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VDigiCollection
@@ -22,7 +22,7 @@
//
//
// $Id: G4HCofThisEvent.hh,v 1.7 2001/07/13 15:00:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4HCofThisEvent_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4THitsCollection.hh,v 1.9 2001/07/13 15:00:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4THitsCollection_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VHit.hh,v 1.6 2001/07/13 15:00:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VHit_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4VHitsCollection.hh,v 1.6 2001/07/13 15:00:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VHitsCollection_h
@@ -22,7 +22,7 @@
//
//
// $Id: G4HCofThisEvent.cc,v 1.6 2001/07/13 15:00:20 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4HCofThisEvent.hh"
@@ -22,7 +22,7 @@
//
//
// $Id: G4THitsCollection.cc,v 1.3 2001/07/11 09:58:47 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4THitsCollection.hh"
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VHit.cc,v 1.4 2001/07/13 15:00:21 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VHit
@@ -22,7 +22,7 @@
//
//
// $Id: G4VHitsCollection.cc,v 1.4 2001/07/13 15:00:21 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VHitsCollection
+20 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.35 2001/11/22 19:24:35 gcosmo Exp $
$Id: History,v 1.40 2002/06/08 20:36:18 asaim Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,25 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Jun 8 2002, M.Asai (event-V04-00-04)
- Fix G4TrajectoryContainer to be compliant to gcc-3.1.
May 29 2002, M.Asai (event-V04-00-03)
- Added TransferOneStackedTrack() method to G4StackManager.
May 15 2002, M.Asai (event-V04-00-02)
- Introducing new G4TrajectoryContainer class which aggregates STL vector,
instead of deriving from STL vector.
Feb 26 2002, G.Cosmo (event-V04-00-01)
- Optimised implementation of SetNewValue() in G4ParticleGunMessenger and
G4GeneralParticleSourceMessenger to allow porting on WIN32-VC for optimised
compilation.
Jan 22 2002, M.Asai (event-V04-00-00)
- Remove the check G4PrimaryTransformer whether the primary vertex is inside
the world volume. The check has been moved to G4SteppingManager.
Nov 21 2001, M.Asai (event-V03-02-09)
- G4PrimaryTransformer.cc: now considering case where a primary is placed on the
boundary of the world volume. Added units.
@@ -22,7 +22,7 @@
//
//
// $Id: G4ClassificationOfNewTrack.hh,v 1.5 2001/07/19 00:14:15 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EvManMessenger.hh,v 1.4 2001/07/11 09:58:47 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4EvManMessenger_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Event.hh,v 1.5 2001/07/13 15:01:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4Event_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EventManager.hh,v 1.9 2001/07/19 00:14:15 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
@@ -32,7 +32,7 @@
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSource.hh,v 1.7 2001/10/19 16:48:28 flei Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
///////////////////////////////////////////////////////////////////////////////
//
// Class Description:
@@ -31,8 +31,8 @@
// Customer: ESA/ESTEC
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSourceMessenger.hh,v 1.7 2001/10/19 16:48:28 flei Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4GeneralParticleSourceMessenger.hh,v 1.8 2002/02/26 16:34:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
///////////////////////////////////////////////////////////////////////////////
//
// Class Description:
@@ -107,6 +107,9 @@ public:
// these values with the appropriate member function of G4GeneralParticleSource.
G4String GetCurrentValue(G4UIcommand *command);
private:
void IonCommand(G4String newValues);
private:
G4GeneralParticleSource *fParticleGun;
G4ParticleTable *particleTable;
@@ -194,6 +197,3 @@ private: //commands
#endif
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HEPEvtInterface.hh,v 1.6 2001/07/11 09:58:48 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4HEPEvtInterface_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HEPEvtParticle.hh,v 1.5 2001/07/13 15:01:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleGun.hh,v 1.7 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4ParticleGun_h
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleGunMessenger.hh,v 1.6 2001/07/11 09:58:48 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4ParticleGunMessenger.hh,v 1.7 2002/02/26 16:34:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
@@ -59,6 +59,8 @@ class G4ParticleGunMessenger: public G4UImessenger
void SetNewValue(G4UIcommand * command,G4String newValues);
G4String GetCurrentValue(G4UIcommand * command);
private:
void IonCommand(G4String newValues);
private:
G4ParticleGun * fParticleGun;
@@ -87,4 +89,3 @@ class G4ParticleGunMessenger: public G4UImessenger
#endif
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryParticle.hh,v 1.10 2001/07/13 15:01:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryTransformer.hh,v 1.6 2001/07/18 01:25:44 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4PromaryTransformer_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryVertex.hh,v 1.7 2001/07/13 15:01:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
+10 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StackManager.hh,v 1.8 2001/07/19 00:14:16 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4StackManager.hh,v 1.9 2002/05/29 22:51:45 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
@@ -93,11 +93,18 @@ class G4StackManager
// method, which invokes this method.
void TransferStackedTracks(G4ClassificationOfNewTrack origin, G4ClassificationOfNewTrack destination);
// Transfter stacked track from the origin stack to the destination stack.
// Transfter all stacked tracks from the origin stack to the destination stack.
// The destination stack needs not be empty.
// If the destination is fKill, tracks are deleted.
// If the origin is fKill, nothing happen.
void TransferOneStackedTrack(G4ClassificationOfNewTrack origin, G4ClassificationOfNewTrack destination);
// Transfter one stacked track from the origin stack to the destination stack.
// The transfered track is the one which came last to the origin stack.
// The destination stack needs not be empty.
// If the destination is fKill, the track is deleted.
// If the origin is fKill, nothing happen.
private:
G4UserStackingAction * userStackingAction;
G4int verboseLevel;
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackedTrack.hh,v 1.6 2001/07/13 15:01:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// Last Modification : 02/Feb/96 M.Asai
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackingMessenger.hh,v 1.4 2001/07/11 09:58:49 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4StackingMessenger_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackStack.hh,v 1.5 2001/07/13 15:01:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
+43 -8
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4TrajectoryContainer.hh,v 1.8 2001/07/13 15:01:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4TrajectoryContainer.hh,v 1.10 2002/06/08 20:36:18 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// G4TrajectoryContainer
@@ -37,21 +37,56 @@
#ifndef G4TrajectoryContainer_h
#define G4TrajectoryContainer_h 1
#include "globals.hh"
#include "G4VTrajectory.hh"
#include "G4Allocator.hh"
#include "g4std/vector"
class G4TrajectoryContainer : public G4std::vector<G4VTrajectory*>
typedef G4std::vector<G4VTrajectory*> TrajectoryVector;
class G4TrajectoryContainer
{
public:
G4TrajectoryContainer() {;}
~G4TrajectoryContainer() {;}
G4TrajectoryContainer();
~G4TrajectoryContainer();
inline void *operator new(size_t);
inline void operator delete(void* anEvent);
G4int operator==(const G4TrajectoryContainer& right) const;
G4int operator!=(const G4TrajectoryContainer& right) const;
public:
inline G4int entries() { return size(); }
inline size_t size() const { return vect->size(); }
inline void push_back(G4VTrajectory* p) { vect->push_back(p); }
inline G4int entries() const { return size(); }
inline G4bool insert(G4VTrajectory* p) { push_back(p); return true; }
inline void clearAndDestroy()
{
for(size_t i=0;i<size();i++) delete (*this)[i];
clear();
for(size_t i=0;i<size();i++) delete (*vect)[i];
vect->clear();
}
inline G4VTrajectory* operator[](size_t n) { return (*vect)[n]; }
inline TrajectoryVector* GetVector() const { return vect; }
private:
TrajectoryVector* vect;
};
extern G4Allocator<G4TrajectoryContainer> aTrajectoryContainerAllocator;
inline void* G4TrajectoryContainer::operator new(size_t)
{
void* aTrajectoryContainer;
aTrajectoryContainer = (void*)aTrajectoryContainerAllocator.MallocSingle();
return aTrajectoryContainer;
}
inline void G4TrajectoryContainer::operator delete(void* aTrajectoryContainer)
{
aTrajectoryContainerAllocator.FreeSingle((G4TrajectoryContainer*)aTrajectoryContainer);
}
#endif
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserEventAction.hh,v 1.5 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserStackingAction.hh,v 1.5 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4UserStackingAction_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VPrimaryGenerator.hh,v 1.6 2001/11/21 13:48:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef G4VPrimaryGenerator_h
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: eventgendefs.hh,v 1.3 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#ifndef EventGenerator_DEBUG
#define EventGenerator_DEBUG
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: evmandefs.hh,v 1.3 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
///#define G4EVENTMANAGER_DEBUG 1
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: trajectoryControl.hh,v 1.3 2001/07/11 09:58:51 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
////#define G4_STORE_TRAJECTORY 1
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EvManMessenger.cc,v 1.3 2001/07/11 09:58:52 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// --------------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Event.cc,v 1.4 2001/07/13 15:01:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4Event
+4 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4EventManager.cc,v 1.11 2001/08/28 05:35:00 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4EventManager.cc,v 1.12 2002/05/15 05:47:49 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
//
@@ -173,7 +173,8 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
if(aTrajectory&&(istop!=fStopButAlive)&&(istop!=fSuspend))
{
if(!trajectoryContainer)
{ trajectoryContainer = new G4TrajectoryContainer; }
{ trajectoryContainer = new G4TrajectoryContainer;
currentEvent->SetTrajectoryContainer(trajectoryContainer); }
trajectoryContainer->insert(aTrajectory);
}
#endif
@@ -224,10 +225,6 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
if(sdManager)
{ sdManager->TerminateCurrentEvent(currentEvent->GetHCofThisEvent()); }
#ifdef G4_STORE_TRAJECTORY
currentEvent->SetTrajectoryContainer(trajectoryContainer);
#endif
if(userEventAction) userEventAction->EndOfEventAction(currentEvent);
currentEvent = 0;
+1 -1
View File
@@ -39,7 +39,7 @@
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSource.cc,v 1.14 2001/10/19 16:48:28 flei Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
///////////////////////////////////////////////////////////////////////////////
//
// CHANGE HISTORY
@@ -761,39 +761,7 @@ void G4GeneralParticleSourceMessenger::SetNewValue(G4UIcommand *command, G4Strin
else if( command==numberCmd )
{ fParticleGun->SetNumberOfParticles(numberCmd->GetNewIntValue(newValues)); }
else if( command==ionCmd )
{
if (fShootIon) {
G4Tokenizer next( newValues );
// check argument
fAtomicNumber = StoI(next());
fAtomicMass = StoI(next());
G4String sQ = next();
if (sQ.isNull()) {
fIonCharge = fAtomicNumber;
} else {
fIonCharge = StoI(sQ);
sQ = next();
if (sQ.isNull()) {
fIonExciteEnergy = 0.0;
} else {
fIonExciteEnergy = StoD(sQ) * keV;
}
}
G4ParticleDefinition* ion;
ion = particleTable->GetIon( fAtomicNumber, fAtomicMass, fIonExciteEnergy);
if (ion==0) {
G4cout << "Ion with Z=" << fAtomicNumber;
G4cout << " A=" << fAtomicMass << "is not be defined" << G4endl;
} else {
fParticleGun->SetParticleDefinition(ion);
fParticleGun->SetParticleCharge(fIonCharge*eplus);
}
} else {
G4cout << "Set /gps/particle to ion before using /gps/ion command";
G4cout << G4endl;
}
}
{ IonCommand(newValues); }
else if( command==listCmd )
{ particleTable->DumpTable(); }
else if( command==directionCmd )
@@ -839,7 +807,48 @@ G4String G4GeneralParticleSourceMessenger::GetCurrentValue(G4UIcommand * command
return cv;
}
void G4GeneralParticleSourceMessenger::IonCommand(G4String newValues)
{
if (fShootIon)
{
G4Tokenizer next( newValues );
// check argument
fAtomicNumber = StoI(next());
fAtomicMass = StoI(next());
G4String sQ = next();
if (sQ.isNull())
{
fIonCharge = fAtomicNumber;
}
else
{
fIonCharge = StoI(sQ);
sQ = next();
if (sQ.isNull())
{
fIonExciteEnergy = 0.0;
}
else
{
fIonExciteEnergy = StoD(sQ) * keV;
}
}
G4ParticleDefinition* ion;
ion = particleTable->GetIon( fAtomicNumber, fAtomicMass, fIonExciteEnergy);
if (ion==0)
{
G4cout << "Ion with Z=" << fAtomicNumber;
G4cout << " A=" << fAtomicMass << "is not be defined" << G4endl;
}
else
{
fParticleGun->SetParticleDefinition(ion);
fParticleGun->SetParticleCharge(fIonCharge*eplus);
}
}
else
{
G4cout << "Set /gps/particle to ion before using /gps/ion command";
G4cout << G4endl;
}
}
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HEPEvtInterface.cc,v 1.7 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// --------------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HEPEvtParticle.cc,v 1.4 2001/07/13 15:01:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleGun.cc,v 1.6 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4ParticleGun
+37 -35
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleGunMessenger.cc,v 1.7 2001/10/11 13:34:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4ParticleGunMessenger.cc,v 1.8 2002/02/26 16:34:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4ParticleGunMessenger.hh"
@@ -180,39 +180,7 @@ void G4ParticleGunMessenger::SetNewValue(G4UIcommand * command,G4String newValue
else if( command==numberCmd )
{ fParticleGun->SetNumberOfParticles(numberCmd->GetNewIntValue(newValues)); }
else if( command==ionCmd )
{
if (fShootIon) {
G4Tokenizer next( newValues );
// check argument
fAtomicNumber = StoI(next());
fAtomicMass = StoI(next());
G4String sQ = next();
if (sQ.isNull()) {
fIonCharge = fAtomicNumber;
} else {
fIonCharge = StoI(sQ);
sQ = next();
if (sQ.isNull()) {
fIonExciteEnergy = 0.0;
} else {
fIonExciteEnergy = StoD(sQ) * keV;
}
}
G4ParticleDefinition* ion;
ion = particleTable->GetIon( fAtomicNumber, fAtomicMass, fIonExciteEnergy);
if (ion==0) {
G4cout << "Ion with Z=" << fAtomicNumber;
G4cout << " A=" << fAtomicMass << "is not be defined" << G4endl;
} else {
fParticleGun->SetParticleDefinition(ion);
fParticleGun->SetParticleCharge(fIonCharge*eplus);
}
} else {
G4cout << "Set /gun/particle to ion before using /gun/ion command";
G4cout << G4endl;
}
}
{ IonCommand(newValues); }
}
G4String G4ParticleGunMessenger::GetCurrentValue(G4UIcommand * command)
@@ -245,4 +213,38 @@ G4String G4ParticleGunMessenger::GetCurrentValue(G4UIcommand * command)
return cv;
}
void G4ParticleGunMessenger::IonCommand(G4String newValues)
{
if (fShootIon) {
G4Tokenizer next( newValues );
// check argument
fAtomicNumber = StoI(next());
fAtomicMass = StoI(next());
G4String sQ = next();
if (sQ.isNull()) {
fIonCharge = fAtomicNumber;
} else {
fIonCharge = StoI(sQ);
sQ = next();
if (sQ.isNull()) {
fIonExciteEnergy = 0.0;
} else {
fIonExciteEnergy = StoD(sQ) * keV;
}
}
G4ParticleDefinition* ion;
ion = particleTable->GetIon( fAtomicNumber, fAtomicMass, fIonExciteEnergy);
if (ion==0) {
G4cout << "Ion with Z=" << fAtomicNumber;
G4cout << " A=" << fAtomicMass << "is not be defined" << G4endl;
} else {
fParticleGun->SetParticleDefinition(ion);
fParticleGun->SetParticleCharge(fIonCharge*eplus);
}
} else {
G4cout << "Set /gun/particle to ion before using /gun/ion command";
G4cout << G4endl;
}
}
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryParticle.cc,v 1.7 2001/07/13 15:01:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4PrimaryParticle.hh"
+2 -19
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PrimaryTransformer.cc,v 1.13 2001/11/22 18:53:13 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4PrimaryTransformer.cc,v 1.14 2002/01/23 03:20:38 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4PrimaryTransformer.hh"
@@ -33,11 +33,6 @@
#include "G4Track.hh"
#include "G4ThreeVector.hh"
#include "G4DecayProducts.hh"
#include "G4TransportationManager.hh"
#include "G4Navigator.hh"
#include "G4VPhysicalVolume.hh"
#include "G4LogicalVolume.hh"
#include "G4VSolid.hh"
#include "G4UnitsTable.hh"
#include "G4ios.hh"
@@ -84,18 +79,6 @@ void G4PrimaryTransformer::GenerateTracks(G4PrimaryVertex* primaryVertex)
}
#endif
//Check whether the vertex is inside the world volume
G4Navigator* navi =
G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
G4VSolid* theWorldSolid = navi->GetWorldVolume()->GetLogicalVolume()->GetSolid();
if(theWorldSolid->Inside(G4ThreeVector(X0,Y0,Z0))==kOutside)
{
G4cerr << "Primary vertex "
<< G4BestUnit(G4ThreeVector(X0,Y0,Z0),G4String("Length"))
<< " is outside of the world volume." << G4endl;
G4Exception("G4PrimaryTransformer::Primary vertex outside of the world");
}
G4PrimaryParticle* primaryParticle = primaryVertex->GetPrimary();
while( primaryParticle != 0 )
{
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryVertex.cc,v 1.5 2001/07/13 15:01:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4PrimaryVertex.hh"
+64 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StackManager.cc,v 1.6 2001/07/19 00:14:17 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4StackManager.cc,v 1.7 2002/05/29 22:51:45 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
@@ -301,6 +301,7 @@ void G4StackManager::SetNumberOfAdditionalWaitingStacks(G4int iAdd)
void G4StackManager::TransferStackedTracks(G4ClassificationOfNewTrack origin, G4ClassificationOfNewTrack destination)
{
if(origin==destination) return;
G4TrackStack* originStack = 0;
switch(origin)
{
@@ -351,12 +352,72 @@ void G4StackManager::TransferStackedTracks(G4ClassificationOfNewTrack origin, G4
break;
}
if(!targetStack) return;
if(originStack==targetStack) return;
originStack->TransferTo(targetStack);
}
return;
}
void G4StackManager::TransferOneStackedTrack(G4ClassificationOfNewTrack origin, G4ClassificationOfNewTrack destination)
{
if(origin==destination) return;
G4TrackStack* originStack = 0;
switch(origin)
{
case fUrgent:
originStack = urgentStack;
break;
case fWaiting:
originStack = waitingStack;
break;
case fPostpone:
originStack = postponeStack;
break;
case fKill:
break;
default:
int i = origin - 10;
if(i<=numberOfAdditionalWaitingStacks) originStack = additionalWaitingStacks[i-1];
break;
}
if(!originStack) return;
G4StackedTrack * aStackedTrack;
if(destination==fKill)
{
if( (aStackedTrack=originStack->PopFromStack()) != 0 )
{
delete aStackedTrack->GetTrack();
delete aStackedTrack;
}
}
else
{
G4TrackStack* targetStack = 0;
switch(destination)
{
case fUrgent:
targetStack = urgentStack;
break;
case fWaiting:
targetStack = waitingStack;
break;
case fPostpone:
targetStack = postponeStack;
break;
default:
int i = origin - 10;
if(i<=numberOfAdditionalWaitingStacks) targetStack = additionalWaitingStacks[i-1];
break;
}
if(!targetStack) return;
if( (aStackedTrack=originStack->PopFromStack()) != 0 )
{
targetStack->PushToStack(aStackedTrack);
}
}
return;
}
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackedTrack.cc,v 1.5 2001/07/13 15:01:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// Last Modification : 02/Feb/96 M.Asai
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackingMessenger.cc,v 1.3 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// --------------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackStack.cc,v 1.4 2001/07/13 15:01:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
+41
View File
@@ -0,0 +1,41 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * 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. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4TrajectoryContainer.cc,v 1.1 2002/05/15 05:47:49 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4TrajectoryContainer.hh"
G4Allocator<G4TrajectoryContainer> aTrajectoryContainerAllocator;
G4TrajectoryContainer::G4TrajectoryContainer()
{ vect = new TrajectoryVector; }
G4TrajectoryContainer::~G4TrajectoryContainer()
{ delete vect; }
G4int G4TrajectoryContainer::operator==(const G4TrajectoryContainer& right) const
{ return (this==&right); }
G4int G4TrajectoryContainer::operator!=(const G4TrajectoryContainer& right) const
{ return (this!=&right); }
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserEventAction.cc,v 1.4 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4UserEventAction.hh"
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserStackingAction.cc,v 1.4 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
#include "G4UserStackingAction.hh"
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VPrimaryGenerator.cc,v 1.3 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G4VPrimaryGenerator
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3DetTable.hh,v 1.7 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G3DetTable class
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3DetTableEntry.hh,v 1.4 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// G3DetTableEntry class
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3Division.hh,v 1.7 2001/11/21 14:25:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3EleTable.hh,v 1.7 2001/07/16 15:38:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3G4Interface.hh,v 1.9 2001/11/08 16:07:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// Interfaces for G3 equivalent routines
//
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3MatTable.hh,v 1.11 2001/07/16 15:38:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3MatTableEntry.hh,v 1.5 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3MedTable.hh,v 1.10 2001/07/16 15:38:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3MedTableEntry.hh,v 1.5 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3PartTable.hh,v 1.8 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3Pos.hh,v 1.10 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3RotTable.hh,v 1.13 2001/07/16 15:38:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3RotTableEntry.hh,v 1.5 2001/07/11 09:58:57 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3SensVolVector.hh,v 1.5 2001/07/16 15:38:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// vector of logical volumes that were defined with
// tracking medium with ISVOL=1
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3VolTable.hh,v 1.16 2001/07/11 09:58:58 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3VolTableEntry.hh,v 1.7 2001/11/08 16:07:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3toG4.hh,v 1.7 2001/07/11 09:58:58 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// modified by I.Hrivnacova, 27 Sep 99
+1 -1
View File
@@ -22,7 +22,7 @@
*
*
* $Id: G3toG4.inc,v 1.3 2001/07/11 09:58:58 gunter Exp $
* GEANT4 tag $Name: geant4-04-00 $
* GEANT4 tag $Name: geant4-04-01 $
*
integer maxlines
parameter (maxlines = 750) ! max no. of cmd lines per C++ source file
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3toG4BuildTree.hh,v 1.7 2001/07/11 09:58:58 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class Description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3toG4MANY.hh,v 1.1 2001/11/08 16:07:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class Description:
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G3toG4MakeSolid.hh,v 1.6 2001/07/11 09:58:58 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
//
// ----------------------
// Class Description:
@@ -22,7 +22,7 @@
//
//
// $Id: G3toG4RotationMatrix.hh,v 1.5 2001/07/11 09:58:58 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// GEANT4 tag $Name: geant4-04-01 $
// ----------------------
// Class description:
//
+1 -1
View File
@@ -22,7 +22,7 @@
*
*
* $Id: gcbank.inc,v 1.3 2001/07/11 09:58:58 gunter Exp $
* GEANT4 tag $Name: geant4-04-00 $
* GEANT4 tag $Name: geant4-04-01 $
*
INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG
INTEGER KWBANK,KWWORK,IWS

Some files were not shown because too many files have changed in this diff Show More