Changeset 1337 for trunk/examples/extended/radioactivedecay/exrdm/src

Timestamp:

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

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/radioactivedecay/exrdm/src

Files:

• exrdmEventAction.cc (modified) (2 diffs)
• exrdmPhysListEmLowEnergy.cc (modified) (6 diffs)

trunk/examples/extended/radioactivedecay/exrdm/src/exrdmEventAction.cc

@@ -32 +32 @@
 #include "G4EventManager.hh"
 #include "G4HCofThisEvent.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4UImanager.hh"
 #include "G4UnitsTable.hh"
@@ -65 +62 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void exrdmEventAction::EndOfEventAction(const G4Event* evt)
+void exrdmEventAction::EndOfEventAction(const G4Event*)
 {
   //analysis
   exrdmAnalysisManager::getInstance()->EndOfEvent();
-  // visualisation
-#ifdef G4VIS_USE
-  G4int event_id       = evt->GetEventID();
-  if (event_id < 100 && G4VVisManager::GetConcreteInstance()) {
-    G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
-    G4int n_trajectories = 0;
-    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
-    for (G4int i=0; i<n_trajectories; i++) {
-      G4Trajectory* trj = (G4Trajectory *)
-        ((*(evt->GetTrajectoryContainer()))[i]);
-      if (drawFlag == "all") {
-        trj->DrawTrajectory(0);
-      } else if (drawFlag == "charged" && trj->GetCharge() != 0.) {
-        trj->DrawTrajectory(0);
-      }
-    }
-  }
-#endif
 }
 

trunk/examples/extended/radioactivedecay/exrdm/src/exrdmPhysListEmLowEnergy.cc

@@ -46 +46 @@
 #include "G4eplusAnnihilation.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
+#include "G4hMultipleScattering.hh"
 
 #include "G4MuIonisation.hh"
@@ -88 +90 @@
     } else if (particleName == "e-") {
   
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering, -1, 1,1);
       pmanager->AddProcess(new G4LowEnergyIonisation,        -1, 2,2);
       pmanager->AddProcess(new G4LowEnergyBremsstrahlung,    -1,-3,3);
@@ -94 +96 @@
     } else if (particleName == "e+") {
 
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering, -1, 1,1);
       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3,3);
@@ -102 +104 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
@@ -109 +111 @@
     } else if (particleName == "GenericIon") {
 
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1,1);
       pmanager->AddProcess(new G4hLowEnergyIonisation,       -1,2,2);
       //      pmanager->AddProcess(new G4ionIonisation,      -1, 2,2);
@@ -117 +119 @@
                (particle->GetParticleName() != "chargedgeantino")) {
 
-      pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
+      pmanager->AddProcess(new G4hMultipleScattering,-1,1,1);
       pmanager->AddProcess(new G4hLowEnergyIonisation,       -1,2,2);
     }