Changeset 1230 for trunk/examples/advanced/microbeam/src

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/advanced/microbeam/src

Files:

• MicrobeamEMField.cc (modified) (4 diffs)
• MicrobeamPhantomConfiguration.cc (modified) (4 diffs)
• MicrobeamPhysicsList.cc (modified) (4 diffs)
• MicrobeamSteppingAction.cc (modified) (3 diffs)

trunk/examples/advanced/microbeam/src/MicrobeamEMField.cc

@@ -25 +25 @@
 //
 // -------------------------------------------------------------------
-// $Id: MicrobeamEMField.cc,v 1.6 2007/07/06 06:52:54 sincerti Exp $
+// $Id: MicrobeamEMField.cc,v 1.9 2009/04/30 10:23:57 sincerti Exp $
 // -------------------------------------------------------------------
 
@@ -58 +58 @@
 // ***********************
   
-   // MAGNETIC FIELD VALUE FOR 3 MeV ALPHAS
-  G4double switchingField = 0.0589768635 * tesla ;
+  // MAGNETIC FIELD VALUE FOR 3 MeV ALPHAS
+  //  G4double switchingField = 0.0589768635 * tesla ;
+  G4double switchingField =   0.0590201 * tesla ;
   
   // BEAM START
@@ -181 +182 @@
   G4double xoprime, zoprime;
   
-if (z>=-1400*mm & z <-200*mm)
+if (z>=-1400*mm && z <-200*mm)
 {
   Bx=0; By=0; Bz=0;
@@ -523 +524 @@
 
 if (
-(Bfield[0]==0. &
-Bfield[1]==0. &
-Bfield[2]==0. &
-Bfield[4]==0. &
-Bfield[5]==0. &
-Bfield[6]==0. )
-)
+     (Bfield[0]==0. &&
+      Bfield[1]==0. &&
+      Bfield[2]==0. &&
+      Bfield[3]==0. &&
+      Bfield[4]==0. &&
+      Bfield[5]==0. )
+   )
 {
 

trunk/examples/advanced/microbeam/src/MicrobeamPhantomConfiguration.cc

@@ -25 +25 @@
 //
 // -------------------------------------------------------------------
-// $Id: MicrobeamPhantomConfiguration.cc,v 1.5 2006/06/29 16:05:31 gunter Exp $
+// $Id: MicrobeamPhantomConfiguration.cc,v 1.6 2008/06/16 07:46:11 sincerti Exp $
 // -------------------------------------------------------------------
 
@@ -87 +87 @@
     if (mat==2) // NUCLEUS
         {
-          if (den==1) density = denNucl1;
-          if (den==2) density = denNucl2;
-          if (den==3) density = denNucl3;
+          if (den==1) density = denNucl1*(g/cm3);
+          if (den==2) density = denNucl2*(g/cm3);
+          if (den==3) density = denNucl3*(g/cm3);
           nucleusMass   = nucleusMass   + density * dx * dy * dz ;
         }
@@ -95 +95 @@
     if (mat==1) // CYTOPLASM
         { 
-          if (den==1) density = denCyto1;
-          if (den==2) density = denCyto2;
-          if (den==3) density = denCyto3;
+          if (den==1) density = denCyto1*(g/cm3);
+          if (den==2) density = denCyto2*(g/cm3);
+          if (den==3) density = denCyto3*(g/cm3);
           cytoplasmMass = cytoplasmMass + density * dx * dy * dz ;
         }
@@ -106 +106 @@
 
   fclose(fMap);
-  
-  nucleusMass   = nucleusMass * 1e-6 ;
-  cytoplasmMass = cytoplasmMass * 1e-6 ;
-  
+
   return 0;
 }

trunk/examples/advanced/microbeam/src/MicrobeamPhysicsList.cc

@@ -25 +25 @@
 //
 // -------------------------------------------------------------------
-// $Id: MicrobeamPhysicsList.cc,v 1.6 2006/11/23 12:24:20 sincerti Exp $
+// $Id: MicrobeamPhysicsList.cc,v 1.8 2009/04/30 10:23:57 sincerti Exp $
 // -------------------------------------------------------------------
 
@@ -107 +107 @@
 }
 
-#include "G4MultipleScattering.hh"
+// *** Processes and models
+
+// gamma
+
+#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 "G4eMultipleScattering.hh"
+#include "G4UniversalFluctuation.hh"
+
 #include "G4eIonisation.hh"
+#include "G4LivermoreIonisationModel.hh"
+
 #include "G4eBremsstrahlung.hh"
+#include "G4LivermoreBremsstrahlungModel.hh"
+
+// e+
+
 #include "G4eplusAnnihilation.hh"
+
+// mu
 
 #include "G4MuIonisation.hh"
@@ -116 +144 @@
 #include "G4MuPairProduction.hh"
 
-#include "G4LowEnergyPhotoElectric.hh"
-#include "G4LowEnergyCompton.hh"
-#include "G4LowEnergyGammaConversion.hh"
-#include "G4LowEnergyRayleigh.hh"
-
-#include "G4LowEnergyIonisation.hh"
-#include "G4LowEnergyBremsstrahlung.hh"
-
-#include "G4hLowEnergyIonisation.hh"
+// hadrons
+
 #include "G4hMultipleScattering.hh"
+#include "G4MscStepLimitType.hh"
+
+#include "G4hBremsstrahlung.hh"
+#include "G4hPairProduction.hh"
+
+#include "G4hIonisation.hh"
+#include "G4ionIonisation.hh"
+#include "G4IonParametrisedLossModel.hh"
+
+//
+
+#include "G4LossTableManager.hh"
+#include "G4EmProcessOptions.hh"
 
 
@@ -143 +177 @@
 
 
-      pmanager->AddDiscreteProcess(new G4LowEnergyCompton);     
-
-      G4LowEnergyPhotoElectric * LePeprocess = new G4LowEnergyPhotoElectric();
-      LePeprocess->ActivateAuger(true);
-      LePeprocess->SetCutForLowEnSecPhotons(0.250 * keV);
-      LePeprocess->SetCutForLowEnSecElectrons(0.250 * keV);
-      pmanager->AddDiscreteProcess(LePeprocess);
-      
-      pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion());
-      
-      pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh());
-      
-      pmanager->AddProcess(new G4StepLimiter(), -1, -1, 3);
-
+      G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
+      G4LivermorePhotoElectricModel* theLivermorePhotoElectricModel = new G4LivermorePhotoElectricModel();
+      thePhotoElectricEffect->AddEmModel(0, theLivermorePhotoElectricModel);
+      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
+
+      G4ComptonScattering* theComptonScattering = new G4ComptonScattering();
+      G4LivermoreComptonModel* theLivermoreComptonModel = new G4LivermoreComptonModel();
+      theComptonScattering->AddEmModel(0, theLivermoreComptonModel);
+      pmanager->AddDiscreteProcess(theComptonScattering);
+
+      G4GammaConversion* theGammaConversion = new G4GammaConversion();
+      G4LivermoreGammaConversionModel* theLivermoreGammaConversionModel = new G4LivermoreGammaConversionModel();
+      theGammaConversion->AddEmModel(0, theLivermoreGammaConversionModel);
+      pmanager->AddDiscreteProcess(theGammaConversion);
+
+      G4RayleighScattering* theRayleigh = new G4RayleighScattering();
+      G4LivermoreRayleighModel* theRayleighModel = new G4LivermoreRayleighModel();
+      theRayleigh->AddEmModel(0, theRayleighModel);
+      pmanager->AddDiscreteProcess(theRayleigh);
+      
+      pmanager->AddProcess(new G4StepLimiter(), -1, -1, 5);
       
     } else if (particleName == "e-") {
      
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      
-      G4LowEnergyIonisation * LeIoprocess = new G4LowEnergyIonisation("IONI");
-      LeIoprocess->ActivateAuger(true);
-      LeIoprocess->SetCutForLowEnSecPhotons(0.1*keV);
-      LeIoprocess->SetCutForLowEnSecElectrons(0.1*keV);
-      pmanager->AddProcess(LeIoprocess, -1,  2, 2); 
-
-      G4LowEnergyBremsstrahlung * LeBrprocess = new G4LowEnergyBremsstrahlung();
-      pmanager->AddProcess(LeBrprocess, -1, -1, 3);
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->SetStepLimitType(fUseDistanceToBoundary);
+      pmanager->AddProcess(msc,                   -1, 1, 1);
+      
+      // Ionisation
+      G4eIonisation* eIoni = new G4eIonisation();
+      eIoni->AddEmModel(0, new G4LivermoreIonisationModel(), new G4UniversalFluctuation() );
+      eIoni->SetStepFunction(0.2, 100*um); //     
+      pmanager->AddProcess(eIoni,                 -1, 2, 2);
+      
+      // Bremsstrahlung
+      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
+      eBrem->AddEmModel(0, new G4LivermoreBremsstrahlungModel());
+      pmanager->AddProcess(eBrem,                 -1,-3, 3);
+
+      pmanager->AddProcess(new G4StepLimiter(), -1, -1, 4);
+      
+    } else if (particleName == "e+") {
+
+      // Identical to G4EmStandardPhysics_option3
+    
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->SetStepLimitType(fUseDistanceToBoundary);
+      pmanager->AddProcess(msc,                   -1, 1, 1);
+
+      G4eIonisation* eIoni = new G4eIonisation();
+      eIoni->SetStepFunction(0.2, 100*um);      
+      pmanager->AddProcess(eIoni,                 -1, 2, 2);
+      
+      pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3);
+      
+      pmanager->AddProcess(new G4eplusAnnihilation,0,-1, 4);
+      
+      pmanager->AddProcess(new G4StepLimiter(), -1, -1, 5);
+
+    } else if (particleName == "GenericIon") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      ionIoni->SetEmModel(new G4IonParametrisedLossModel());
+      ionIoni->SetStepFunction(0.1, 20*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+
       pmanager->AddProcess(new G4StepLimiter(), -1, -1, 3);
-      
-    } else if (particleName == "e+") {
-
-      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);
-      
+
+    } else if (particleName == "alpha" ||
+               particleName == "He3" ) {
+
+      // Identical to G4EmStandardPhysics_option3
+      
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      ionIoni->SetStepFunction(0.1, 20*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+
       pmanager->AddProcess(new G4StepLimiter(), -1, -1, 3);
-
-    } else if( particleName == "mu+" || 
-               particleName == "mu-"    ) {
-
-    } else if ((!particle->IsShortLived()) &&
-               (particle->GetPDGCharge() != 0.0) && 
-               (particle->GetParticleName() != "chargedgeantino")) {
-     
-      //pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
-      pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1);
-      
-      G4hLowEnergyIonisation* hLowEnergyIonisation = new G4hLowEnergyIonisation();
-      pmanager->AddProcess(hLowEnergyIonisation,-1,2,2);
-
-      hLowEnergyIonisation->SetElectronicStoppingPowerModel(particle,"ICRU_R49He");
-      hLowEnergyIonisation->SetNuclearStoppingOn();
-      hLowEnergyIonisation->SetNuclearStoppingPowerModel("ICRU_R49");
-      hLowEnergyIonisation->SetFluorescence(true);
-      hLowEnergyIonisation->ActivateAugerElectronProduction(true);
-
-      pmanager->AddProcess(new G4StepLimiter(), -1, -1, 3);
-
     }
 
-//end
+   //
 
   }

trunk/examples/advanced/microbeam/src/MicrobeamSteppingAction.cc

@@ -25 +25 @@
 //
 // -------------------------------------------------------------------
-// $Id: MicrobeamSteppingAction.cc,v 1.8 2007/08/22 13:58:33 sincerti Exp $
+// $Id: MicrobeamSteppingAction.cc,v 1.9 2008/06/16 07:46:11 sincerti Exp $
 // -------------------------------------------------------------------
 
@@ -158 +158 @@
 
         { 
-         G4double dose = (e_SI*(aStep->GetTotalEnergyDeposit()/eV))/(Run->GetMassNucleus());
+         G4double dose = (aStep->GetTotalEnergyDeposit()/joule)/(Run->GetMassNucleus()/kg);
          Run->AddDoseN(dose);
 
@@ -170 +170 @@
 
         { 
-         G4double dose = (e_SI*(aStep->GetTotalEnergyDeposit()/eV))/(Run->GetMassCytoplasm());
+         G4double dose = (aStep->GetTotalEnergyDeposit()/joule)/(Run->GetMassCytoplasm()/kg);
          Run->AddDoseC(dose);