Import Geant4 10.3.0 source tree

2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
@@ -36,7 +36,6 @@

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-
 B03ActionInitialization::B03ActionInitialization()
 {;} 

@@ -135,19 +135,6 @@ G4VPhysicalVolume* B03DetectorConstruction::Construct()
  Concrete->AddElement(elC , fractionmass= 0.001);
   

-
-
-
-
-
-
-
-
-
-
-
-
-
  /////////////////////////////
  // world cylinder volume
  ////////////////////////////
@@ -178,7 +165,6 @@ G4VPhysicalVolume* B03DetectorConstruction::Construct()
  fWorldVolume = new G4PVPlacement(0, G4ThreeVector(0,0,0), worldCylinder_log
                                  ,name, 0, false, 0);

-
  // creating 18 slobs of 10 cm thick concrete

  G4double innerRadiusShield = 0*cm;
@@ -52,7 +52,6 @@
 #include "G4PSTrackCounter.hh"
 #include "G4PSTrackLength.hh"

-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 B03ImportanceDetectorConstruction::
@@ -89,9 +88,6 @@ void B03ImportanceDetectorConstruction::Construct()
  //  fPVolumeStore.AddPVolume(G4GeometryCell(*pWorldVolume, 0));
  fPVolumeStore.AddPVolume(G4GeometryCell(*fGhostWorld, 0));

-
-
-
  // creating 18 slobs of 10 cm thicknes

  G4double innerRadiusShield = 0*cm;
@@ -280,14 +276,12 @@ void B03ImportanceDetectorConstruction::ConstructSD()
                         new G4MultiFunctionalDetector(concreteSDname);
  SDman->AddNewDetector( MFDet );                 // Register SD to SDManager

-
  G4String fltName,particleName;
  G4SDParticleFilter* neutronFilter = 
      new G4SDParticleFilter(fltName="neutronFilter", particleName="neutron");

  MFDet->SetFilter(neutronFilter);

-
  for (std::vector<G4LogicalVolume *>::iterator it =  
                                                fLogicalVolumeVector.begin();
       it != fLogicalVolumeVector.end(); it++){
@@ -299,12 +293,10 @@ void B03ImportanceDetectorConstruction::ConstructSD()
  G4PSNofCollision*   scorer0 = new G4PSNofCollision(psName="Collisions");  
  MFDet->RegisterPrimitive(scorer0);

-
  G4PSNofCollision*   scorer1 = new G4PSNofCollision(psName="CollWeight");  
  scorer1->Weighted(true);
  MFDet->RegisterPrimitive(scorer1);

-
  G4PSPopulation*   scorer2 = new G4PSPopulation(psName="Population");  
  MFDet->RegisterPrimitive(scorer2);

@@ -40,7 +40,6 @@
 #include "B03PVolumeStore.hh"
 #include <sstream>

-
 #include "G4VPhysicalVolume.hh"

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -172,9 +172,10 @@ void B03PhysicsList::ConstructProcess()

 void B03PhysicsList::ConstructEM()
 {
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
+  auto particleIterator=GetParticleIterator();
+  particleIterator->reset();
+  while( (*particleIterator)() ){
+    G4ParticleDefinition* particle = particleIterator->value();
    G4ProcessManager* pmanager = particle->GetProcessManager();
    G4String particleName = particle->GetParticleName();
     
@@ -377,9 +378,10 @@ void B03PhysicsList::ConstructHad()
  G4HadronElastic* theElasticModel = new G4HadronElastic;
  theElasticProcess->RegisterMe(theElasticModel);

-  theParticleIterator->reset();
-  while ((*theParticleIterator)()) {
-    G4ParticleDefinition* particle = theParticleIterator->value();
+  auto particleIterator=GetParticleIterator();
+  particleIterator->reset();
+  while ((*particleIterator)()) {
+    G4ParticleDefinition* particle = particleIterator->value();
    G4ProcessManager* pmanager = particle->GetProcessManager();
    G4String particleName = particle->GetParticleName();
     
@@ -611,9 +613,10 @@ void B03PhysicsList::ConstructLeptHad()
 void B03PhysicsList::ConstructGeneral()
 {
  G4Decay* theDecayProcess = 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 (theDecayProcess->IsApplicable(*particle)) { 
      pmanager ->AddProcess(theDecayProcess);
@@ -649,9 +652,10 @@ void B03PhysicsList::AddScoringProcess(){
     = new G4ParallelWorldProcess(procName);
   theParallelWorldProcess->SetParallelWorld(fParaWorldName[i]);

-   theParticleIterator->reset();
-   while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
+   auto particleIterator=GetParticleIterator();
+   particleIterator->reset();
+   while( (*particleIterator)() ){
+    G4ParticleDefinition* particle = particleIterator->value();
    G4ProcessManager* pmanager = particle->GetProcessManager();
    pmanager->AddProcess(theParallelWorldProcess);
    if(theParallelWorldProcess->IsAtRestRequired(particle))
@@ -162,7 +162,6 @@ void B03Run::RecordEvent(const G4Event* aEvent)
  
 }

-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 //  Access method for HitsMap of the RUN
@@ -159,7 +159,6 @@ void B03RunAction::EndOfRunAction(const G4Run* aRun)
    G4cout << "=============================================================" 
           <<G4endl;

-
    std::ostream *myout = &G4cout;
    PrintHeader(myout);