Changeset 1337 for trunk/examples/advanced/human_phantom/src

Timestamp:

Sep 30, 2010, 2:47:17 PM (15 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/advanced/human_phantom/src

Files:

• G4HumanPhantomEventAction.cc (modified) (2 diffs)
• G4HumanPhantomHit.cc (modified) (1 diff)
• G4HumanPhantomPhysicsList.cc (modified) (4 diffs)
• G4MIRDTestes.cc (modified) (1 diff)
• G4ORNLFemaleBodyFactory.cc (modified) (1 diff)
• G4ORNLMaleBodyFactory.cc (modified) (1 diff)

trunk/examples/advanced/human_phantom/src/G4HumanPhantomEventAction.cc

@@ -36 +36 @@
 #include "G4Event.hh"
 #include "G4EventManager.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4ios.hh"
 #include "G4SDManager.hh"
@@ -122 +119 @@
 
  totalEventEnergyDeposit();
-
-
-  // Visualization of particle tracks
-  G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
-  G4int n_trajectories = 0;
-  if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
-  
-  if (G4VVisManager::GetConcreteInstance())
-    {
-     for (G4int i=0; i<n_trajectories; i++) 
-        { G4Trajectory* trj = (G4Trajectory*)
-                                    ((*(evt->GetTrajectoryContainer()))[i]);
-          trj->DrawTrajectory(500);
-        }
-    } 
 }
 

trunk/examples/advanced/human_phantom/src/G4HumanPhantomHit.cc

@@ -26 +26 @@
 //
 // $Id: G4HumanPhantomHit.cc,v 1.11 2007/05/15 14:45:35 guatelli Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 

trunk/examples/advanced/human_phantom/src/G4HumanPhantomPhysicsList.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+//
+// Code developed by:
+// S. Guatelli, G. Guerrieri and M. G. Pia
+//
 // 
-// Based on code developed by the undergraduate student G. Guerrieri 
-// Note: this is a preliminary beta-version of the code; an improved 
-// version will be distributed in the next Geant4 public release, compliant
-// with the design in a forthcoming publication, and subject to a 
-// design and code review.
-
+//
+//    **********************************
+//    *                                *
+//    *     G4HumanPhantomPhysicsList.cc       *
+//    *                                *
+//    **********************************
+//
+// $Id: G4HumanPhantomPhysicsList.cc,v 1.12 2010/06/03 23:37:01 cirrone Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
+//
 #include "G4HumanPhantomPhysicsList.hh"
 
@@ -40 +47 @@
 #include "G4UnitsTable.hh"
 #include "G4ios.hh"              
-
 #include "G4MultipleScattering.hh"
 // gamma
-#include "G4LowEnergyRayleigh.hh" 
-#include "G4LowEnergyPhotoElectric.hh"
-#include "G4LowEnergyCompton.hh"  
-#include "G4LowEnergyGammaConversion.hh" 
+#include "G4PhotoElectricEffect.hh"
+#include "G4LivermorePhotoElectricModel.hh"
+
+#include "G4ComptonScattering.hh"
+#include "G4LivermoreComptonModel.hh"
+
+#include "G4GammaConversion.hh"
+#include "G4LivermoreGammaConversionModel.hh"
+
+#include "G4RayleighScattering.hh" 
+#include "G4LivermoreRayleighModel.hh"
+
 // e-
-#include "G4LowEnergyIonisation.hh" 
-#include "G4LowEnergyBremsstrahlung.hh" 
+#include "G4eMultipleScattering.hh"
+#include "G4eIonisation.hh"
+#include "G4LivermoreIonisationModel.hh"
+#include "G4eBremsstrahlung.hh"
+#include "G4LivermoreBremsstrahlungModel.hh"
+
 // e+
 #include "G4eIonisation.hh" 
@@ -70 +88 @@
   // This ensures that objects of these particle types will be
   // created in the program. 
-  G4Geantino::GeantinoDefinition();
 
   ConstructBosons();
   ConstructLeptons();
+
 }
 
@@ -108 +126 @@
     
     if (particleName == "gamma") {
+      
       // Photon     
-      pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh);
-      pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric);
-      pmanager->AddDiscreteProcess(new G4LowEnergyCompton);
-      pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion);
+      G4RayleighScattering* theRayleigh = new G4RayleighScattering();
+      theRayleigh->SetModel(new G4LivermoreRayleighModel());  //not strictly necessary
+      pmanager->AddDiscreteProcess(theRayleigh);
+
+      G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
+      thePhotoElectricEffect->SetModel(new G4LivermorePhotoElectricModel());
+      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
+        
+      G4ComptonScattering* theComptonScattering = new G4ComptonScattering();
+      theComptonScattering->SetModel(new G4LivermoreComptonModel());
+      pmanager->AddDiscreteProcess(theComptonScattering);
+        
+      G4GammaConversion* theGammaConversion = new G4GammaConversion();
+      theGammaConversion->SetModel(new G4LivermoreGammaConversionModel());
+      pmanager->AddDiscreteProcess(theGammaConversion);
       
     } else if (particleName == "e-") {
       // Electron
-      G4LowEnergyIonisation*     loweIon  = new G4LowEnergyIonisation("LowEnergyIoni");
-
-      G4LowEnergyBremsstrahlung* loweBrem = new G4LowEnergyBremsstrahlung("LowEnBrem");
-      // Select the Bremsstrahlung angular distribution model (Tsai/2BN/2BS)
-      loweBrem->SetAngularGenerator("tsai");
-    
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(loweIon,     -1, 2,2);
-      pmanager->AddProcess(loweBrem,    -1,-1,3);      
+      
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->SetStepLimitType(fUseDistanceToBoundary);
+      pmanager->AddProcess(msc,-1, 1, 1);
+
+      // Ionisation
+      G4eIonisation* eIonisation = new G4eIonisation();
+      eIonisation->SetEmModel(new G4LivermoreIonisationModel());
+      eIonisation->SetStepFunction(0.2, 100*um); //improved precision in tracking  
+      pmanager->AddProcess(eIonisation,-1, 2, 2);
+        
+      // Bremsstrahlung
+      G4eBremsstrahlung* eBremsstrahlung = new G4eBremsstrahlung();
+      eBremsstrahlung->SetEmModel(new G4LivermoreBremsstrahlungModel());
+      pmanager->AddProcess(eBremsstrahlung, -1,-3, 3);
       
     } else if (particleName == "e+") {
       // Positron      
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);
-      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,4);      
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->SetStepLimitType(fUseDistanceToBoundary);
+      pmanager->AddProcess(msc,-1, 1, 1);
+        
+      // Ionisation
+      G4eIonisation* eIonisation = new G4eIonisation();
+      eIonisation->SetStepFunction(0.2, 100*um); //     
+      pmanager->AddProcess(eIonisation,                 -1, 2, 2);
+
+      //Bremsstrahlung (use default, no low-energy available)
+      pmanager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3);
+
+      //Annihilation
+      pmanager->AddProcess(new G4eplusAnnihilation(),0,-1, 4);     
       
     }

trunk/examples/advanced/human_phantom/src/G4MIRDTestes.cc

@@ -37 +37 @@
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"
+#include "G4PVPlacement.hh"
 
 G4MIRDTestes::G4MIRDTestes()

trunk/examples/advanced/human_phantom/src/G4ORNLFemaleBodyFactory.cc

@@ -37 +37 @@
 #include "G4GDMLParser.hh"
 #include "globals.hh"
+#include "G4PVPlacement.hh"
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"

trunk/examples/advanced/human_phantom/src/G4ORNLMaleBodyFactory.cc

@@ -37 +37 @@
 #include "G4GDMLParser.hh"
 #include "globals.hh"
+#include "G4PVPlacement.hh"
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"