Import Geant4 11.1.0.beta source tree
This commit is contained in:
@@ -1,12 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
-------------------------------------------------------------------
|
||||
# Example STCyclotron History
|
||||
|
||||
==============================================================
|
||||
Geant4 - Solid-target cyclotron example
|
||||
==============================================================
|
||||
See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
|
||||
which **must** added in reverse chronological order (newest at the top). It must **not**
|
||||
be used as a substitute for writing good git commit messages!
|
||||
|
||||
Category History file
|
||||
---------------------
|
||||
## 2022-06-20 Sergio Losilla (STCyclotron-V11-00-01)
|
||||
- Removed no-op lines, simplified calls to SetProductionCut.
|
||||
|
||||
## 2021-12-10 Ben Morgan (STCyclotron-V11-00-00)
|
||||
- Change to new Markdown History format
|
||||
|
||||
---
|
||||
|
||||
# History entries prior to 11.0
|
||||
|
||||
07.10.2021 - I. Hrivnacova (STCyclotron-V10-07-07)
|
||||
- Migration to new G4AnalysisManager.hh header;
|
||||
|
||||
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
|
||||
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-11-00-patch-02 (25-May-2022)
|
||||
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -75,63 +75,63 @@ Region <Target> -- -- appears in <World> world volume
|
||||
Root logical volume(s) : Target
|
||||
Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
|
||||
Materials : G4_Ni
|
||||
Production cuts : gamma 175 um e- 175 um e+ 175 um proton 175 um
|
||||
Production cuts : gamma 175 um e- 175 um e+ 175 um proton 10 um
|
||||
|
||||
Region <Foil> -- -- appears in <World> world volume
|
||||
This region is in the mass world.
|
||||
Root logical volume(s) : Foil
|
||||
Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
|
||||
Materials : G4_Al
|
||||
Production cuts : gamma 5 Ang e- 5 Ang e+ 5 Ang proton 5 Ang
|
||||
Production cuts : gamma 5 Ang e- 5 Ang e+ 5 Ang proton 100 um
|
||||
|
||||
========= Table of registered couples ============================
|
||||
|
||||
Index : 0 used in the geometry : Yes
|
||||
Material : G4_AIR
|
||||
Range cuts : gamma 100 um e- 100 um e+ 100 um proton 100 um
|
||||
Energy thresholds : gamma 1 keV e- 1 keV e+ 1 keV proton 10 keV
|
||||
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
Index : 1 used in the geometry : Yes
|
||||
Material : G4_Al
|
||||
Range cuts : gamma 100 um e- 100 um e+ 100 um proton 100 um
|
||||
Energy thresholds : gamma 2.34147 keV e- 131.214 keV e+ 128.744 keV proton 10 keV
|
||||
Energy thresholds : gamma 2.34157 keV e- 131.218 keV e+ 128.746 keV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
Index : 2 used in the geometry : Yes
|
||||
Material : vacuumBeam
|
||||
Range cuts : gamma 100 um e- 100 um e+ 100 um proton 100 um
|
||||
Energy thresholds : gamma 1 keV e- 1 keV e+ 1 keV proton 10 keV
|
||||
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
Index : 3 used in the geometry : Yes
|
||||
Material : helium
|
||||
Range cuts : gamma 100 um e- 100 um e+ 100 um proton 100 um
|
||||
Energy thresholds : gamma 1 keV e- 1 keV e+ 1 keV proton 10 keV
|
||||
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
Index : 4 used in the geometry : Yes
|
||||
Material : G4_Pt
|
||||
Range cuts : gamma 100 um e- 100 um e+ 100 um proton 100 um
|
||||
Energy thresholds : gamma 42.2904 keV e- 374.921 keV e+ 359.657 keV proton 10 keV
|
||||
Energy thresholds : gamma 42.2897 keV e- 374.929 keV e+ 359.669 keV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
Index : 5 used in the geometry : Yes
|
||||
Material : G4_Ni
|
||||
Range cuts : gamma 175 um e- 175 um e+ 175 um proton 175 um
|
||||
Energy thresholds : gamma 9.71418 keV e- 374.785 keV e+ 361.68 keV proton 17.5 keV
|
||||
Range cuts : gamma 175 um e- 175 um e+ 175 um proton 10 um
|
||||
Energy thresholds : gamma 9.71407 keV e- 374.794 keV e+ 361.684 keV proton 1 keV
|
||||
Region(s) which use this couple :
|
||||
Target
|
||||
|
||||
Index : 6 used in the geometry : Yes
|
||||
Material : G4_Al
|
||||
Range cuts : gamma 5 Ang e- 5 Ang e+ 5 Ang proton 5 Ang
|
||||
Energy thresholds : gamma 1 keV e- 1 keV e+ 1 keV proton 50 meV
|
||||
Range cuts : gamma 5 Ang e- 5 Ang e+ 5 Ang proton 100 um
|
||||
Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV proton 10 keV
|
||||
Region(s) which use this couple :
|
||||
Foil
|
||||
|
||||
@@ -160,7 +160,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10
|
||||
User=35.760000s Real=36.120555s Sys=0.020000s
|
||||
User=21.240000s Real=21.718533s Sys=0.000000s
|
||||
... write file : SolidTargetCyclotron.root - done
|
||||
... close file : SolidTargetCyclotron.root - done
|
||||
G4 kernel has come to Quit state.
|
||||
@@ -176,19 +176,19 @@ G4SDManager deleted.
|
||||
EventManager deleted.
|
||||
Units table cleared.
|
||||
TransportationManager deleted.
|
||||
Total navigation history collections cleaned: 12
|
||||
Total navigation history collections cleaned: 10
|
||||
G4RNGHelper object is deleted.
|
||||
================== Deleting memory pools ===================
|
||||
Pool ID '20G4NavigationLevelRep', size : 0.0163 MB
|
||||
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
|
||||
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
|
||||
Pool ID '17G4DynamicParticle', size : 0.522 MB
|
||||
Pool ID '16G4SmartVoxelNode', size : 0.00192 MB
|
||||
Pool ID '17G4SmartVoxelProxy', size : 0.000961 MB
|
||||
Pool ID '7G4Event', size : 0.000961 MB
|
||||
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
|
||||
Pool ID '17G4PrimaryParticle', size : 0.258 MB
|
||||
Pool ID '17G4DynamicParticle', size : 0.517 MB
|
||||
Pool ID '7G4Track', size : 1.03 MB
|
||||
Pool ID '18G4TouchableHistory', size : 0.00192 MB
|
||||
Pool ID '7G4Track', size : 1.04 MB
|
||||
Pool ID '18G4TouchableHistory', size : 0.000961 MB
|
||||
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
|
||||
Pool ID '17G4ReactionProduct', size : 0.00192 MB
|
||||
Pool ID '10G4Fragment', size : 0.000961 MB
|
||||
|
||||
@@ -52,8 +52,8 @@ public:
|
||||
void SetCutForGamma(G4double);
|
||||
void SetCutForElectron(G4double);
|
||||
void SetCutForPositron(G4double);
|
||||
void SetCutFoil(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma, G4double cutNeutron);
|
||||
void SetCutTarget(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma, G4double cutNeutron);
|
||||
void SetCutFoil(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma);
|
||||
void SetCutTarget(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma);
|
||||
|
||||
|
||||
|
||||
@@ -77,13 +77,11 @@ private:
|
||||
G4double fCutTargetElectron;
|
||||
G4double fCutTargetPositron;
|
||||
G4double fCutTargetGamma;
|
||||
G4double fCutTargetNeutron;
|
||||
|
||||
G4double fCutFoilProton;
|
||||
G4double fCutFoilElectron;
|
||||
G4double fCutFoilPositron;
|
||||
G4double fCutFoilGamma;
|
||||
G4double fCutFoilNeutron;
|
||||
|
||||
STCyclotronDetectorConstruction* fDetector;
|
||||
|
||||
|
||||
@@ -86,13 +86,11 @@ STCyclotronPhysicsList::STCyclotronPhysicsList(STCyclotronDetectorConstruction*
|
||||
fCutTargetElectron = fThickness_target;
|
||||
fCutTargetPositron = fThickness_target;
|
||||
fCutTargetGamma = fThickness_target;
|
||||
fCutTargetNeutron = fThickness_target;
|
||||
|
||||
fCutFoilProton = fThickness_foil;
|
||||
fCutFoilElectron = fThickness_foil;
|
||||
fCutFoilPositron = fThickness_foil;
|
||||
fCutFoilGamma = fThickness_foil;
|
||||
fCutFoilNeutron = fThickness_foil;
|
||||
|
||||
//EM physics
|
||||
fEmPhysicsList = new G4EmStandardPhysics_option3(0);
|
||||
@@ -163,7 +161,7 @@ void STCyclotronPhysicsList::ConstructProcess()
|
||||
//Update the cuts with the 1/2 of the thickness of the foil/target
|
||||
//SetCuts();
|
||||
|
||||
SetCutTarget(0.01,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.);
|
||||
SetCutTarget(0.01,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.);
|
||||
|
||||
|
||||
|
||||
@@ -184,8 +182,8 @@ void STCyclotronPhysicsList::SetCuts()
|
||||
SetCutValue(fCutForPositron, "e+");
|
||||
|
||||
// Set cuts for detector
|
||||
SetCutFoil(0.1,fThickness_foil/2.,fThickness_foil/2.,fThickness_foil/2.,fThickness_foil/2.);
|
||||
SetCutTarget(0.01,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.);
|
||||
SetCutFoil(0.1,fThickness_foil/2.,fThickness_foil/2.,fThickness_foil/2.);
|
||||
SetCutTarget(0.01,fThickness_target/2.,fThickness_target/2.,fThickness_target/2.);
|
||||
if (verboseLevel>0) DumpCutValuesTable();
|
||||
}
|
||||
|
||||
@@ -207,48 +205,42 @@ void STCyclotronPhysicsList::SetCutForPositron(G4double cut)
|
||||
SetParticleCuts(fCutForPositron, G4Positron::Positron());
|
||||
}
|
||||
|
||||
void STCyclotronPhysicsList::SetCutTarget(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma, G4double cutNeutron){
|
||||
void STCyclotronPhysicsList::SetCutTarget(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma){
|
||||
|
||||
fCutTargetProton = cutProton*mm;
|
||||
fCutTargetElectron = cutElectron*mm;
|
||||
fCutTargetPositron = cutPositron*mm;
|
||||
fCutTargetGamma = cutGamma*mm;
|
||||
fCutTargetNeutron = cutNeutron*mm;
|
||||
|
||||
G4String regionNameTarget = "Target";
|
||||
G4Region* regionTarget = G4RegionStore::GetInstance()->GetRegion(regionNameTarget);
|
||||
|
||||
G4ProductionCuts* cutsTarget = new G4ProductionCuts ;
|
||||
cutsTarget -> SetProductionCut(fCutTargetGamma,G4ProductionCuts::GetIndex("gamma"));
|
||||
cutsTarget -> SetProductionCut(fCutTargetElectron,G4ProductionCuts::GetIndex("e-"));
|
||||
cutsTarget -> SetProductionCut(fCutTargetPositron,G4ProductionCuts::GetIndex("e+"));
|
||||
cutsTarget -> SetProductionCut(fCutTargetProton,G4ProductionCuts::GetIndex("proton"));
|
||||
cutsTarget->SetProductionCut(fCutTargetProton, G4ProductionCuts::GetIndex("deuteron"));
|
||||
cutsTarget -> SetProductionCut(fCutTargetNeutron,G4ProductionCuts::GetIndex("neutron"));
|
||||
cutsTarget -> SetProductionCut(fCutTargetGamma,"gamma");
|
||||
cutsTarget -> SetProductionCut(fCutTargetElectron,"e-");
|
||||
cutsTarget -> SetProductionCut(fCutTargetPositron,"e+");
|
||||
cutsTarget -> SetProductionCut(fCutTargetProton,"proton");
|
||||
|
||||
regionTarget -> SetProductionCuts(cutsTarget);
|
||||
|
||||
}
|
||||
|
||||
void STCyclotronPhysicsList::SetCutFoil(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma, G4double cutNeutron){
|
||||
void STCyclotronPhysicsList::SetCutFoil(G4double cutProton, G4double cutElectron, G4double cutPositron, G4double cutGamma){
|
||||
|
||||
fCutFoilProton = cutProton*mm;
|
||||
fCutFoilElectron = cutElectron*mm;
|
||||
fCutFoilPositron = cutPositron*mm;
|
||||
fCutFoilGamma = cutGamma*mm;
|
||||
fCutFoilNeutron = cutNeutron*mm;
|
||||
|
||||
G4RegionStore::GetInstance()->GetRegion("Foil");
|
||||
G4String regionNameFoil = "Foil";
|
||||
G4Region* regionFoil = G4RegionStore::GetInstance()->GetRegion(regionNameFoil);
|
||||
|
||||
G4ProductionCuts* cutsFoil = new G4ProductionCuts ;
|
||||
cutsFoil -> SetProductionCut(fCutFoilGamma,G4ProductionCuts::GetIndex("gamma"));
|
||||
cutsFoil -> SetProductionCut(fCutFoilElectron,G4ProductionCuts::GetIndex("e-"));
|
||||
cutsFoil -> SetProductionCut(fCutFoilPositron,G4ProductionCuts::GetIndex("e+"));
|
||||
cutsFoil -> SetProductionCut(fCutFoilProton,G4ProductionCuts::GetIndex("proton"));
|
||||
cutsFoil->SetProductionCut(fCutFoilProton, G4ProductionCuts::GetIndex("deuteron"));
|
||||
cutsFoil -> SetProductionCut(fCutFoilNeutron,G4ProductionCuts::GetIndex("neutron"));
|
||||
cutsFoil -> SetProductionCut(fCutFoilGamma,"gamma");
|
||||
cutsFoil -> SetProductionCut(fCutFoilElectron,"e-");
|
||||
cutsFoil -> SetProductionCut(fCutFoilPositron,"e+");
|
||||
cutsFoil -> SetProductionCut(fCutFoilProton,"proton");
|
||||
|
||||
regionFoil -> SetProductionCuts(cutsFoil);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user