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

Timestamp:

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

Author:

garnier

Message:

update ti head

Location:

trunk/source/processes/electromagnetic/highenergy

Files:

• History (modified) (2 diffs)
• include/G4GammaConversionToMuons.hh (modified) (2 diffs)
• include/G4hhIonisation.hh (modified) (3 diffs)
• include/G4mplIonisationModel.hh (modified) (2 diffs)
• src/G4GammaConversionToMuons.cc (modified) (2 diffs)
• src/G4eeToHadronsModel.cc (modified) (3 diffs)
• src/G4eeToHadronsMultiModel.cc (modified) (3 diffs)
• src/G4hhIonisation.cc (modified) (3 diffs)
• src/G4mplIonisation.cc (modified) (3 diffs)
• src/G4mplIonisationModel.cc (modified) (3 diffs)

trunk/source/processes/electromagnetic/highenergy/History

@@ -1 @@
-$Id: History,v 1.36 2010/06/04 10:23:31 vnivanch Exp $
+$Id: History,v 1.37 2010/10/26 15:40:03 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+26 October 10: V.Ivanchenko (emhighenergy-V09-03-02)
+- Fixed problem reported by the Coverity tools (mainly pedantic 
+  initialisation)
+- Added G4mplIonisationWithDeltaModel which is substituted
+  G4mplIonisationModel by default - delat-ray production is required
+  both by ATLAS and CMS 
 
 04 March 10: V.Ivanchenko (emhighenergy-V09-03-01)

trunk/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4GammaConversionToMuons.hh,v 1.2 2006/06/29 19:32:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GammaConversionToMuons.hh,v 1.3 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 //         ------------ G4GammaConversionToMuons physics process ------
@@ -132 +132 @@
      G4double HighestEnergyLimit ;    // high energy limit of the tables
 
-     G4double fminimalEnergy;         // minimalEnergy of produced particles
-
      G4double MeanFreePath;           // actual MeanFreePath (current medium)
      G4double CrossSecFactor;         // factor to artificially increase

trunk/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4hhIonisation.hh,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4hhIonisation.hh,v 1.7 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -90 +90 @@
   G4double   mass;
   G4double   ratio;
-  G4double   minKinEnergy;
-  G4double   maxKinEnergy;
 
   const G4ParticleDefinition* theParticle;
@@ -98 +96 @@
 
   G4bool                      isInitialised;
-
-  G4double                    eth;
-
 };
 

trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4mplIonisationModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4mplIonisationModel.hh,v 1.8 2010/10/26 15:40:03 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -109 +109 @@
   G4double beta2lim;
   G4double bg2lim;
-  G4double factlow;
   G4double chargeSquare;
   G4double dedxlim;
   G4int    nmpl;
   G4double pi_hbarc2_over_mc2;
-  G4double approxConst;
 };
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GammaConversionToMuons.cc,v 1.7 2008/10/16 14:29:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GammaConversionToMuons.cc,v 1.8 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 //         ------------ G4GammaConversionToMuons physics process ------
@@ -53 +53 @@
 { 
   SetProcessSubType(15);
+  MeanFreePath = DBL_MAX;
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eeToHadronsModel.cc,v 1.9 2008/07/10 18:06:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4eeToHadronsModel.cc,v 1.10 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -76 +76 @@
 {
   theGamma = G4Gamma::Gamma();
+  highKinEnergy = HighEnergyLimit();
+  lowKinEnergy  = LowEnergyLimit();
+  emin = lowKinEnergy;
+  emax = highKinEnergy;
+  peakKinEnergy = highKinEnergy;
+  epeak = emax;
 }
 
@@ -92 +98 @@
                                     const G4DataVector&)
 {
-  if(isInitialised) return;
+  if(isInitialised) { return; }
   isInitialised  = true;
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eeToHadronsMultiModel.cc,v 1.8 2009/04/12 17:48:21 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4eeToHadronsMultiModel.cc,v 1.9 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -68 +68 @@
     verbose(ver),
     isInitialised(false)
-{}
+{
+  thKineticEnergy  = DBL_MAX;
+  maxKineticEnergy = 1.2*GeV;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -90 +93 @@
   if(!isInitialised) {
     isInitialised = true;
-
-    thKineticEnergy  = DBL_MAX;
-    maxKineticEnergy = 1.2*GeV;
 
     cross = new G4eeCrossSections();

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4hhIonisation.cc,v 1.10 2010/06/04 10:23:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4hhIonisation.cc,v 1.11 2010/10/26 14:15:40 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -102 +102 @@
                                                  const G4ParticleDefinition* bpart)
 {
-  if(isInitialised) return;
+  if(isInitialised) { return; }
 
   theParticle = part;
-  if(bpart) G4cout << "G4hhIonisation::InitialiseEnergyLossProcess WARNING: no "
-                   << "base particle should be defined for the process "
-                   << GetProcessName() << G4endl;
-
+  if(bpart) { 
+    G4cout << "G4hhIonisation::InitialiseEnergyLossProcess WARNING: no "
+           << "base particle should be defined for the process "
+           << GetProcessName() << G4endl; 
+  }
   SetBaseParticle(0);
   SetSecondaryParticle(G4Electron::Electron());
@@ -114 +115 @@
   mass  = theParticle->GetPDGMass();
   ratio = electron_mass_c2/mass;
-  eth = 2.0*MeV*mass/proton_mass_c2;
+  G4double eth = 2*MeV*mass/proton_mass_c2;
   flucModel = new G4BohrFluctuations();
 
   G4int nm = 1;
 
-  minKinEnergy = MinKinEnergy();
+  G4double minKinEnergy = MinKinEnergy();
 
   if(eth > minKinEnergy) {

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4mplIonisation.cc,v 1.10 2010/03/28 16:45:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4mplIonisation.cc,v 1.11 2010/10/26 15:40:03 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -49 +49 @@
 #include "G4Electron.hh"
 #include "G4mplIonisationModel.hh"
+#include "G4mplIonisationWithDeltaModel.hh"
 #include "G4BohrFluctuations.hh"
 
@@ -85 +86 @@
                                                   const G4ParticleDefinition*)
 {
-  if(isInitialised) return;
+  if(isInitialised) { return; }
 
   SetBaseParticle(0);
   SetSecondaryParticle(G4Electron::Electron());
 
-  G4mplIonisationModel* ion  = new G4mplIonisationModel(magneticCharge,"PAI");
+  G4mplIonisationWithDeltaModel* ion = 
+    new G4mplIonisationWithDeltaModel(magneticCharge,"PAI");
   ion->SetLowEnergyLimit(MinKinEnergy());
   ion->SetHighEnergyLimit(MaxKinEnergy());

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4mplIonisationModel.cc,v 1.7 2009/04/12 17:35:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4mplIonisationModel.cc,v 1.8 2010/10/26 15:40:03 vnivanch Exp $
+// GEANT4 tag $Name: emhighenergy-V09-03-02 $
 //
 // -------------------------------------------------------------------
@@ -74 +74 @@
 {
   nmpl         = G4int(abs(magCharge) * 2 * fine_structure_const + 0.5);
-  if(nmpl > 6)      nmpl = 6;
-  else if(nmpl < 1) nmpl = 1;
+  if(nmpl > 6)      { nmpl = 6; }
+  else if(nmpl < 1) { nmpl = 1; }
   pi_hbarc2_over_mc2 = pi * hbarc * hbarc / electron_mass_c2;
   chargeSquare = magCharge * magCharge;
   dedxlim = 45.*nmpl*nmpl*GeV*cm2/g;
   fParticleChange = 0;
+  mass = 0.0;
 }
 
@@ -94 +95 @@
   monopole = p;
   mass     = monopole->GetPDGMass();
-  if(!fParticleChange) fParticleChange = GetParticleChangeForLoss();
+  if(!fParticleChange) { fParticleChange = GetParticleChangeForLoss(); }
 }