Changeset 1315 for trunk/source/processes/electromagnetic/highenergy

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/processes/electromagnetic/highenergy

Files:

• History (modified) (2 diffs)
• src/G4hhIonisation.cc (modified) (4 diffs)
• src/G4mplIonisation.cc (modified) (2 diffs)

trunk/source/processes/electromagnetic/highenergy/History

@@ -1 @@
-$Id: History,v 1.34 2009/11/11 17:13:47 vnivanch Exp $
+$Id: History,v 1.36 2010/06/04 10:23:31 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+04 March 10: V.Ivanchenko (emhighenergy-V09-03-01)
+- G4ICRU73NoDeltaModel - new model derived from G4ICRU73QOModel
+
+28 March 10: V.Ivanchenko (emhighenergy-V09-03-00)
+- G4mplIonisation - fixed IsApplicable method - always "true" 
+                    (CMS report crash in the case when several types 
+                     of monopoles are instantiated)
 
 11 November 09: V.Ivanchenko (emhighenergy-V09-02-03)

trunk/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4hhIonisation.cc,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4hhIonisation.cc,v 1.10 2010/06/04 10:23:31 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -51 +51 @@
 #include "G4BraggNoDeltaModel.hh"
 #include "G4BetheBlochNoDeltaModel.hh"
+#include "G4ICRU73NoDeltaModel.hh"
 #include "G4UniversalFluctuation.hh"
 #include "G4BohrFluctuations.hh"
@@ -110 +111 @@
   SetBaseParticle(0);
   SetSecondaryParticle(G4Electron::Electron());
+  //G4double q = theParticle->GetPDGCharge();
   mass  = theParticle->GetPDGMass();
   ratio = electron_mass_c2/mass;
@@ -120 +122 @@
 
   if(eth > minKinEnergy) {
-    G4VEmModel* em = new G4BraggNoDeltaModel();
+    G4VEmModel* em;
+    em = new G4BraggNoDeltaModel(); 
+    //if(q > 0.0) { em = new G4BraggNoDeltaModel(); }
+    //else { em = new G4ICRU73NoDeltaModel(); }
     em->SetLowEnergyLimit(minKinEnergy);
     em->SetHighEnergyLimit(eth);
     AddEmModel(nm, em, flucModel);
-    nm++;
+    ++nm;
   }
 

trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4mplIonisation.cc,v 1.8 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4mplIonisation.cc,v 1.10 2010/03/28 16:45:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -75 +75 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4bool G4mplIonisation::IsApplicable(const G4ParticleDefinition& p)
+G4bool G4mplIonisation::IsApplicable(const G4ParticleDefinition&)
 {
-  return (p.GetParticleName() == "monopole");
+  return true;
 }