Changeset 1340 for trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEmModel.cc,v 1.35 2010/05/26 18:06:25 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VEmModel.cc,v 1.37 2010/10/14 16:27:35 vnivanch Exp $
+// GEANT4 tag $Name: emutils-V09-03-23 $
 //
 // -------------------------------------------------------------------
@@ -61 +61 @@
 
 G4VEmModel::G4VEmModel(const G4String& nam):
-  fluc(0), name(nam), lowLimit(0.1*keV), highLimit(100.0*TeV), 
+  flucModel(0),anglModel(0), name(nam), lowLimit(0.1*keV), highLimit(100.0*TeV), 
   eMinActive(0.0),eMaxActive(DBL_MAX),
   polarAngleLimit(0.0),secondaryThreshold(DBL_MAX),theLPMflag(false),
-  pParticleChange(0),nuclearStopping(false),
+  pParticleChange(0),/*nuclearStopping(false),*/
   currentCouple(0),currentElement(0),
   nsec(5),flagDeexcitation(false) 
@@ -84 +84 @@
     }
   }
+  delete anglModel;
 }
 
@@ -246 +247 @@
 G4double G4VEmModel::ChargeSquareRatio(const G4Track& track)
 {
-  return GetChargeSquareRatio(track.GetDefinition(), 
+  return GetChargeSquareRatio(track.GetParticleDefinition(), 
                               track.GetMaterial(), track.GetKineticEnergy());
 }
@@ -296 +297 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void 
+G4VEmModel::SetParticleChange(G4VParticleChange* p, G4VEmFluctuationModel* f)
+{
+  if(p && pParticleChange != p) { pParticleChange = p; }
+  flucModel = f;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......