Import Geant4 4.0.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.18 2001/03/06 10:11:20 kurasige Exp $
|
||||
$Id: History,v 1.19 2001/10/19 05:27:13 stesting Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -14,6 +14,10 @@ track of all tags.
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
Oct 19, 2001 Steve O'Neale (examples-V03-02-00)
|
||||
- Update reference output
|
||||
|
||||
March 07 2001 H.Kurashige (exampleN04-V03-00-07)
|
||||
- Add G4MuonMinusCaptureAtRest in G4MuonPhysics
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
**********************************************
|
||||
Geant4 version $Name: geant4-03-00-ref-03 $
|
||||
Geant4 version $Name: geant4-04-00 $
|
||||
(15-Dec-2000)
|
||||
Copyright : Geant4 Collaboration
|
||||
**********************************************
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
**********************************************
|
||||
Geant4 version $Name: geant4-03-01-ref-01 $
|
||||
(06-Apr-2001)
|
||||
Geant4 version $Name: geant4-04-00 $
|
||||
(14-Dec-2001)
|
||||
Copyright : Geant4 Collaboration
|
||||
**********************************************
|
||||
MuonMinusCaptureAtRest is created
|
||||
@@ -10,7 +10,7 @@ phot: Total cross sections from a parametrisation. Good description from 10 KeV
|
||||
PhysicsTables from 50 keV to 50 MeV in 100 bins.
|
||||
|
||||
compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV.
|
||||
Scattered gamma energy according Klein-Nishina.
|
||||
Scattered gamma energy according Klein-Nishina.
|
||||
PhysicsTables from 10 keV to 100 GeV in 100 bins.
|
||||
|
||||
conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z.
|
||||
@@ -32,11 +32,11 @@ msc: Tables of transport mean free paths.
|
||||
displacement of the particle , too.
|
||||
PhysicsTables from 100 eV to 100 TeV in 100 bins.
|
||||
|
||||
annihil: Total cross section from Heilter formula (annihilation into 2 photons).
|
||||
annihil: Total cross section from Heilter formula(annihilation into 2 photons).
|
||||
gamma energies sampled according Heitler
|
||||
PhysicsTables from 10 keV to 10 TeV in 100 bins.
|
||||
|
||||
annihil: Total cross section from Heilter formula (annihilation into 2 photons).
|
||||
annihil: Total cross section from Heilter formula(annihilation into 2 photons).
|
||||
gamma energies sampled according Heitler
|
||||
PhysicsTables from 10 keV to 10 TeV in 100 bins.
|
||||
|
||||
@@ -50,10 +50,10 @@ msc: Tables of transport mean free paths.
|
||||
displacement of the particle , too.
|
||||
PhysicsTables from 100 eV to 100 TeV in 100 bins.
|
||||
|
||||
MuIoni: knock-on electron cross sections .
|
||||
Good description above the mean excitation energy.
|
||||
MuIoni: Knock-on electron cross sections .
|
||||
Good description above the mean excitation energy.
|
||||
delta ray energy sampled from differential Xsection.
|
||||
PhysicsTables from 1 keV to 1000 PeV in 150 bins.
|
||||
PhysicsTables from 1 keV to 1000 PeV in 150 bins.
|
||||
|
||||
MuBrems: theoretical cross section
|
||||
Good description up to 1000 PeV.
|
||||
@@ -70,21 +70,21 @@ msc: Tables of transport mean free paths.
|
||||
Stage 0->1 : 1 hits found in the muon chamber.
|
||||
Stage 1->2 : 1 isolated muon found.
|
||||
>>> Event 0
|
||||
10 hits are stored in ExN04TrackerHitsCollection.
|
||||
11 hits are stored in ExN04TrackerHitsCollection.
|
||||
4 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 0.343686 (GeV)
|
||||
Total energy deposition in calorimeter : 0.337948 (GeV)
|
||||
1 hits are stored in ExN04MuonHitsCollection.
|
||||
Stage 0->1 : 1 hits found in the muon chamber.
|
||||
Stage 1->2 : 1 isolated muon found.
|
||||
>>> Event 0
|
||||
13 hits are stored in ExN04TrackerHitsCollection.
|
||||
16 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 8.03057 (GeV)
|
||||
24 hits are stored in ExN04TrackerHitsCollection.
|
||||
21 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 20.4442 (GeV)
|
||||
1 hits are stored in ExN04MuonHitsCollection.
|
||||
Stage 0->1 : 1 hits found in the muon chamber.
|
||||
Stage 1->2 : 1 isolated muon found.
|
||||
>>> Event 1
|
||||
5 hits are stored in ExN04TrackerHitsCollection.
|
||||
10 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 1.07491 (GeV)
|
||||
24 hits are stored in ExN04TrackerHitsCollection.
|
||||
34 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 9.76921 (GeV)
|
||||
1 hits are stored in ExN04MuonHitsCollection.
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: exampleN04.cc,v 1.2.4.2 2001/06/28 20:18:47 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: exampleN04.cc,v 1.3 2001/07/11 09:58:24 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
**********************************************
|
||||
Geant4 version $Name: geant4-03-01-ref-01 $
|
||||
(06-Apr-2001)
|
||||
Geant4 version $Name: geant4-04-00 $
|
||||
(14-Dec-2001)
|
||||
Copyright : Geant4 Collaboration
|
||||
**********************************************
|
||||
MuonMinusCaptureAtRest is created
|
||||
@@ -10,7 +10,7 @@ phot: Total cross sections from a parametrisation. Good description from 10 KeV
|
||||
PhysicsTables from 50 keV to 50 MeV in 100 bins.
|
||||
|
||||
compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV.
|
||||
Scattered gamma energy according Klein-Nishina.
|
||||
Scattered gamma energy according Klein-Nishina.
|
||||
PhysicsTables from 10 keV to 100 GeV in 100 bins.
|
||||
|
||||
conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z.
|
||||
@@ -32,11 +32,11 @@ msc: Tables of transport mean free paths.
|
||||
displacement of the particle , too.
|
||||
PhysicsTables from 100 eV to 100 TeV in 100 bins.
|
||||
|
||||
annihil: Total cross section from Heilter formula (annihilation into 2 photons).
|
||||
annihil: Total cross section from Heilter formula(annihilation into 2 photons).
|
||||
gamma energies sampled according Heitler
|
||||
PhysicsTables from 10 keV to 10 TeV in 100 bins.
|
||||
|
||||
annihil: Total cross section from Heilter formula (annihilation into 2 photons).
|
||||
annihil: Total cross section from Heilter formula(annihilation into 2 photons).
|
||||
gamma energies sampled according Heitler
|
||||
PhysicsTables from 10 keV to 10 TeV in 100 bins.
|
||||
|
||||
@@ -50,10 +50,10 @@ msc: Tables of transport mean free paths.
|
||||
displacement of the particle , too.
|
||||
PhysicsTables from 100 eV to 100 TeV in 100 bins.
|
||||
|
||||
MuIoni: knock-on electron cross sections .
|
||||
Good description above the mean excitation energy.
|
||||
MuIoni: Knock-on electron cross sections .
|
||||
Good description above the mean excitation energy.
|
||||
delta ray energy sampled from differential Xsection.
|
||||
PhysicsTables from 1 keV to 1000 PeV in 150 bins.
|
||||
PhysicsTables from 1 keV to 1000 PeV in 150 bins.
|
||||
|
||||
MuBrems: theoretical cross section
|
||||
Good description up to 1000 PeV.
|
||||
@@ -67,13 +67,12 @@ msc: Tables of transport mean free paths.
|
||||
New model of MSC , computes the lateral
|
||||
displacement of the particle , too.
|
||||
PhysicsTables from 100 eV to 100 TeV in 100 bins.
|
||||
#
|
||||
Stage 0->1 : 1 hits found in the muon chamber.
|
||||
Stage 1->2 : 1 isolated muon found.
|
||||
>>> Event 0
|
||||
149 hits are stored in ExN04TrackerHitsCollection.
|
||||
46 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 0.637807 (GeV)
|
||||
130 hits are stored in ExN04TrackerHitsCollection.
|
||||
56 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 0.896933 (GeV)
|
||||
1 hits are stored in ExN04MuonHitsCollection.
|
||||
Stage 0->1 : 0 hits found in the muon chamber.
|
||||
++++++++ event aborted
|
||||
@@ -86,8 +85,7 @@ Stage 0->1 : 1 hits found in the muon chamber.
|
||||
Stage 1->2 : 0 isolated muon found.
|
||||
++++++++ event aborted
|
||||
>>> Event 2
|
||||
91 hits are stored in ExN04TrackerHitsCollection.
|
||||
84 hits are stored in ExN04TrackerHitsCollection.
|
||||
13 hits are stored in ExN04CalorimeterHitsCollection.
|
||||
Total energy deposition in calorimeter : 0.334183 (GeV)
|
||||
Total energy deposition in calorimeter : 0.315841 (GeV)
|
||||
1 hits are stored in ExN04MuonHitsCollection.
|
||||
#
|
||||
|
||||
@@ -26,19 +26,21 @@
|
||||
|
||||
#include "globals.hh"
|
||||
#include "G4VPVParameterisation.hh"
|
||||
|
||||
class G4VPhysicalVolume;
|
||||
class G4Tubs;
|
||||
|
||||
class ExN04CalorimeterParametrisation : public G4VPVParameterisation
|
||||
{
|
||||
public:
|
||||
|
||||
ExN04CalorimeterParametrisation();
|
||||
~ExN04CalorimeterParametrisation();
|
||||
void ComputeTransformation
|
||||
(const G4int copyNo,G4VPhysicalVolume *physVol) const;
|
||||
void ComputeDimensions
|
||||
(G4Tubs & calorimeterLayer, const G4int copyNo,
|
||||
const G4VPhysicalVolume * physVol) const;
|
||||
virtual ~ExN04CalorimeterParametrisation();
|
||||
void ComputeTransformation(const G4int copyNo,
|
||||
G4VPhysicalVolume *physVol) const;
|
||||
void ComputeDimensions( G4Tubs & calorimeterLayer,
|
||||
const G4int copyNo,
|
||||
const G4VPhysicalVolume * physVol) const;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04EMPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04EMPhysics.hh,v 1.2 2001/07/11 09:58:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04GeneralPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04GeneralPhysics.hh,v 1.2 2001/07/11 09:58:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04HadronPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04HadronPhysics.hh,v 1.2 2001/07/11 09:58:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04IonPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04IonPhysics.hh,v 1.2 2001/07/11 09:58:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04MuonPhysics.hh,v 1.2.2.1 2001/06/28 19:07:36 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04MuonPhysics.hh,v 1.3 2001/07/11 09:58:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -26,19 +26,21 @@
|
||||
|
||||
#include "globals.hh"
|
||||
#include "G4VPVParameterisation.hh"
|
||||
|
||||
class G4VPhysicalVolume;
|
||||
class G4Tubs;
|
||||
|
||||
class ExN04TrackerParametrisation : public G4VPVParameterisation
|
||||
{
|
||||
public:
|
||||
|
||||
ExN04TrackerParametrisation();
|
||||
~ExN04TrackerParametrisation();
|
||||
void ComputeTransformation
|
||||
(const G4int copyNo,G4VPhysicalVolume *physVol) const;
|
||||
void ComputeDimensions
|
||||
(G4Tubs & trackerLayer, const G4int copyNo,
|
||||
const G4VPhysicalVolume * physVol) const;
|
||||
virtual ~ExN04TrackerParametrisation();
|
||||
void ComputeTransformation(const G4int copyNo,
|
||||
G4VPhysicalVolume *physVol) const;
|
||||
void ComputeDimensions( G4Tubs & trackerLayer,
|
||||
const G4int copyNo,
|
||||
const G4VPhysicalVolume * physVol) const;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
G4Allocator<ExN04CalorimeterHit> ExN04CalorimeterHitAllocator;
|
||||
|
||||
ExN04CalorimeterHit::ExN04CalorimeterHit()
|
||||
{pLogV=NULL;}
|
||||
{pLogV=0;}
|
||||
|
||||
ExN04CalorimeterHit::ExN04CalorimeterHit(G4LogicalVolume* logVol,G4int z,G4int phi)
|
||||
:pLogV(logVol),ZCellID(z),PhiCellID(phi)
|
||||
: ZCellID(z), PhiCellID(phi), pLogV(logVol)
|
||||
{;}
|
||||
|
||||
ExN04CalorimeterHit::~ExN04CalorimeterHit()
|
||||
|
||||
@@ -94,8 +94,8 @@ G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build()
|
||||
caloRing_dz, caloRing_sphi, caloRing_dphi);
|
||||
G4LogicalVolume * caloROcellLog
|
||||
= new G4LogicalVolume(caloROcellTub, dummyMat, "caloROcellLogical",0,0,0);
|
||||
G4VPhysicalVolume * caloROcellPhys
|
||||
= new G4PVReplica("caloROcellPhysical", caloROcellLog, caloROphiDivisionPhys,
|
||||
// G4VPhysicalVolume * caloROcellPhys =
|
||||
new G4PVReplica("caloROcellPhysical", caloROcellLog, caloROphiDivisionPhys,
|
||||
kZAxis, segmentsinZ,2.*caloRing_dz);
|
||||
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist)
|
||||
|
||||
G4VPhysicalVolume* physVol = ROhist->GetVolume();
|
||||
//ROhist->MoveUpHistory();
|
||||
G4VPhysicalVolume* mothVol = ROhist->GetVolume(1);
|
||||
//G4VPhysicalVolume* mothVol = ROhist->GetVolume(1);
|
||||
int copyIDinZ = ROhist->GetReplicaNumber();
|
||||
int copyIDinPhi = ROhist->GetReplicaNumber(1);
|
||||
|
||||
|
||||
@@ -160,8 +160,8 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
|
||||
G4VPVParameterisation * trackerParam
|
||||
= new ExN04TrackerParametrisation;
|
||||
// dummy value : kXAxis -- modified by parameterised volume
|
||||
G4VPhysicalVolume *trackerLayer_phys
|
||||
= new G4PVParameterised("trackerLayer_phys",trackerLayer_log,tracker_phys,
|
||||
// G4VPhysicalVolume *trackerLayer_phys =
|
||||
new G4PVParameterised("trackerLayer_phys",trackerLayer_log,tracker_phys,
|
||||
kXAxis, notrkLayers, trackerParam);
|
||||
G4VisAttributes* trackerLayer_logVisAtt
|
||||
= new G4VisAttributes(G4Colour(0.5,0.0,1.0));
|
||||
@@ -193,8 +193,8 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
|
||||
G4VPVParameterisation * calorimeterParam
|
||||
= new ExN04CalorimeterParametrisation;
|
||||
// dummy value : kXAxis -- modified by parameterised volume
|
||||
G4VPhysicalVolume * caloLayer_phys
|
||||
= new G4PVParameterised("caloLayer_phys",caloLayer_log,calorimeter_phys,
|
||||
// G4VPhysicalVolume * caloLayer_phys =
|
||||
new G4PVParameterised("caloLayer_phys",caloLayer_log,calorimeter_phys,
|
||||
kXAxis, nocaloLayers, calorimeterParam);
|
||||
G4VisAttributes* caloLayer_logVisAtt
|
||||
= new G4VisAttributes(G4Colour(0.7,1.0,0.0));
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04EMPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04EMPhysics.cc,v 1.2 2001/07/11 09:58:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -72,9 +72,9 @@ void ExN04EventAction::EndOfEventAction(const G4Event* evt)
|
||||
if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return;
|
||||
|
||||
G4HCofThisEvent * HCE = evt->GetHCofThisEvent();
|
||||
ExN04TrackerHitsCollection* THC = NULL;
|
||||
ExN04CalorimeterHitsCollection* CHC = NULL;
|
||||
ExN04MuonHitsCollection* MHC = NULL;
|
||||
ExN04TrackerHitsCollection* THC = 0;
|
||||
ExN04CalorimeterHitsCollection* CHC = 0;
|
||||
ExN04MuonHitsCollection* MHC = 0;
|
||||
if(HCE)
|
||||
{
|
||||
THC = (ExN04TrackerHitsCollection*)(HCE->GetHC(trackerCollID));
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04GeneralPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04GeneralPhysics.cc,v 1.2 2001/07/11 09:58:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04HadronPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04HadronPhysics.cc,v 1.2 2001/07/11 09:58:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04IonPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04IonPhysics.cc,v 1.2 2001/07/11 09:58:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04MuonPhysics.cc,v 1.2.2.1 2001/06/28 19:07:37 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04MuonPhysics.cc,v 1.3 2001/07/11 09:58:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -51,7 +51,6 @@ void ExN04MuonSD::Initialize(G4HCofThisEvent*HCE)
|
||||
|
||||
G4bool ExN04MuonSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist)
|
||||
{
|
||||
G4Track* aTrack = aStep->GetTrack();
|
||||
G4double edep = aStep->GetTotalEnergyDeposit();
|
||||
|
||||
if(edep==0.) return true;
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: ExN04PhysicsList.cc,v 1.9.2.1 2001/06/28 19:07:38 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: ExN04PhysicsList.cc,v 1.10 2001/07/11 09:58:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "G4ios.hh"
|
||||
|
||||
ExN04StackingAction::ExN04StackingAction()
|
||||
:stage(0),trkHits(NULL),muonHits(NULL)
|
||||
: trkHits(0), muonHits(0), stage(0)
|
||||
{
|
||||
angRoI = 30.0*deg;
|
||||
reqMuon = 2;
|
||||
@@ -119,7 +119,7 @@ G4VHitsCollection* ExN04StackingAction::GetCollection(G4String colName)
|
||||
G4HCofThisEvent* HCE = currentEvent->GetHCofThisEvent();
|
||||
return HCE->GetHC(colID);
|
||||
}
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ExN04StackingAction::NewStage()
|
||||
@@ -196,8 +196,8 @@ void ExN04StackingAction::NewStage()
|
||||
void ExN04StackingAction::PrepareNewEvent()
|
||||
{
|
||||
stage = 0;
|
||||
trkHits = NULL;
|
||||
muonHits = NULL;
|
||||
trkHits = 0;
|
||||
muonHits = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ ExN04SteppingAction::~ExN04SteppingAction()
|
||||
|
||||
void ExN04SteppingAction::UserSteppingAction(const G4Step * theStep)
|
||||
{
|
||||
G4SteppingManager * SM = fpSteppingManager;
|
||||
G4Track * theTrack = theStep->GetTrack();
|
||||
|
||||
// check if it is alive
|
||||
|
||||
Reference in New Issue
Block a user