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

Import Geant4 11.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2024-06-28 13:08:51 +02:00
parent f7b23877ed
commit e58e650b32
5232 changed files with 239416 additions and 244360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/basic/B4/B4c/src/ActionInitialization.cc
+3 -2
View File
@@ -28,9 +28,10 @@
/// \brief Implementation of the B4c::ActionInitialization class
#include "ActionInitialization.hh"
#include "EventAction.hh"
#include "PrimaryGeneratorAction.hh"
#include "RunAction.hh"
#include "EventAction.hh"
using namespace B4;
@@ -55,4 +56,4 @@ void ActionInitialization::Build() const
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4c
examples/basic/B4/B4c/src/CalorHit.cc
+5 -12
View File
@@ -28,11 +28,8 @@
/// \brief Implementation of the B4c::CalorHit class
#include "CalorHit.hh"
#include "G4UnitsTable.hh"
#include "G4VVisManager.hh"
#include "G4Circle.hh"
#include "G4Colour.hh"
#include "G4VisAttributes.hh"
#include <iomanip>
@@ -45,21 +42,17 @@ G4ThreadLocal G4Allocator<CalorHit>* CalorHitAllocator = nullptr;
G4bool CalorHit::operator==(const CalorHit& right) const
{
return ( this == &right ) ? true : false;
return (this == &right) ? true : false;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void CalorHit::Print()
{
G4cout
<< "Edep: "
<< std::setw(7) << G4BestUnit(fEdep,"Energy")
<< " track length: "
<< std::setw(7) << G4BestUnit( fTrackLength,"Length")
<< G4endl;
G4cout << "Edep: " << std::setw(7) << G4BestUnit(fEdep, "Energy")
<< " track length: " << std::setw(7) << G4BestUnit(fTrackLength, "Length") << G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4c
examples/basic/B4/B4c/src/CalorimeterSD.cc
+21 -30
View File
@@ -28,22 +28,19 @@
/// \brief Implementation of the B4c::CalorimeterSD class
#include "CalorimeterSD.hh"
#include "G4HCofThisEvent.hh"
#include "G4Step.hh"
#include "G4ThreeVector.hh"
#include "G4SDManager.hh"
#include "G4ios.hh"
#include "G4Step.hh"
namespace B4c
{
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorimeterSD::CalorimeterSD(const G4String& name,
const G4String& hitsCollectionName,
CalorimeterSD::CalorimeterSD(const G4String& name, const G4String& hitsCollectionName,
G4int nofCells)
: G4VSensitiveDetector(name),
fNofCells(nofCells)
: G4VSensitiveDetector(name), fNofCells(nofCells)
{
collectionName.insert(hitsCollectionName);
}
@@ -53,36 +50,33 @@ CalorimeterSD::CalorimeterSD(const G4String& name,
void CalorimeterSD::Initialize(G4HCofThisEvent* hce)
{
// Create hits collection
fHitsCollection
= new CalorHitsCollection(SensitiveDetectorName, collectionName[0]);
fHitsCollection = new CalorHitsCollection(SensitiveDetectorName, collectionName[0]);
// Add this collection in hce
auto hcID
= G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
hce->AddHitsCollection( hcID, fHitsCollection );
auto hcID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
hce->AddHitsCollection(hcID, fHitsCollection);
// Create hits
// fNofCells for cells + one more for total sums
for (G4int i=0; i<fNofCells+1; i++ ) {
for (G4int i = 0; i < fNofCells + 1; i++) {
fHitsCollection->insert(new CalorHit());
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4bool CalorimeterSD::ProcessHits(G4Step* step,
G4TouchableHistory*)
G4bool CalorimeterSD::ProcessHits(G4Step* step, G4TouchableHistory*)
{
// energy deposit
auto edep = step->GetTotalEnergyDeposit();
// step length
G4double stepLength = 0.;
if ( step->GetTrack()->GetDefinition()->GetPDGCharge() != 0. ) {
if (step->GetTrack()->GetDefinition()->GetPDGCharge() != 0.) {
stepLength = step->GetStepLength();
}
if ( edep==0. && stepLength == 0. ) return false;
if (edep == 0. && stepLength == 0.) return false;
auto touchable = (step->GetPreStepPoint()->GetTouchable());
@@ -91,16 +85,14 @@ G4bool CalorimeterSD::ProcessHits(G4Step* step,
// Get hit accounting data for this cell
auto hit = (*fHitsCollection)[layerNumber];
if ( ! hit ) {
if (!hit) {
G4ExceptionDescription msg;
msg << "Cannot access hit " << layerNumber;
G4Exception("CalorimeterSD::ProcessHits()",
"MyCode0004", FatalException, msg);
G4Exception("CalorimeterSD::ProcessHits()", "MyCode0004", FatalException, msg);
}
// Get hit for total accounting
auto hitTotal
= (*fHitsCollection)[fHitsCollection->entries()-1];
auto hitTotal = (*fHitsCollection)[fHitsCollection->entries() - 1];
// Add values
hit->Add(edep, stepLength);
@@ -113,16 +105,15 @@ G4bool CalorimeterSD::ProcessHits(G4Step* step,
void CalorimeterSD::EndOfEvent(G4HCofThisEvent*)
{
if ( verboseLevel>1 ) {
auto nofHits = fHitsCollection->entries();
G4cout
<< G4endl
<< "-------->Hits Collection: in this event they are " << nofHits
<< " hits in the tracker chambers: " << G4endl;
for ( std::size_t i=0; i<nofHits; ++i ) (*fHitsCollection)[i]->Print();
if (verboseLevel > 1) {
auto nofHits = fHitsCollection->entries();
G4cout << G4endl << "-------->Hits Collection: in this event they are " << nofHits
<< " hits in the tracker chambers: " << G4endl;
for (std::size_t i = 0; i < nofHits; ++i)
(*fHitsCollection)[i]->Print();
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4c
examples/basic/B4/B4c/src/DetectorConstruction.cc
+91 -116
View File
@@ -28,32 +28,29 @@
/// \brief Implementation of the B4c::DetectorConstruction class
#include "DetectorConstruction.hh"
#include "CalorimeterSD.hh"
#include "G4AutoDelete.hh"
#include "G4Box.hh"
#include "G4Colour.hh"
#include "G4GlobalMagFieldMessenger.hh"
#include "G4LogicalVolume.hh"
#include "G4Material.hh"
#include "G4NistManager.hh"
#include "G4Box.hh"
#include "G4LogicalVolume.hh"
#include "G4PVPlacement.hh"
#include "G4PVReplica.hh"
#include "G4GlobalMagFieldMessenger.hh"
#include "G4AutoDelete.hh"
#include "G4SDManager.hh"
#include "G4VisAttributes.hh"
#include "G4Colour.hh"
#include "G4PhysicalConstants.hh"
#include "G4SDManager.hh"
#include "G4SystemOfUnits.hh"
#include "G4VisAttributes.hh"
namespace B4c
{
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4ThreadLocal
G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
G4ThreadLocal G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -78,12 +75,12 @@ void DetectorConstruction::DefineMaterials()
G4double a; // mass of a mole;
G4double z; // z=mean number of protons;
G4double density;
new G4Material("liquidArgon", z=18., a= 39.95*g/mole, density= 1.390*g/cm3);
// The argon by NIST Manager is a gas with a different density
new G4Material("liquidArgon", z = 18., a = 39.95 * g / mole, density = 1.390 * g / cm3);
// The argon by NIST Manager is a gas with a different density
// Vacuum
new G4Material("Galactic", z=1., a=1.01*g/mole,density= universe_mean_density,
kStateGas, 2.73*kelvin, 3.e-18*pascal);
new G4Material("Galactic", z = 1., a = 1.01 * g / mole, density = universe_mean_density,
kStateGas, 2.73 * kelvin, 3.e-18 * pascal);
// Print materials
G4cout << *(G4Material::GetMaterialTable()) << G4endl;
@@ -95,147 +92,127 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
{
// Geometry parameters
fNofLayers = 10;
G4double absoThickness = 10.*mm;
G4double gapThickness = 5.*mm;
G4double calorSizeXY = 10.*cm;
G4double absoThickness = 10. * mm;
G4double gapThickness = 5. * mm;
G4double calorSizeXY = 10. * cm;
auto layerThickness = absoThickness + gapThickness;
auto calorThickness = fNofLayers * layerThickness;
auto worldSizeXY = 1.2 * calorSizeXY;
auto worldSizeZ = 1.2 * calorThickness;
auto worldSizeZ = 1.2 * calorThickness;
// Get materials
auto defaultMaterial = G4Material::GetMaterial("Galactic");
auto absorberMaterial = G4Material::GetMaterial("G4_Pb");
auto gapMaterial = G4Material::GetMaterial("liquidArgon");
if ( ! defaultMaterial || ! absorberMaterial || ! gapMaterial ) {
if (!defaultMaterial || !absorberMaterial || !gapMaterial) {
G4ExceptionDescription msg;
msg << "Cannot retrieve materials already defined.";
G4Exception("DetectorConstruction::DefineVolumes()",
"MyCode0001", FatalException, msg);
G4Exception("DetectorConstruction::DefineVolumes()", "MyCode0001", FatalException, msg);
}
//
// World
//
auto worldS
= new G4Box("World", // its name
worldSizeXY/2, worldSizeXY/2, worldSizeZ/2); // its size
auto worldS = new G4Box("World", // its name
worldSizeXY / 2, worldSizeXY / 2, worldSizeZ / 2); // its size
auto worldLV
= new G4LogicalVolume(
worldS, // its solid
defaultMaterial, // its material
"World"); // its name
auto worldLV = new G4LogicalVolume(worldS, // its solid
defaultMaterial, // its material
"World"); // its name
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Calorimeter
//
auto calorimeterS
= new G4Box("Calorimeter", // its name
calorSizeXY/2, calorSizeXY/2, calorThickness/2); // its size
auto calorimeterS = new G4Box("Calorimeter", // its name
calorSizeXY / 2, calorSizeXY / 2, calorThickness / 2); // its size
auto calorLV
= new G4LogicalVolume(
calorimeterS, // its solid
defaultMaterial, // its material
"Calorimeter"); // its name
auto calorLV = new G4LogicalVolume(calorimeterS, // its solid
defaultMaterial, // its material
"Calorimeter"); // its name
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Layer
//
auto layerS
= new G4Box("Layer", // its name
calorSizeXY/2, calorSizeXY/2, layerThickness/2); //its size
auto layerS = new G4Box("Layer", // its name
calorSizeXY / 2, calorSizeXY / 2, layerThickness / 2); // its size
auto layerLV
= new G4LogicalVolume(
layerS, // its solid
defaultMaterial, // its material
"Layer"); // its name
auto layerLV = new G4LogicalVolume(layerS, // its solid
defaultMaterial, // its material
"Layer"); // its name
new G4PVReplica(
"Layer", // its name
layerLV, // its logical volume
calorLV, // its mother
kZAxis, // axis of replication
fNofLayers, // number of replica
layerThickness); // witdth of replica
new G4PVReplica("Layer", // its name
layerLV, // its logical volume
calorLV, // its mother
kZAxis, // axis of replication
fNofLayers, // number of replica
layerThickness); // witdth of replica
//
// Absorber
//
auto absorberS
= new G4Box("Abso", // its name
calorSizeXY/2, calorSizeXY/2, absoThickness/2); // its size
auto absorberS = new G4Box("Abso", // its name
calorSizeXY / 2, calorSizeXY / 2, absoThickness / 2); // its size
auto absorberLV
= new G4LogicalVolume(
absorberS, // its solid
absorberMaterial, // its material
"AbsoLV"); // its name
auto absorberLV = new G4LogicalVolume(absorberS, // its solid
absorberMaterial, // its material
"AbsoLV"); // its name
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Gap
//
auto gapS
= new G4Box("Gap", // its name
calorSizeXY/2, calorSizeXY/2, gapThickness/2); // its size
auto gapS = new G4Box("Gap", // its name
calorSizeXY / 2, calorSizeXY / 2, gapThickness / 2); // its size
auto gapLV
= new G4LogicalVolume(
gapS, // its solid
gapMaterial, // its material
"GapLV"); // its name
auto gapLV = new G4LogicalVolume(gapS, // its solid
gapMaterial, // its material
"GapLV"); // its name
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// print parameters
//
G4cout
<< G4endl
<< "------------------------------------------------------------" << G4endl
<< "---> The calorimeter is " << fNofLayers << " layers of: [ "
<< absoThickness/mm << "mm of " << absorberMaterial->GetName()
<< " + "
<< gapThickness/mm << "mm of " << gapMaterial->GetName() << " ] " << G4endl
<< "------------------------------------------------------------" << G4endl;
G4cout << G4endl << "------------------------------------------------------------" << G4endl
<< "---> The calorimeter is " << fNofLayers << " layers of: [ " << absoThickness / mm
<< "mm of " << absorberMaterial->GetName() << " + " << gapThickness / mm << "mm of "
<< gapMaterial->GetName() << " ] " << G4endl
<< "------------------------------------------------------------" << G4endl;
//
// Visualization attributes
@@ -258,15 +235,13 @@ void DetectorConstruction::ConstructSDandField()
//
// Sensitive detectors
//
auto absoSD
= new CalorimeterSD("AbsorberSD", "AbsorberHitsCollection", fNofLayers);
auto absoSD = new CalorimeterSD("AbsorberSD", "AbsorberHitsCollection", fNofLayers);
G4SDManager::GetSDMpointer()->AddNewDetector(absoSD);
SetSensitiveDetector("AbsoLV",absoSD);
SetSensitiveDetector("AbsoLV", absoSD);
auto gapSD
= new CalorimeterSD("GapSD", "GapHitsCollection", fNofLayers);
auto gapSD = new CalorimeterSD("GapSD", "GapHitsCollection", fNofLayers);
G4SDManager::GetSDMpointer()->AddNewDetector(gapSD);
SetSensitiveDetector("GapLV",gapSD);
SetSensitiveDetector("GapLV", gapSD);
//
// Magnetic field
@@ -284,4 +259,4 @@ void DetectorConstruction::ConstructSDandField()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4c
examples/basic/B4/B4c/src/EventAction.cc
+25 -42
View File
@@ -28,17 +28,16 @@
/// \brief Implementation of the B4c::EventAction class
#include "EventAction.hh"
#include "CalorimeterSD.hh"
#include "CalorHit.hh"
#include "G4AnalysisManager.hh"
#include "G4RunManager.hh"
#include "G4Event.hh"
#include "G4SDManager.hh"
#include "G4HCofThisEvent.hh"
#include "G4RunManager.hh"
#include "G4SDManager.hh"
#include "G4UnitsTable.hh"
#include "Randomize.hh"
#include <iomanip>
namespace B4c
@@ -46,19 +45,14 @@ namespace B4c
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorHitsCollection*
EventAction::GetHitsCollection(G4int hcID,
const G4Event* event) const
CalorHitsCollection* EventAction::GetHitsCollection(G4int hcID, const G4Event* event) const
{
auto hitsCollection
= static_cast<CalorHitsCollection*>(
event->GetHCofThisEvent()->GetHC(hcID));
auto hitsCollection = static_cast<CalorHitsCollection*>(event->GetHCofThisEvent()->GetHC(hcID));
if ( ! hitsCollection ) {
if (!hitsCollection) {
G4ExceptionDescription msg;
msg << "Cannot access hitsCollection ID " << hcID;
G4Exception("EventAction::GetHitsCollection()",
"MyCode0003", FatalException, msg);
G4Exception("EventAction::GetHitsCollection()", "MyCode0003", FatalException, msg);
}
return hitsCollection;
@@ -66,39 +60,29 @@ EventAction::GetHitsCollection(G4int hcID,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::PrintEventStatistics(
G4double absoEdep, G4double absoTrackLength,
G4double gapEdep, G4double gapTrackLength) const
void EventAction::PrintEventStatistics(G4double absoEdep, G4double absoTrackLength,
G4double gapEdep, G4double gapTrackLength) const
{
// print event statistics
G4cout
<< " Absorber: total energy: "
<< std::setw(7) << G4BestUnit(absoEdep, "Energy")
<< " total track length: "
<< std::setw(7) << G4BestUnit(absoTrackLength, "Length")
<< G4endl
<< " Gap: total energy: "
<< std::setw(7) << G4BestUnit(gapEdep, "Energy")
<< " total track length: "
<< std::setw(7) << G4BestUnit(gapTrackLength, "Length")
<< G4endl;
G4cout << " Absorber: total energy: " << std::setw(7) << G4BestUnit(absoEdep, "Energy")
<< " total track length: " << std::setw(7) << G4BestUnit(absoTrackLength, "Length")
<< G4endl << " Gap: total energy: " << std::setw(7) << G4BestUnit(gapEdep, "Energy")
<< " total track length: " << std::setw(7) << G4BestUnit(gapTrackLength, "Length")
<< G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::BeginOfEventAction(const G4Event* /*event*/)
{}
void EventAction::BeginOfEventAction(const G4Event* /*event*/) {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::EndOfEventAction(const G4Event* event)
{
// Get hits collections IDs (only once)
if ( fAbsHCID == -1 ) {
fAbsHCID
= G4SDManager::GetSDMpointer()->GetCollectionID("AbsorberHitsCollection");
fGapHCID
= G4SDManager::GetSDMpointer()->GetCollectionID("GapHitsCollection");
if (fAbsHCID == -1) {
fAbsHCID = G4SDManager::GetSDMpointer()->GetCollectionID("AbsorberHitsCollection");
fGapHCID = G4SDManager::GetSDMpointer()->GetCollectionID("GapHitsCollection");
}
// Get hits collections
@@ -106,18 +90,17 @@ void EventAction::EndOfEventAction(const G4Event* event)
auto gapHC = GetHitsCollection(fGapHCID, event);
// Get hit with total values
auto absoHit = (*absoHC)[absoHC->entries()-1];
auto gapHit = (*gapHC)[gapHC->entries()-1];
auto absoHit = (*absoHC)[absoHC->entries() - 1];
auto gapHit = (*gapHC)[gapHC->entries() - 1];
// Print per event (modulo n)
//
auto eventID = event->GetEventID();
auto printModulo = G4RunManager::GetRunManager()->GetPrintProgress();
if ( ( printModulo > 0 ) && ( eventID % printModulo == 0 ) ) {
PrintEventStatistics(
absoHit->GetEdep(), absoHit->GetTrackLength(),
gapHit->GetEdep(), gapHit->GetTrackLength());
G4cout << "--> End of event: " << eventID << "\n" << G4endl;
if ((printModulo > 0) && (eventID % printModulo == 0)) {
PrintEventStatistics(absoHit->GetEdep(), absoHit->GetTrackLength(), gapHit->GetEdep(),
gapHit->GetTrackLength());
G4cout << "--> End of event: " << eventID << "\n" << G4endl;
}
// Fill histograms, ntuple
@@ -142,4 +125,4 @@ void EventAction::EndOfEventAction(const G4Event* event)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4c
examples/basic/B4/B4c/src/PrimaryGeneratorAction.cc
+14 -20
View File
@@ -29,16 +29,13 @@
#include "PrimaryGeneratorAction.hh"
#include "G4RunManager.hh"
#include "G4LogicalVolumeStore.hh"
#include "G4LogicalVolume.hh"
#include "G4Box.hh"
#include "G4Event.hh"
#include "G4LogicalVolume.hh"
#include "G4LogicalVolumeStore.hh"
#include "G4ParticleGun.hh"
#include "G4ParticleTable.hh"
#include "G4ParticleDefinition.hh"
#include "G4SystemOfUnits.hh"
#include "Randomize.hh"
#include "globals.hh"
namespace B4
{
@@ -52,11 +49,10 @@ PrimaryGeneratorAction::PrimaryGeneratorAction()
// default particle kinematic
//
auto particleDefinition
= G4ParticleTable::GetParticleTable()->FindParticle("e-");
auto particleDefinition = G4ParticleTable::GetParticleTable()->FindParticle("e-");
fParticleGun->SetParticleDefinition(particleDefinition);
fParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,1.));
fParticleGun->SetParticleEnergy(300.*MeV);
fParticleGun->SetParticleMomentumDirection(G4ThreeVector(0., 0., 1.));
fParticleGun->SetParticleEnergy(300. * MeV);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -68,7 +64,7 @@ PrimaryGeneratorAction::~PrimaryGeneratorAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
void PrimaryGeneratorAction::GeneratePrimaries(G4Event* event)
{
// This function is called at the begining of event
@@ -81,29 +77,27 @@ void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
// Check that the world volume has box shape
G4Box* worldBox = nullptr;
if ( worldLV ) {
if (worldLV) {
worldBox = dynamic_cast<G4Box*>(worldLV->GetSolid());
}
if ( worldBox ) {
if (worldBox) {
worldZHalfLength = worldBox->GetZHalfLength();
}
else {
else {
G4ExceptionDescription msg;
msg << "World volume of box shape not found." << G4endl;
msg << "Perhaps you have changed geometry." << G4endl;
msg << "The gun will be place in the center.";
G4Exception("PrimaryGeneratorAction::GeneratePrimaries()",
"MyCode0002", JustWarning, msg);
G4Exception("PrimaryGeneratorAction::GeneratePrimaries()", "MyCode0002", JustWarning, msg);
}
// Set gun position
fParticleGun
->SetParticlePosition(G4ThreeVector(0., 0., -worldZHalfLength));
fParticleGun->SetParticlePosition(G4ThreeVector(0., 0., -worldZHalfLength));
fParticleGun->GeneratePrimaryVertex(anEvent);
fParticleGun->GeneratePrimaryVertex(event);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4
examples/basic/B4/B4c/src/RunAction.cc
+22 -30
View File
@@ -30,10 +30,10 @@
#include "RunAction.hh"
#include "G4AnalysisManager.hh"
#include "G4Run.hh"
#include "G4RunManager.hh"
#include "G4UnitsTable.hh"
#include "G4SystemOfUnits.hh"
#include "G4UnitsTable.hh"
#include "globals.hh"
namespace B4
{
@@ -51,20 +51,20 @@ RunAction::RunAction()
auto analysisManager = G4AnalysisManager::Instance();
// Create directories
//analysisManager->SetHistoDirectoryName("histograms");
//analysisManager->SetNtupleDirectoryName("ntuple");
// analysisManager->SetHistoDirectoryName("histograms");
// analysisManager->SetNtupleDirectoryName("ntuple");
analysisManager->SetVerboseLevel(1);
analysisManager->SetNtupleMerging(true);
// Note: merging ntuples is available only with Root output
// Note: merging ntuples is available only with Root output
// Book histograms, ntuple
//
// Creating histograms
analysisManager->CreateH1("Eabs","Edep in absorber", 110, 0., 330*MeV);
analysisManager->CreateH1("Egap","Edep in gap", 100, 0., 30*MeV);
analysisManager->CreateH1("Labs","trackL in absorber", 100, 0., 50*cm);
analysisManager->CreateH1("Lgap","trackL in gap", 100, 0., 50*cm);
analysisManager->CreateH1("Eabs", "Edep in absorber", 110, 0., 330 * MeV);
analysisManager->CreateH1("Egap", "Edep in gap", 100, 0., 30 * MeV);
analysisManager->CreateH1("Labs", "trackL in absorber", 100, 0., 50 * cm);
analysisManager->CreateH1("Lgap", "trackL in gap", 100, 0., 50 * cm);
// Creating ntuple
//
@@ -80,8 +80,8 @@ RunAction::RunAction()
void RunAction::BeginOfRunAction(const G4Run* /*run*/)
{
//inform the runManager to save random number seed
//G4RunManager::GetRunManager()->SetRandomNumberStore(true);
// inform the runManager to save random number seed
// G4RunManager::GetRunManager()->SetRandomNumberStore(true);
// Get analysis manager
auto analysisManager = G4AnalysisManager::Instance();
@@ -104,34 +104,26 @@ void RunAction::EndOfRunAction(const G4Run* /*run*/)
// print histogram statistics
//
auto analysisManager = G4AnalysisManager::Instance();
if ( analysisManager->GetH1(1) ) {
if (analysisManager->GetH1(1)) {
G4cout << G4endl << " ----> print histograms statistic ";
if(isMaster) {
if (isMaster) {
G4cout << "for the entire run " << G4endl << G4endl;
}
else {
G4cout << "for the local thread " << G4endl << G4endl;
}
G4cout << " EAbs : mean = "
<< G4BestUnit(analysisManager->GetH1(0)->mean(), "Energy")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(0)->rms(), "Energy") << G4endl;
G4cout << " EAbs : mean = " << G4BestUnit(analysisManager->GetH1(0)->mean(), "Energy")
<< " rms = " << G4BestUnit(analysisManager->GetH1(0)->rms(), "Energy") << G4endl;
G4cout << " EGap : mean = "
<< G4BestUnit(analysisManager->GetH1(1)->mean(), "Energy")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(1)->rms(), "Energy") << G4endl;
G4cout << " EGap : mean = " << G4BestUnit(analysisManager->GetH1(1)->mean(), "Energy")
<< " rms = " << G4BestUnit(analysisManager->GetH1(1)->rms(), "Energy") << G4endl;
G4cout << " LAbs : mean = "
<< G4BestUnit(analysisManager->GetH1(2)->mean(), "Length")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(2)->rms(), "Length") << G4endl;
G4cout << " LAbs : mean = " << G4BestUnit(analysisManager->GetH1(2)->mean(), "Length")
<< " rms = " << G4BestUnit(analysisManager->GetH1(2)->rms(), "Length") << G4endl;
G4cout << " LGap : mean = "
<< G4BestUnit(analysisManager->GetH1(3)->mean(), "Length")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(3)->rms(), "Length") << G4endl;
G4cout << " LGap : mean = " << G4BestUnit(analysisManager->GetH1(3)->mean(), "Length")
<< " rms = " << G4BestUnit(analysisManager->GetH1(3)->rms(), "Length") << G4endl;
}
// save histograms & ntuple
@@ -142,4 +134,4 @@ void RunAction::EndOfRunAction(const G4Run* /*run*/)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
}
} // namespace B4