Changeset 1340 for trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh (modified) (12 diffs)

trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEmModel.hh,v 1.75 2010/05/26 10:41:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VEmModel.hh,v 1.77 2010/10/14 16:27:35 vnivanch Exp $
+// GEANT4 tag $Name: emutils-V09-03-23 $
 //
 // -------------------------------------------------------------------
@@ -67 +67 @@
 // 16-02-09 Moved implementations of virtual methods to source (VI)
 // 07-04-09 Moved msc methods from G4VEmModel to G4VMscModel (VI)
+// 13-10-10 Added G4VEmAngularDistribution (VI)
 //
 // Class Description:
@@ -87 +88 @@
 #include "G4DataVector.hh"
 #include "G4VEmFluctuationModel.hh"
+#include "G4VEmAngularDistribution.hh"
 #include "G4EmElementSelector.hh"
 #include "Randomize.hh"
@@ -146 +148 @@
                                                                      
   // min cut in kinetic energy allowed by the model
+  // obsolete method will be removed
   virtual G4double MinEnergyCut(const G4ParticleDefinition*,
                                 const G4MaterialCutsCouple*);
@@ -252 +255 @@
   //------------------------------------------------------------------------
 
+  void SetParticleChange(G4VParticleChange*, G4VEmFluctuationModel* f=0);
+
   inline G4VEmFluctuationModel* GetModelOfFluctuations();
 
+  inline G4VEmAngularDistribution* GetAngularDistribution();
+
+  inline void SetAngularDistribution(G4VEmAngularDistribution*);
+
   inline G4double HighEnergyLimit() const;
 
@@ -284 +293 @@
   inline void SetDeexcitationFlag(G4bool val);
 
-  inline void ActivateNuclearStopping(G4bool);
-
   inline G4double MaxSecondaryKinEnergy(const G4DynamicParticle* dynParticle);
 
   inline const G4String& GetName() const;
-
-  inline void SetParticleChange(G4VParticleChange*, G4VEmFluctuationModel*);
 
   inline void SetCurrentCouple(const G4MaterialCutsCouple*);
@@ -310 +315 @@
   // ======== Parameters of the class fixed at construction =========
 
-  G4VEmFluctuationModel* fluc;
+  G4VEmFluctuationModel* flucModel;
+  G4VEmAngularDistribution* anglModel;
   const G4String   name;
 
@@ -329 +335 @@
 
   G4VParticleChange*  pParticleChange;
-  G4bool              nuclearStopping;
+  //  G4bool              nuclearStopping;
 
   // ======== Cashed values - may be state dependent ================
@@ -377 +383 @@
 G4double G4VEmModel::MaxSecondaryKinEnergy(const G4DynamicParticle* dynPart)
 {
-  return MaxSecondaryEnergy(dynPart->GetDefinition(),
+  return MaxSecondaryEnergy(dynPart->GetParticleDefinition(),
                             dynPart->GetKineticEnergy());
 }
@@ -479 +485 @@
 inline G4VEmFluctuationModel* G4VEmModel::GetModelOfFluctuations()
 {
-  return fluc;
+  return flucModel;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+inline G4VEmAngularDistribution* G4VEmModel::GetAngularDistribution()
+{
+  return anglModel;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+inline void G4VEmModel::SetAngularDistribution(G4VEmAngularDistribution* p)
+{
+  anglModel = p;
 }
 
@@ -587 +607 @@
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-inline void G4VEmModel::ActivateNuclearStopping(G4bool val)
-{
-  nuclearStopping = val;
-}
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -603 +616 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline void G4VEmModel::SetParticleChange(G4VParticleChange* p,  
-                                          G4VEmFluctuationModel* f = 0)
-{
-  if(p && pParticleChange != p) { pParticleChange = p; }
-  fluc = f;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif