Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -62,7 +62,7 @@
|
||||
#include "G4LogicalVolumeStore.hh"
|
||||
#include "G4SolidStore.hh"
|
||||
#include "XrayFluoNistMaterials.hh"
|
||||
|
||||
#include "G4SDManager.hh"
|
||||
|
||||
// #include "G4Region.hh"
|
||||
// #include "G4RegionStore.hh"
|
||||
@@ -647,7 +647,7 @@ G4VPhysicalVolume* XrayFluoDetectorConstruction::ConstructApparate()
|
||||
|
||||
// Visualization attributes
|
||||
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::Invisible);
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::GetInvisible());
|
||||
G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
|
||||
G4VisAttributes * yellow= new G4VisAttributes( G4Colour(255/255. ,255/255. ,51/255. ));
|
||||
G4VisAttributes * red= new G4VisAttributes( G4Colour(255/255. , 0/255. , 0/255. ));
|
||||
@@ -711,7 +711,7 @@ void XrayFluoDetectorConstruction::ConstructSDandField()
|
||||
XrayFluoSD* SD = new XrayFluoSD ("HPGeSD",this);
|
||||
HPGeSD.Put( SD );
|
||||
}
|
||||
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(HPGeSD.Get());
|
||||
if (logicPixel)
|
||||
SetSensitiveDetector(logicPixel,HPGeSD.Get());
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
#include "G4PhysicalVolumeStore.hh"
|
||||
#include "G4LogicalVolumeStore.hh"
|
||||
#include "G4SolidStore.hh"
|
||||
|
||||
#include "G4SDManager.hh"
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
|
||||
@@ -432,7 +432,7 @@ G4VPhysicalVolume* XrayFluoMercuryDetectorConstruction::ConstructApparate()
|
||||
// Visualization attributes
|
||||
|
||||
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::Invisible);
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::GetInvisible());
|
||||
G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
|
||||
G4VisAttributes * yellow= new G4VisAttributes( G4Colour(255/255. ,255/255. ,51/255. ));
|
||||
G4VisAttributes * red= new G4VisAttributes( G4Colour(255/255. , 0/255. , 0/255. ));
|
||||
@@ -452,7 +452,7 @@ G4VPhysicalVolume* XrayFluoMercuryDetectorConstruction::ConstructApparate()
|
||||
//logicWorld->SetVisAttributes (simpleBoxVisAtt);
|
||||
|
||||
logicPixel->SetVisAttributes(red);
|
||||
logicHPGe->SetVisAttributes(G4VisAttributes::Invisible);
|
||||
logicHPGe->SetVisAttributes(G4VisAttributes::GetInvisible());
|
||||
|
||||
logicMercury->SetVisAttributes(darkGray);
|
||||
|
||||
@@ -484,7 +484,7 @@ void XrayFluoMercuryDetectorConstruction::ConstructSDandField()
|
||||
XrayFluoSD* SD = new XrayFluoSD ("HPGeSD",this);
|
||||
HPGeSD.Put( SD );
|
||||
}
|
||||
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(HPGeSD.Get());
|
||||
if (logicPixel)
|
||||
SetSensitiveDetector(logicPixel,HPGeSD.Get());
|
||||
}
|
||||
|
||||
@@ -177,9 +177,10 @@ void XrayFluoPhysicsList::AddDecay()
|
||||
|
||||
G4Decay* fDecayProcess = new G4Decay();
|
||||
|
||||
theParticleIterator->reset();
|
||||
while( (*theParticleIterator)() ){
|
||||
G4ParticleDefinition* particle = theParticleIterator->value();
|
||||
auto particleIterator=GetParticleIterator();
|
||||
particleIterator->reset();
|
||||
while( (*particleIterator)() ){
|
||||
G4ParticleDefinition* particle = particleIterator->value();
|
||||
G4ProcessManager* pmanager = particle->GetProcessManager();
|
||||
|
||||
if (fDecayProcess->IsApplicable(*particle) && !particle->IsShortLived()) {
|
||||
@@ -201,9 +202,10 @@ void XrayFluoPhysicsList::AddStepMax()
|
||||
// Step limitation seen as a process
|
||||
XrayFluoStepMax* stepMaxProcess = new XrayFluoStepMax();
|
||||
|
||||
theParticleIterator->reset();
|
||||
while ((*theParticleIterator)()){
|
||||
G4ParticleDefinition* particle = theParticleIterator->value();
|
||||
auto particleIterator=GetParticleIterator();
|
||||
particleIterator->reset();
|
||||
while ((*particleIterator)()){
|
||||
G4ParticleDefinition* particle = particleIterator->value();
|
||||
G4ProcessManager* pmanager = particle->GetProcessManager();
|
||||
|
||||
if (stepMaxProcess->IsApplicable(*particle) && !particle->IsShortLived())
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
#include "G4PhysicalVolumeStore.hh"
|
||||
#include "G4LogicalVolumeStore.hh"
|
||||
#include "G4SolidStore.hh"
|
||||
#include "G4SDManager.hh"
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
@@ -511,7 +512,7 @@ G4VPhysicalVolume* XrayFluoPlaneDetectorConstruction::ConstructApparate()
|
||||
|
||||
// Visualization attributes
|
||||
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::Invisible);
|
||||
logicWorld->SetVisAttributes (G4VisAttributes::GetInvisible());
|
||||
G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
|
||||
G4VisAttributes * yellow= new G4VisAttributes( G4Colour(255/255. ,255/255. ,51/255. ));
|
||||
G4VisAttributes * red= new G4VisAttributes( G4Colour(255/255. , 0/255. , 0/255. ));
|
||||
@@ -562,7 +563,7 @@ void XrayFluoPlaneDetectorConstruction::ConstructSDandField()
|
||||
XrayFluoSD* SD = new XrayFluoSD ("HPGeSD",this);
|
||||
HPGeSD.Put( SD );
|
||||
}
|
||||
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(HPGeSD.Get());
|
||||
if (logicPixel)
|
||||
SetSensitiveDetector(logicPixel,HPGeSD.Get());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user