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

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/novice/N04/src/ExN04CalorimeterHit.cc
+2 -2
View File
@@ -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()
examples/novice/N04/src/ExN04CalorimeterROGeometry.cc
+2 -2
View File
@@ -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);
examples/novice/N04/src/ExN04CalorimeterSD.cc
+1 -1
View File
@@ -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);
examples/novice/N04/src/ExN04DetectorConstruction.cc
+4 -4
View File
@@ -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));
examples/novice/N04/src/ExN04EMPhysics.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04EventAction.cc
+3 -3
View File
@@ -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));
examples/novice/N04/src/ExN04GeneralPhysics.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04HadronPhysics.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04IonPhysics.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04MuonPhysics.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04MuonSD.cc
-1
View File
@@ -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;
examples/novice/N04/src/ExN04PhysicsList.cc
+2 -2
View File
@@ -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 $
//
//
examples/novice/N04/src/ExN04StackingAction.cc
+4 -4
View File
@@ -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;
}
examples/novice/N04/src/ExN04SteppingAction.cc
-1
View File
@@ -39,7 +39,6 @@ ExN04SteppingAction::~ExN04SteppingAction()
void ExN04SteppingAction::UserSteppingAction(const G4Step * theStep)
{
G4SteppingManager * SM = fpSteppingManager;
G4Track * theTrack = theStep->GetTrack();
// check if it is alive