Changeset 961 for trunk

trunk/source/processes/cuts/History

-              r819
+              r961
 $Id: History,v 1.21 2007/06/06 14:50:38 gcosmo Exp $
+$Id: History,v 1.22 2008/03/02 10:52:55 kurasige Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Mar. 2nd, 2008  -  H.Kurashige (procuts-V09-01-00)
+- Add ProductionCutsMessenger
+- Suppress 'too big cut value' messsage for higher verbosity
 June 6th, 2007 -  L.Urban (procuts-V08-03-01)

trunk/source/processes/cuts/include/G4MCCIndexConversionTable.hh

r819	r961
25	25	//
26	26	// $Id: G4MCCIndexConversionTable.hh,v 1.3 2006/06/29 19:29:42 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	//

trunk/source/processes/cuts/include/G4MaterialCutsCouple.hh

r819	r961
26	26	//
27	27	// $Id: G4MaterialCutsCouple.hh,v 1.3 2006/06/29 19:29:44 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4PhysicsTableHelper.hh

r819	r961
26	26	//
27	27	// $Id: G4PhysicsTableHelper.hh,v 1.3 2006/06/29 19:29:46 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4ProductionCuts.hh

r819	r961
26	26	//
27	27	// $Id: G4ProductionCuts.hh,v 1.4 2006/06/29 19:29:48 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4ProductionCutsTable.hh

-              r819
+              r961
 //
 //
 // $Id: G4ProductionCutsTable.hh,v 1.8 2007/03/15 04:06:40 kurasige Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ProductionCutsTable.hh,v 1.9 2008/03/02 10:52:55 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 //    Modify RetrieveCutsTable to allow materials and
 //    couples can be different from one in file (i.e. at storing)
+//
+//   Modified                      2 Mar. 2008 H.Kurashige
+//    add messenger
 // ------------------------------------------------------------
 …
 class G4VPhysicalVolume;
 class G4ProductionCuts;
+class G4ProductionCutsTableMessenger;
 #include "globals.hh"
 …
   private:
+   G4int verboseLevel;
+    G4int verboseLevel;
+    G4ProductionCutsTableMessenger* fMessenger;
 };
 …
 inline
- void G4ProductionCutsTable::SetVerboseLevel(G4int value)
+{
-   verboseLevel = value;
+}
-inline
  G4int G4ProductionCutsTable::GetVerboseLevel() const
+{

trunk/source/processes/cuts/include/G4RToEConvForAntiNeutron.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForAntiNeutron.hh,v 1.2 2006/06/29 19:29:52 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForAntiProton.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForAntiProton.hh,v 1.2 2006/06/29 19:29:54 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForElectron.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForElectron.hh,v 1.2 2006/06/29 19:29:56 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForGamma.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForGamma.hh,v 1.2 2006/06/29 19:29:58 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForNeutron.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForNeutron.hh,v 1.2 2006/06/29 19:30:00 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForPositron.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForPositron.hh,v 1.2 2006/06/29 19:30:02 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4RToEConvForProton.hh

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForProton.hh,v 1.2 2006/06/29 19:30:04 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/include/G4VRangeToEnergyConverter.hh

r819	r961
26	26	//
27	27	// $Id: G4VRangeToEnergyConverter.hh,v 1.4 2006/06/29 19:30:06 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4MCCIndexConversionTable.cc

r819	r961
25	25	//
26	26	// $Id: G4MCCIndexConversionTable.cc,v 1.3 2006/06/29 19:30:08 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	//

trunk/source/processes/cuts/src/G4MaterialCutsCouple.cc

r819	r961
26	26	//
27	27	// $Id: G4MaterialCutsCouple.cc,v 1.3 2006/06/29 19:30:10 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4PhysicsTableHelper.cc

r819	r961
25	25	//
26	26	// $Id: G4PhysicsTableHelper.cc,v 1.5 2006/06/29 19:30:12 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	//

trunk/source/processes/cuts/src/G4ProductionCuts.cc

r819	r961
26	26	//
27	27	// $Id: G4ProductionCuts.cc,v 1.5 2006/06/29 19:30:14 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4ProductionCutsTable.cc

-              r819
+              r961
 //
 //
 // $Id: G4ProductionCutsTable.cc,v 1.17 2007/05/30 08:22:20 kurasige Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ProductionCutsTable.cc,v 1.18 2008/03/02 10:52:55 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 //      GEANT 4 class implementation file/  History:
 //    06/Oct. 2002, M.Asai : First implementation
+//    02/Mar. 2008, H.Kurashige : Add messenger
 // --------------------------------------------------------------
 …
 #include "G4ProductionCuts.hh"
 #include "G4MCCIndexConversionTable.hh"
+#include "G4ProductionCutsTableMessenger.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 …
 G4ProductionCutsTable::G4ProductionCutsTable()
   : firstUse(true),verboseLevel(1)
+  : firstUse(true),verboseLevel(1),fMessenger(0)
+{
   for(size_t i=0;i< NumberOfG4CutIndex;i++)
 …
   fG4RegionStore = G4RegionStore::GetInstance();
   defaultProductionCuts = new G4ProductionCuts();
+  // add messenger for UI
+  fMessenger = new G4ProductionCutsTableMessenger(this);
+}
 …
+  }
   fG4ProductionCutsTable =0;
+  if (fMessenger !=0) delete fMessenger;
+  fMessenger = 0;
+}
 …
+{
   if(firstUse){
+    if(G4ParticleTable::GetParticleTable()->FindParticle("gamma"))
+    { converters[0] = new G4RToEConvForGamma(); }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e-"))
+    { converters[1] = new G4RToEConvForElectron(); }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e+"))
+    { converters[2] = new G4RToEConvForPositron(); }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("gamma")){
+      converters[0] = new G4RToEConvForGamma();
+      converters[0]->SetVerboseLevel(GetVerboseLevel());
+    }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e-")){
+      converters[1] = new G4RToEConvForElectron();
+      converters[1]->SetVerboseLevel(GetVerboseLevel());
+        }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e+")){
+      converters[2] = new G4RToEConvForPositron();
+      converters[2]->SetVerboseLevel(GetVerboseLevel());
+    }
     firstUse = false;
+  }
 …
 #ifdef G4VERBOSE
   if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cout << "G4ProductionCutsTable::StoreCutsTable " ;
     G4cout << " Material/Cuts information have been succesfully stored ";
 …
   if (!RetrieveCutsInfo(dir, ascii)) return false;
 #ifdef G4VERBOSE
   if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cout << "G4ProductionCutsTable::RetrieveCutsTable " ;
     G4cout << " Material/Cuts information have been succesfully retreived ";
 …
   //  isNeedForRestoreCoupleInfo = false;
   if (!CheckMaterialInfo(directory, ascii)) return false;
   if (verboseLevel >1) {
+  if (verboseLevel >2) {
       G4cerr << "G4ProductionCutsTable::CheckMaterialInfo  passed !!"<< G4endl;
+  }
   if (!CheckMaterialCutsCoupleInfo(directory, ascii)) return false;
   if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cerr << "G4ProductionCutsTable::CheckMaterialCutsCoupleInfo  passed !!"<< G4endl;
+  }
 …
   return true;
+}
+// Set Verbose Level
+//   set same verbosity to all registered RangeToEnergyConverters
+ void G4ProductionCutsTable::SetVerboseLevel(G4int value)
+{
+  verboseLevel = value;
+  for (int ip=0; ip< NumberOfG4CutIndex; ip++) {
+    if (converters[ip] !=0 ){
+      converters[ip]->SetVerboseLevel(value);
+    }
+  }
+}

trunk/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForAntiNeutron.cc,v 1.3 2006/06/29 19:30:18 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForAntiProton.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForAntiProton.cc,v 1.3 2006/06/29 19:30:20 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForElectron.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForElectron.cc,v 1.5 2006/06/29 19:30:22 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForGamma.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForGamma.cc,v 1.4 2006/06/29 19:30:24 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForNeutron.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForNeutron.cc,v 1.3 2006/06/29 19:30:26 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForPositron.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForPositron.cc,v 1.5 2006/06/29 19:30:28 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4RToEConvForProton.cc

r819	r961
26	26	//
27	27	// $Id: G4RToEConvForProton.cc,v 1.3 2006/06/29 19:30:30 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/cuts/src/G4VRangeToEnergyConverter.cc

-              r819
+              r961
 //
 //
 // $Id: G4VRangeToEnergyConverter.cc,v 1.8 2007/06/06 05:13:34 urban Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VRangeToEnergyConverter.cc,v 1.9 2008/03/02 10:52:56 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
     theLossTable->reserve(G4Element::GetNumberOfElements());
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>2) {
+    if (GetVerboseLevel()>3) {
       G4cout << "G4VRangeToEnergyConverter::BuildLossTable() ";
       G4cout << "Create theLossTable[" << theLossTable << "]";
 …
   if ( theCutInLength >= rmax )  {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
+    if (GetVerboseLevel()>2) {
       G4cout << "G4VRangeToEnergyConverter::ConvertCutToKineticEnergy ";
       G4cout << "  for " << theParticle->GetParticleName() << G4endl;

trunk/source/processes/decay/History

-              r819
+              r961
 $Id: History,v 1.28.2.1 2008/04/17 08:59:24 kurasige Exp $
+$Id: History,v 1.34 2008/11/14 15:55:47 kurasige Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+- Apr. 16,  08 H.Kurashige  (decay-V09-00-03)
+-Sep. 19 2008   H.Kurashige (decay-V09-01-04)
+- modify process sub type enumeration
+- Aug. 22,  08 P.Gumplinger (decay-V09-01-03)
+- fix a bug in G4DecayWithSpin.cc: there is a memory overwrite when the
+  GetFieldValue being called initializes a fieldValue array of size 6
+  when the array is only defined of size 3 in the calling program.
+  Thanks to Kamil Sedlak (PSI) for pointing this out and suggesting this
+  fix.
+- Apr. 16,  08 H.Kurashige  (decay-V09-01-02)
 - fix a bug when shortlived particles has finite  pre-assigned proper time
+- Apr. 11,  08 P.Gumplinger (decay-V09-01-01)
+- modify G4DecayWithSpin::DecayIt to allow spin precession also for EM Fields;
+  e.g. fields that do "DoesFieldChangeEnergy()" but only if the B-field
+  component is > 0. (thanks to Kamil Sedlak, Toni Shiroka from PSI)
+- Dec. 15,  07 H.Kurashige (decay-V09-01-00)
+- add G4DecayProcessType
+- define process sub type
 - Oct. 29,  07 P.Gumplinger (decay-V09-00-02)

trunk/source/processes/decay/include/G4Decay.hh

-              r819
+              r961
 //
 //
 // $Id: G4Decay.hh,v 1.18 2007/07/23 23:13:04 kurasige Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Decay.hh,v 1.20 2008/09/19 03:19:53 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 #include "G4VRestDiscreteProcess.hh"
 #include "G4ParticleChangeForDecay.hh"
+#include "G4DecayProcessType.hh"
 class G4VExtDecayer;
 …
 inline
- void G4Decay::SetExtDecayer(G4VExtDecayer* val)
+{
-  pExtDecayer = val;
+}
-inline
  const G4VExtDecayer* G4Decay::GetExtDecayer() const
+{

trunk/source/processes/decay/include/G4UnknownDecay.hh

r819	r961
26	26	//
27	27	// $Id: G4UnknownDecay.hh,v 1.3 2006/06/29 19:30:56 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/decay/include/G4VExtDecayer.hh

r819	r961
26	26	//
27	27	// $Id: G4VExtDecayer.hh,v 1.4 2006/06/29 19:31:11 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/decay/src/G4Decay.cc

-              r819
+              r961
 //
 //
 // $Id: G4Decay.cc,v 1.27.2.1 2008/04/17 08:59:24 kurasige Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Decay.cc,v 1.30 2008/09/19 03:19:53 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
                                 pExtDecayer(0)
+{
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY));
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
 …
+  }
 #endif
   pParticleChange = &fParticleChangeForDecay;
+}
 …
     fRemainderLifeTime = pTime - track.GetProperTime();
     if (fRemainderLifeTime <= 0.0) fRemainderLifeTime = DBL_MIN;
     G4double  rvalue=0.0;
     // use pre-assigned Decay time to determine PIL
     if (aLife>0.0) {
       // ordinary particle
+      rvalue = (fRemainderLifeTime/aLife)*GetMeanFreePath(track, previousStepSize
+, condition);
+      rvalue = (fRemainderLifeTime/aLife)*GetMeanFreePath(track, previousStepSize, condition);
     } else {
      // shortlived particle
 …
+    }
     return rvalue;
+  }
+}
 …
   return fRemainderLifeTime;
+}
+void G4Decay::SetExtDecayer(G4VExtDecayer* val)
+{
+  pExtDecayer = val;
+  // set Process Sub Type
+  if ( pExtDecayer !=0 ) {
+    SetProcessSubType(static_cast<int>(DECAY_External));
+  }
+}

trunk/source/processes/decay/src/G4DecayWithSpin.cc

-              r819
+              r961
 //      History:
 //      17 August 2004  P. Gumplinger, T. MacPhail
+//      11 April  2008  Kamil Sedlak (PSI), Toni Shiroka (PSI)
 // ------------------------------------------------------------
 //
 …
 #include "G4Transform3D.hh"
+G4DecayWithSpin::G4DecayWithSpin(const G4String& processName):G4Decay(processName){}
+G4DecayWithSpin::G4DecayWithSpin(const G4String& processName):G4Decay(processName)
+{
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY_WithSpin));
+}
 G4DecayWithSpin::~G4DecayWithSpin(){}
 …
     if(fieldMgr)field = fieldMgr->GetDetectorField();
     if (field && !(fieldMgr->DoesFieldChangeEnergy())) {
+    if (field) {
        G4double point[4];
 …
        point[3] = aTrack.GetGlobalTime();
        G4double fieldValue[3];
+       G4double fieldValue[6];
        field -> GetFieldValue(point,fieldValue);
        G4ThreeVector B(fieldValue[0],fieldValue[1],fieldValue[2]);
+       parent_polarization = Spin_Precession(aStep,B,fRemainderLifeTime);
+       // Call the spin precession only for non-zero mag. field
+       if (B.mag2() > 0.) parent_polarization =
+                                 Spin_Precession(aStep,B,fRemainderLifeTime);
+    }

trunk/source/processes/decay/src/G4PionDecayMakeSpin.cc

-              r819
+              r961
 G4PionDecayMakeSpin::G4PionDecayMakeSpin(const G4String& processName)
+                               : G4Decay(processName) { }
+                               : G4Decay(processName)
+{
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY_PionMakeSpin));
+}
 G4PionDecayMakeSpin::~G4PionDecayMakeSpin() { }

trunk/source/processes/decay/src/G4UnknownDecay.cc

-              r819
+              r961
 //
 //
 // $Id: G4UnknownDecay.cc,v 1.5 2007/10/06 07:01:09 kurasige Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UnknownDecay.cc,v 1.6 2007/12/15 12:29:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 #include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForDecay.hh"
+#include "G4DecayProcessType.hh"
 // constructor
 …
                                 HighestValue(20.0)
+{
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY_Unknown));
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {

trunk/source/processes/electromagnetic/GNUmakefile

-              r819
+              r961
 # $Id: GNUmakefile,v 1.6 2006/09/21 21:35:20 vnivanch Exp $
+# $Id: GNUmakefile,v 1.7 2008/11/14 19:54:40 gcosmo Exp $
 # ------------------------------------------------------------------
 # GNUmakefile for electromagnetic library.  Gabriele Cosmo, 18/9/96.
 …
 name := G4electromagnetic
 SUBDIRS = muons standard utils xrays lowenergy highenergy polarisation
 SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy G4emhighenergy G4polar
+SUBDIRS = muons standard utils xrays lowenergy highenergy adjoint polarisation
+SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy G4emhighenergy G4emadjoint G4polar
 ifndef G4INSTALL

trunk/source/processes/electromagnetic/highenergy/GNUmakefile

-              r819
+              r961
 # $Id: GNUmakefile,v 1.3 2005/05/18 10:12:32 vnivanch Exp $
+# $Id: GNUmakefile,v 1.4 2008/03/06 11:47:10 vnivanch Exp $
 # --------------------------------------------------------------------
 # GNUmakefile for electromagnetic sub-library.  John Allison, 25/6/98.
 …
             -I$(G4BASE)/processes/electromagnetic/utils/include \
             -I$(G4BASE)/processes/electromagnetic/standard/include \
+            -I$(G4BASE)/processes/electromagnetic/muons/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/particles/bosons/include \

trunk/source/processes/electromagnetic/highenergy/History

-              r819
+              r961
 $Id: History,v 1.22 2007/11/13 18:36:29 vnivanch Exp $
+$Id: History,v 1.31 2009/02/20 16:38:33 vnivanch Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+February 09: V.Ivanchenko (emhighenergy-V09-02-00)
+- Cleanup: improved comments, move virtual methods from .hh to .cc
+October 08: V.Ivanchenko (emhighenergy-V09-01-06)
+- Updated processes enumeration and printout
+July 08:  V.Ivanchenko (emhighenergy-V09-01-05)
+- G4hBremsstrahlungModel, G4hPairProductionModel - do not use A in
+                          the CrossSectionPerAtom
+July 08:  V.Ivanchenko (emhighenergy-V09-01-04)
+- G4eeCrossSections - migrated to PDG 2006
+- G4eeToHadronsMultiModel - added main reaction channels for omega and
+                            phi resonances
+- New models: G4eeTo3PiModel, G4eeToPGammaModel, G4ee2KChargedModel,
+  G4ee2KNeutralModel
+July 08:  V.Ivanchenko (emhighenergy-V09-01-03)
+- G4GammaConversionToMuons - all exit() substituted by warnings
+April 08:  V.Ivanchenko (emhighenergy-V09-01-02)
+- G4hBremsstrahlungModel - remove static const
+March 08:  V.Ivanchenko (emhighenergy-V09-01-01)
+March 08:  V.Ivanchenko (emhighenergy-V09-01-00)
+- G4hBremsstrahlungModel, G4hBremsstrahlung, G4hPairProductionModel,
+  G4hPairProduction are added
+- SubType for all processes is initialized
 November 07:  V.Ivanchenko (emhighenergy-V09-00-01)

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

r819	r961
26	26	//
27	27	// $Id: G4AnnihiToMuPair.hh,v 1.2 2006/06/29 19:32:12 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// ------------ G4AnnihiToMuPair physics process ------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BetheBlochNoDeltaModel.hh,v 1.7 2006/06/29 19:32:14 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BetheBlochNoDeltaModel.hh,v 1.8 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
                                         G4double cutEnergy);
   virtual G4double ComputeCrossSectionPerElectron(
                                         const G4ParticleDefinition*,
                                         G4double kineticEnergy,
                                         G4double cutEnergy,
                                         G4double maxEnergy);
+  virtual G4double CrossSectionPerVolume(const G4Material*,
+                                         const G4ParticleDefinition*,
+                                         G4double kineticEnergy,
+                                         G4double cutEnergy,
+                                         G4double maxEnergy);
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4BetheBlochNoDeltaModel::ComputeDEDXPerVolume(
-                            const G4Material* material,
-                            const G4ParticleDefinition* pd,
-                            G4double kinEnergy, G4double)
+{
-  G4double dedx = G4BetheBlochModel::ComputeDEDXPerVolume(material, pd, kinEnergy, DBL_MAX);
-  return dedx;
+}
-inline G4double G4BetheBlochNoDeltaModel::ComputeCrossSectionPerElectron(
-                            const G4ParticleDefinition*,
-                            G4double, G4double, G4double)
+{
-  return 0.0;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggNoDeltaModel.hh,v 1.6 2006/06/29 19:32:16 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BraggNoDeltaModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
                                         G4double cutEnergy);
   virtual G4double ComputeCrossSectionPerElectron(
+  virtual G4double CrossSectionPerVolume(const G4Material*,
                                          const G4ParticleDefinition*,
                                          G4double kineticEnergy,
                                          G4double cutEnergy,
                                          G4double maxEnergy);
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4BraggNoDeltaModel::ComputeDEDXPerVolume(
-                            const G4Material* material,
-                            const G4ParticleDefinition* pd,
-                            G4double kinEnergy, G4double)
+{
-  G4double dedx = G4BraggIonModel::ComputeDEDXPerVolume(material, pd, kinEnergy, DBL_MAX);
-  return dedx;
+}
-inline G4double G4BraggNoDeltaModel::ComputeCrossSectionPerElectron(
-                            const G4ParticleDefinition*,
-                            G4double, G4double, G4double)
+{
-  return 0.0;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

r819	r961
26	26	//
27	27	// $Id: G4GammaConversionToMuons.hh,v 1.2 2006/06/29 19:32:18 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// ------------ G4GammaConversionToMuons physics process ------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4Vee2hadrons.hh,v 1.3 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4Vee2hadrons.hh,v 1.4 2008/07/10 18:06:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 public:
   G4Vee2hadrons() {};
+  G4Vee2hadrons() : lowEnergy(0.0), highEnergy(1.1*GeV) {};
   virtual ~G4Vee2hadrons() {};
 …
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                      G4double, const G4ThreeVector&) const = 0;
+                                 G4double, const G4ThreeVector&) = 0;
+  void SetLowEnergy(G4double val) {lowEnergy = val;};
+  G4double LowEnergy() const {return lowEnergy;};
+  void SetHighEnergy(G4double val) {highEnergy = val;};
+  G4double HighEnergy() const {return highEnergy;};
 private:
 …
   G4Vee2hadrons(const  G4Vee2hadrons&);
+  G4double lowEnergy;
+  G4double highEnergy;
 };

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeCrossSections.hh,v 1.2 2006/06/29 19:32:22 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeCrossSections.hh,v 1.3 2008/07/10 18:06:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   G4double CrossSection3pi(G4double);
+  G4double CrossSectionPi0G(G4double);
+  G4double CrossSectionEtaG(G4double);
   G4double CrossSection2Kcharged(G4double);
   G4double CrossSection2Kneutral(G4double);
+  std::complex<G4double> DpRho(G4double e);
 private:
 …
   G4double WidthPhi(G4double e);
-  std::complex<G4double> DpRho(G4double e);
   std::complex<G4double> DpOm(G4double e);
   std::complex<G4double> DpPhi(G4double e);
   // hide assignment operator

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadrons.hh,v 1.8 2007/05/23 08:50:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadrons.hh,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   // Print out of the class parameters
   void PrintInfo();
+  virtual void PrintInfo();
   // Set the factor to artificially increase the crossSection (default 1)
 …
 protected:
   void InitialiseProcess(const G4ParticleDefinition*);
+  virtual void InitialiseProcess(const G4ParticleDefinition*);
 private:
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4eeToHadrons::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Positron::Positron());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadronsModel.hh,v 1.6 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsModel.hh,v 1.7 2008/07/10 18:06:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 public:
   G4eeToHadronsModel(const G4Vee2hadrons*, G4int ver=0,
+  G4eeToHadronsModel(G4Vee2hadrons*, G4int ver=0,
                      const G4String& nam = "eeToHadrons");
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
-  G4double PeakEnergy() const;
   virtual G4double CrossSectionPerVolume(const G4Material*,
 …
   G4DynamicParticle* GenerateCMPhoton(G4double);
+  inline G4double PeakEnergy() const;
 private:
 …
   G4eeToHadronsModel(const  G4eeToHadronsModel&);
   const G4Vee2hadrons*  model;
+  G4Vee2hadrons*        model;
   G4ParticleDefinition* theGamma;
   G4PhysicsVector*      crossPerElectron;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToHadronsModel::CrossSectionPerVolume(
-                                      const G4Material* mat,
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double, G4double)
+{
-  return mat->GetElectronDensity()*
-    ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToHadronsModel::ComputeCrossSectionPerAtom(
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double Z, G4double,
-                                      G4double, G4double)
+{
-  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadronsMultiModel.hh,v 1.5 2007/05/23 08:50:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsMultiModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 class G4eeCrossSections;
+class G4Vee2hadrons;
 class G4eeToHadronsMultiModel : public G4VEmModel
 …
                                          G4double maxEnergy = DBL_MAX);
-  virtual G4double ComputeCrossSectionPerElectron(
-                                         const G4ParticleDefinition*,
-                                         G4double kineticEnergy,
-                                         G4double cutEnergy = 0.0,
-                                         G4double maxEnergy = DBL_MAX);
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
                                  const G4MaterialCutsCouple*,
 …
                                  G4double maxEnergy = DBL_MAX);
   void PrintInfo();
+  virtual void PrintInfo();
   // Set the factor to artificially increase the crossSection (default 1)
   void SetCrossSecFactor(G4double fac);
+  inline G4double ComputeCrossSectionPerElectron(
+                                         const G4ParticleDefinition*,
+                                         G4double kineticEnergy,
+                                         G4double cutEnergy = 0.0,
+                                         G4double maxEnergy = DBL_MAX);
 private:
+  void AddEEModel(G4Vee2hadrons*);
   // hide assignment operator
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToHadronsMultiModel::CrossSectionPerVolume(
-                                      const G4Material* mat,
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double, G4double)
+{
-  return mat->GetElectronDensity()*
-    ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToHadronsMultiModel::ComputeCrossSectionPerAtom(
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double Z, G4double,
-                                      G4double, G4double)
+{
-  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline G4double G4eeToHadronsMultiModel::ComputeCrossSectionPerElectron(
                                       const G4ParticleDefinition*,
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-void G4eeToHadronsMultiModel::SampleSecondaries(std::vector<G4DynamicParticle*>* newp,
-                                                const G4MaterialCutsCouple* couple,
-                                                const G4DynamicParticle* dp,
-                                                G4double, G4double)
+{
-  G4double kinEnergy = dp->GetKineticEnergy();
-  if (kinEnergy > thKineticEnergy) {
-    G4double q = cumSum[nModels-1]*G4UniformRand();
-    for(G4int i=0; i<nModels; i++) {
-      if(q <= cumSum[i]) {
-        (models[i])->SampleSecondaries(newp, couple,dp);
-        if(newp->size() > 0) fParticleChange->ProposeTrackStatus(fStopAndKill);
-        break;
+      }
+    }
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToTwoPiModel.hh,v 1.3 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToTwoPiModel.hh,v 1.5 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4eeToTwoPiModel();
   G4double ThresholdEnergy() const;
+  virtual G4double ThresholdEnergy() const;
   G4double PeakEnergy() const;
+  virtual G4double PeakEnergy() const;
   G4double ComputeCrossSection(G4double) const;
+  virtual G4double ComputeCrossSection(G4double) const;
   G4PhysicsVector* PhysicsVector(G4double, G4double) const;
+  virtual G4PhysicsVector* PhysicsVector(G4double, G4double) const;
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
               G4double, const G4ThreeVector&) const;
+              G4double, const G4ThreeVector&);
 private:
-  void Initialise();
   // hide assignment operator
 …
   G4double massPi;
   G4double massRho;
-  G4double highEnergy;
 };
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToTwoPiModel::ThresholdEnergy() const
+{
-  return 2.0*massPi;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToTwoPiModel::PeakEnergy() const
+{
-  return massRho;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eeToTwoPiModel::ComputeCrossSection(G4double e) const
+{
-  G4double ee = std::min(GeV,e);
-  return cross->CrossSection2pi(ee);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hhIonisation.hh,v 1.5 2007/05/23 08:50:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4hhIonisation.hh,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4hhIonisation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                             const G4Material*, G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                    const G4Material*, G4double cut);
   // Print out of the class parameters
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4hhIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 100.0*MeV &&
-         !p.IsShortLived());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4hhIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                const G4Material*,
-                                                G4double cut)
+{
-  G4double x = 0.5*cut/electron_mass_c2;
-  G4double y = electron_mass_c2/mass;
-  G4double g = x*y + std::sqrt((1. + x)*(1. + x*y*y));
-  return mass*(g - 1.0);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4mplIonisation.hh,v 1.5 2007/05/23 08:50:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4mplIonisation.hh,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4mplIonisation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   // Print out of the class parameters
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4mplIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetParticleName() == "monopole");
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4mplIonisationModel.hh,v 1.6 2007/11/13 18:36:29 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4mplIonisationModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4mplIonisationModel::SampleSecondaries(std::vector<G4DynamicParticle*>*,
-                                                    const G4MaterialCutsCouple*,
-                                                    const G4DynamicParticle*,
-                                                    G4double,
-                                                    G4double)
-{}
-inline G4double G4mplIonisationModel::Dispersion(
-                          const G4Material* material,
-                          const G4DynamicParticle* dp,
-                                G4double& tmax,
-                                G4double& length)
+{
-  G4double siga = 0.0;
-  G4double tau   = dp->GetKineticEnergy()/mass;
-  if(tau > 0.0) {
-    G4double electronDensity = material->GetElectronDensity();
-    G4double gam   = tau + 1.0;
-    G4double invbeta2 = (gam*gam)/(tau * (tau+2.0));
-    siga  = (invbeta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
-      * electronDensity * chargeSquare;
+  }
-  return siga;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 //
 //
 // $Id: G4AnnihiToMuPair.cc,v 1.3 2006/06/29 19:32:34 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4AnnihiToMuPair.cc,v 1.5 2008/10/16 14:29:48 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //         ------------ G4AnnihiToMuPair physics process ------
 …
  CrossSecFactor = 1.;
+ SetProcessSubType(6);
+}
 …
 void G4AnnihiToMuPair::PrintInfoDefinition()
+{
+  G4String comments ="e+e->mu+mu- annihilation, atomic e- at rest.\n";
+  G4cout << G4endl << GetProcessName() << ":  " << comments
+         << "        threshold at " << LowestEnergyLimit/GeV << " GeV"
+  G4String comments ="e+e->mu+mu- annihilation, atomic e- at rest, SubType=.";
+  G4cout << G4endl << GetProcessName() << ":  " << comments
+         << GetProcessSubType() << G4endl;
+  G4cout << "        threshold at " << LowestEnergyLimit/GeV << " GeV"
          << " good description up to "
          << HighestEnergyLimit/TeV << " TeV for all Z." << G4endl;

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BetheBlochNoDeltaModel.cc,v 1.3 2006/06/29 19:32:36 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BetheBlochNoDeltaModel.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4BetheBlochNoDeltaModel::~G4BetheBlochNoDeltaModel()
 {}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BetheBlochNoDeltaModel::ComputeDEDXPerVolume(
+                            const G4Material* material,
+                            const G4ParticleDefinition* pd,
+                            G4double kinEnergy, G4double)
+{
+  return
+    G4BetheBlochModel::ComputeDEDXPerVolume(material, pd, kinEnergy, DBL_MAX);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BetheBlochNoDeltaModel::CrossSectionPerVolume(
+                    const G4Material*,const G4ParticleDefinition*,
+                    G4double, G4double, G4double)
+{
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggNoDeltaModel.cc,v 1.3 2006/06/29 19:32:38 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BraggNoDeltaModel.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4BraggNoDeltaModel::G4BraggNoDeltaModel(const G4ParticleDefinition*p,
                                          const G4String& nam) :
   G4BraggIonModel(p, nam)
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4BraggNoDeltaModel::~G4BraggNoDeltaModel()
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BraggNoDeltaModel::ComputeDEDXPerVolume(
+                            const G4Material* material,
+                            const G4ParticleDefinition* pd,
+                            G4double kinEnergy, G4double)
+{
+  return
+    G4BraggIonModel::ComputeDEDXPerVolume(material, pd, kinEnergy, DBL_MAX);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BraggNoDeltaModel::CrossSectionPerVolume(
+                            const G4Material*,
+                            const G4ParticleDefinition*,
+                            G4double, G4double, G4double)
+{
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 //
 //
 // $Id: G4GammaConversionToMuons.cc,v 1.4 2006/06/29 19:32:40 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4GammaConversionToMuons.cc,v 1.7 2008/10/16 14:29:48 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //         ------------ G4GammaConversionToMuons physics process ------
 …
     HighestEnergyLimit(1e21*eV), // ok to 1e21eV=1e12GeV, then LPM suppression
     CrossSecFactor(1.)
+{ }
+{
+  SetProcessSubType(15);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 …
     G4double xxp=1.-4./3.*xPM; // the main xPlus dependence
     result=xxp*log(W)*LogWmaxInv;
     if(result>1.)
     { G4cout << "error in dSigxPlusGen, result=" << result << " is >1" << '\n';
       exit(10);
+    if(result>1.) {
+      G4cout << "G4GammaConversionToMuons::PostStepDoIt WARNING:"
+             << " in dSigxPlusGen, result=" << result << " > 1" << G4endl;
+    }
+  }
 …
       f1=(1.-2.*xPM+4.*xPM*t*(1.-t)) / (1.+C1/(t*t));
       if(f1<0 || f1> f1_max) // should never happend
+      { G4cout << "outside allowed range f1=" << f1 << G4endl;
+        exit(1);
+      }
+        {
+          G4cout << "G4GammaConversionToMuons::PostStepDoIt WARNING:"
+                 << "outside allowed range f1=" << f1 << " is set to zero"
+                 << G4endl;
+          f1 = 0.0;
+        }
+    }
     while ( G4UniformRand()*f1_max > f1);
 …
       f2=1.-2.*xPM+4.*xPM*t*(1.-t)*(1.+cos(2.*psi));
       if(f2<0 || f2> f2_max) // should never happend
+      { G4cout << "outside allowed range f2=" << f2 << G4endl;
+        exit(1);
+      }
+        {
+          G4cout << "G4GammaConversionToMuons::PostStepDoIt WARNING:"
+                 << "outside allowed range f2=" << f2 << " is set to zero"
+                 << G4endl;
+          f2 = 0.0;
+        }
+    }
     while ( G4UniformRand()*f2_max > f2);
 …
 void G4GammaConversionToMuons::PrintInfoDefinition()
+{
   G4String comments ="gamma->mu+mu- Bethe Heitler process.\n";
+  G4String comments ="gamma->mu+mu- Bethe Heitler process, SubType= ";
   G4cout << G4endl << GetProcessName() << ":  " << comments
+         << "        good cross section parametrization from "
+         << GetProcessSubType() << G4endl;
+  G4cout << "        good cross section parametrization from "
          << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << HighestEnergyLimit/GeV << " GeV for all Z." << G4endl;

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeCrossSections.cc,v 1.6 2006/06/29 19:32:42 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeCrossSections.cc,v 1.7 2008/07/10 18:06:39 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //
 // Modifications:
 //
+// 10.07.2008 Updated for PDG Jour. Physics, G33, 1 (2006)
 //
 // -------------------------------------------------------------------
 …
 #include "G4PionMinus.hh"
 #include "G4PionZero.hh"
+#include "G4Eta.hh"
 #include "G4KaonPlus.hh"
 #include "G4KaonMinus.hh"
 …
   MsPi = G4PionPlus::PionPlus()->GetPDGMass();
   MsPi0= G4PionZero::PionZero()->GetPDGMass();
   MsEta= 547.30*MeV;
+  MsEta= G4Eta::Eta()->GetPDGMass();
   MsEtap=957.78*MeV;
   MsKs = G4KaonZeroLong::KaonZeroLong()->GetPDGMass();
   MsKc=G4KaonPlus::KaonPlus()->GetPDGMass();
   MsRho= 770.0*MeV;
   MsOm = 781.94*MeV;
+  MsKc = G4KaonPlus::KaonPlus()->GetPDGMass();
+  MsRho= 775.5*MeV;
+  MsOm = 782.62*MeV;
   MsF0 = 980.0*MeV;
   MsA0 = 983.4*MeV;
   MsPhi= 1019.413*MeV;
+  MsA0 = 984.7*MeV;
+  MsPhi= 1019.46*MeV;
   MsK892 = 891.66*MeV;
   MsK0892 = 896.10*MeV;
   GRho = 150.7*MeV;
   GOm = 8.41*MeV;
   GPhi = 4.43*MeV;
+  MsK0892 = 896.0*MeV;
+  GRho = 149.4*MeV;
+  GOm = 8.49*MeV;
+  GPhi = 4.26*MeV;
   GK892 = 50.8*MeV;
   GK0892 = 50.5*MeV;
+  GK0892 = 50.3*MeV;
   PhRho = 0.0;
   PhOm = 0.0;
 …
   BrRhoPiG = 4.5e-4;
   BrRhoPi0G= 6.8e-4;
   BrRhoEtaG= 2.4e-4;
   BrRhoEe = 4.49e-5;
   BrOm3Pi = 0.888;
   BrOmPi0G= 0.085;
   BrOmEtaG= 6.5e-4;
   BrOm2Pi = 0.0221;
+  BrRhoEtaG= 2.95e-4;
+  BrRhoEe = 4.7e-5;
+  BrOm3Pi = 0.891;
+  BrOmPi0G= 0.089;
+  BrOmEtaG= 4.9e-4;
+  BrOm2Pi = 0.017;
   PhOm2Pi = 90.0;
   BrOmEe = 7.07e-5;
   BrPhi2Kc = 0.491;
   BrPhiKsKl= 0.341;
   BrPhi3Pi = 0.155;
   BrPhiPi0G= 1.31e-3;
   BrPhiEtaG= 1.26e-2;
   BrPhi2Pi = 8.e-5;
+  BrOmEe = 7.18e-5;
+  BrPhi2Kc = 0.492;
+  BrPhiKsKl= 0.34;
+  BrPhi3Pi = 0.153;
+  BrPhiPi0G= 1.25e-3;
+  BrPhiEtaG= 1.301e-2;
+  BrPhi2Pi = 7.3e-5;
   PhPhi2Pi = -20.0*degree;
   BrPhiEe = 2.99e-4;
+  BrPhiEe = 2.97e-4;
   MsRho3 = MsRho*MsRho*MsRho;
 …
   MeVnb = 3.8938e+11*nanobarn;
   Alpha = 1.0/137.036;
+  Alpha = fine_structure_const;
   AOmRho = 3.0;
 …
   brsigpipi = 1.;
   msrho1450 = 1465.*MeV;
   msrho1700 = 1700.*MeV;
   grho1450 = 310.*MeV;
   grho1700 = 240.*MeV;
+  msrho1450 = 1459.*MeV;
+  msrho1700 = 1688.8*MeV;
+  grho1450 = 171.*MeV;
+  grho1700 = 161.*MeV;
   arhoompi0 = 1.;
   arho1450ompi0 = 1.;
 …
 G4double G4eeCrossSections::CrossSection2pi(G4double e)
+{
+{
   complex<G4double> xr(cos(PhRho),sin(PhRho));
   complex<G4double> xo(cos(PhOm2Pi),sin(PhOm2Pi));
 …
     + sqrt(Width2p(s,MsOm,GOm,BrOm2Pi,MsPi)*MsOm3*BrOmEe*GOm)*xo/dom
     + sqrt(Width2p(s,MsPhi,GPhi,BrPhi2Pi,MsPi)*MsPhi3*BrPhiEe*GPhi)*xf/dphi;
+  G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeCrossSections::CrossSection3pi(G4double e)
+{
+  complex<G4double> xf(cos(PhPhi2Pi),sin(PhPhi));
+  G4double s = e*e;
+  complex<G4double> dom  = DpOm(e);
+  complex<G4double> dphi = DpPhi(e);
+  complex<G4double> amp =
+    sqrt(Width3p(s,MsOm,GOm,BrOm3Pi)*MsOm3*BrOmEe*GOm)/dom
+    + sqrt(Width3p(s,MsPhi,GPhi,BrPhi3Pi)*MsPhi3*BrPhiEe*GPhi)*xf/dphi;
+  G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeCrossSections::CrossSectionPi0G(G4double e)
+{
+  complex<G4double> xf(cos(PhPhi),sin(PhPhi));
+  G4double s = e*e;
+  complex<G4double> drho = DpRho(e);
+  complex<G4double> dom  = DpOm(e);
+  complex<G4double> dphi = DpPhi(e);
+  complex<G4double> amp =
+      sqrt(WidthPg(s,MsRho,GRho,BrRhoPi0G,MsPi0)*MsRho3*BrRhoEe*GRho)/drho
+    + sqrt(WidthPg(s,MsOm,GOm,BrOmPi0G,MsPi0)*MsOm3*BrOmEe*GOm)/dom
+    + sqrt(WidthPg(s,MsPhi,GPhi,BrPhiPi0G,MsPi0)*MsPhi3*BrPhiEe*GPhi)*xf/dphi;
+  G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeCrossSections::CrossSectionEtaG(G4double e)
+{
+  complex<G4double> xf(cos(PhPhi),sin(PhPhi));
+  G4double s = e*e;
+  complex<G4double> drho = DpRho(e);
+  complex<G4double> dom  = DpOm(e);
+  complex<G4double> dphi = DpPhi(e);
+  complex<G4double> amp =
+      sqrt(WidthPg(s,MsRho,GRho,BrRhoEtaG,MsEta)*MsRho3*BrRhoEe*GRho)/drho
+    + sqrt(WidthPg(s,MsOm,GOm,BrOmEtaG,MsEta)*MsOm3*BrOmEe*GOm)/dom
+    + sqrt(WidthPg(s,MsPhi,GPhi,BrPhiEtaG,MsEta)*MsPhi3*BrPhiEe*GPhi)*xf/dphi;
+  G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeCrossSections::CrossSection2Kcharged(G4double e)
+{
+  G4double s = e*e;
+  complex<G4double> dphi = DpPhi(e);
+  complex<G4double> amp =
+    sqrt(Width2p(s,MsPhi,GPhi,BrPhi2Kc,MsKc)*MsPhi3*BrPhiEe*GPhi)/dphi;
+  G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeCrossSections::CrossSection2Kneutral(G4double e)
+{
+  G4double s = e*e;
+  complex<G4double> dphi = DpPhi(e);
+  complex<G4double> amp =
+    sqrt(Width2p(s,MsPhi,GPhi,BrPhiKsKl,MsKs)*MsPhi3*BrPhiEe*GPhi)/dphi;
   G4double cross = 12.0*pi*MeVnb*norm(amp)/(e*s);
 …
 G4double G4eeCrossSections::PhaseSpace3p(G4double e)
+{
+  //     E.A.Kuraev, Z.K.Silagadze.
+  //  Once more about the omega->3 pi contact term.
+  //  Yadernaya Phisica, 1995, V58, N9, p.1678-1694.
   //  G4bool b;
   //  G4double x = ph3p->GetValue(e, b);

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadrons.cc,v 1.7 2006/06/29 19:32:44 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadrons.cc,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
     isInitialised(false)
+{
+    SetVerboseLevel(1);
+  SetVerboseLevel(1);
+  SetProcessSubType(fAnnihilationToHadrons);
+}
 …
 G4eeToHadrons::~G4eeToHadrons()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4eeToHadrons::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Positron::Positron());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadronsModel.cc,v 1.8 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsModel.cc,v 1.9 2008/07/10 18:06:39 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 using namespace std;
+G4eeToHadronsModel::G4eeToHadronsModel(const G4Vee2hadrons* m,
+                                             G4int ver,
+G4eeToHadronsModel::G4eeToHadronsModel(G4Vee2hadrons* m, G4int ver,
                                        const G4String& nam)
   : G4VEmModel(nam),
   model(m),
   crossPerElectron(0),
   crossBornPerElectron(0),
   isInitialised(false),
   nbins(100),
   verbose(ver)
+{
   theGamma      = G4Gamma::Gamma();
+    model(m),
+    crossPerElectron(0),
+    crossBornPerElectron(0),
+    isInitialised(false),
+    nbins(100),
+    verbose(ver)
+{
+  theGamma = G4Gamma::Gamma();
+}
 …
   isInitialised  = true;
+  // Lab system
   highKinEnergy = HighEnergyLimit();
   lowKinEnergy  = LowEnergyLimit();
+  emin  = model->ThresholdEnergy();
+  emax = 2.0*electron_mass_c2*sqrt(1.0 + 0.5*highKinEnergy/electron_mass_c2);
+  if(emin > emax) emin = emax;
+  lowKinEnergy  = 0.5*emin*emin/electron_mass_c2 - 2.0*electron_mass_c2;
+  epeak = min(model->PeakEnergy(), emax);
+  // CM system
+  emin  = model->LowEnergy();
+  emax  = model->HighEnergy();
+  G4double emin0 =
+.0*electron_mass_c2*sqrt(1.0 + 0.5*lowKinEnergy/electron_mass_c2);
+  G4double emax0 =
+.0*electron_mass_c2*sqrt(1.0 + 0.5*highKinEnergy/electron_mass_c2);
+  // recompute low energy
+  if(emin0 > emax) {
+    emin0 = emax;
+    model->SetLowEnergy(emin0);
+  }
+  if(emin > emin0) {
+    emin0 = emin;
+    lowKinEnergy  = 0.5*emin*emin/electron_mass_c2 - 2.0*electron_mass_c2;
+    SetLowEnergyLimit(lowKinEnergy);
+  }
+  // recompute high energy
+  if(emax < emax0) {
+    emax0 = emax;
+    highKinEnergy = 0.5*emax*emax/electron_mass_c2 - 2.0*electron_mass_c2;
+    SetHighEnergyLimit(highKinEnergy);
+  }
+  // peak energy
+  epeak = std::min(model->PeakEnergy(), emax);
   peakKinEnergy  = 0.5*epeak*epeak/electron_mass_c2 - 2.0*electron_mass_c2;
 …
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToHadronsModel::CrossSectionPerVolume(
+                                      const G4Material* mat,
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double, G4double)
+{
+  return mat->GetElectronDensity()*
+    ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToHadronsModel::ComputeCrossSectionPerAtom(
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double Z, G4double,
+                                      G4double, G4double)
+{
+  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
+}

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToHadronsMultiModel.cc,v 1.4 2007/05/23 08:50:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsMultiModel.cc,v 1.6 2008/07/11 17:49:11 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // File name:     G4eeToHadronsMultiModel
 //
 // Author:        Vladimir Ivanchenko on base of Michel Maire code
+// Author:        Vladimir Ivanchenko
 //
 // Creation date: 02.08.2004
 …
 #include "G4eeToHadronsMultiModel.hh"
 #include "G4eeToTwoPiModel.hh"
+#include "G4eeTo3PiModel.hh"
+#include "G4eeToPGammaModel.hh"
+#include "G4ee2KNeutralModel.hh"
+#include "G4ee2KChargedModel.hh"
 #include "G4eeCrossSections.hh"
+#include "G4Vee2hadrons.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4eeToHadronsMultiModel::Initialise(const G4ParticleDefinition* p, const G4DataVector& v)
+void G4eeToHadronsMultiModel::Initialise(const G4ParticleDefinition*,
+                                         const G4DataVector&)
+{
   if(!isInitialised) {
     isInitialised = true;
     thKineticEnergy = DBL_MAX;
     maxKineticEnergy = HighEnergyLimit();
+    thKineticEnergy  = DBL_MAX;
+    maxKineticEnergy = 1.2*GeV;
     cross = new G4eeCrossSections();
+    G4eeToHadronsModel* model =
+      new G4eeToHadronsModel(new G4eeToTwoPiModel(cross), verbose);
+    models.push_back(model);
+    model->SetHighEnergyLimit(maxKineticEnergy);
+    model->Initialise(p, v);
+    G4double emin = model->LowEnergyLimit();
+    if(emin < thKineticEnergy) thKineticEnergy = emin;
+    ekinMin.push_back(emin);
+    ekinMax.push_back(model->HighEnergyLimit());
+    ekinPeak.push_back(model->PeakEnergy());
+    cumSum.push_back(0.0);
+    nModels = 1;
+    if(pParticleChange)
+    G4eeToTwoPiModel* m2pi = new G4eeToTwoPiModel(cross);
+    m2pi->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(m2pi);
+    G4eeTo3PiModel* m3pi1 = new G4eeTo3PiModel(cross);
+    m3pi1->SetHighEnergy(0.95*GeV);
+    AddEEModel(m3pi1);
+    G4eeTo3PiModel* m3pi2 = new G4eeTo3PiModel(cross);
+    m3pi2->SetLowEnergy(0.95*GeV);
+    m3pi2->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(m3pi2);
+    G4ee2KChargedModel* m2kc = new G4ee2KChargedModel(cross);
+    m2kc->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(m2kc);
+    G4ee2KNeutralModel* m2kn = new G4ee2KNeutralModel(cross);
+    m2kn->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(m2kn);
+    G4eeToPGammaModel* mpg1 = new G4eeToPGammaModel(cross,"pi0");
+    mpg1->SetLowEnergy(0.7*GeV);
+    mpg1->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(mpg1);
+    G4eeToPGammaModel* mpg2 = new G4eeToPGammaModel(cross,"eta");
+    mpg2->SetLowEnergy(0.7*GeV);
+    mpg2->SetHighEnergy(maxKineticEnergy);
+    AddEEModel(mpg2);
+    nModels = models.size();
+    if(pParticleChange) {
       fParticleChange =
         reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
     else
+    } else {
       fParticleChange = new G4ParticleChangeForGamma();
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4eeToHadronsMultiModel::AddEEModel(G4Vee2hadrons* mod)
+{
+  G4eeToHadronsModel* model = new G4eeToHadronsModel(mod, verbose);
+  model->SetLowEnergyLimit(LowEnergyLimit());
+  model->SetHighEnergyLimit(HighEnergyLimit());
+  models.push_back(model);
+  G4double elow = mod->ThresholdEnergy();
+  ekinMin.push_back(elow);
+  if(thKineticEnergy > elow) thKineticEnergy = elow;
+  ekinMax.push_back(mod->HighEnergy());
+  ekinPeak.push_back(mod->PeakEnergy());
+  cumSum.push_back(0.0);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToHadronsMultiModel::CrossSectionPerVolume(
+                                      const G4Material* mat,
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double, G4double)
+{
+  return mat->GetElectronDensity()*
+    ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToHadronsMultiModel::ComputeCrossSectionPerAtom(
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double Z, G4double,
+                                      G4double, G4double)
+{
+  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4eeToHadronsMultiModel::SampleSecondaries(std::vector<G4DynamicParticle*>* newp,
+                                                const G4MaterialCutsCouple* couple,
+                                                const G4DynamicParticle* dp,
+                                                G4double, G4double)
+{
+  G4double kinEnergy = dp->GetKineticEnergy();
+  if (kinEnergy > thKineticEnergy) {
+    G4double q = cumSum[nModels-1]*G4UniformRand();
+    for(G4int i=0; i<nModels; i++) {
+      if(q <= cumSum[i]) {
+        (models[i])->SampleSecondaries(newp, couple,dp);
+        if(newp->size() > 0) fParticleChange->ProposeTrackStatus(fStopAndKill);
+        break;
+      }
+    }
+  }
+}
 …
+{
   if(verbose > 0) {
+    G4cout << "      e+ annihilation into hadrons active above "
+           << thKineticEnergy/GeV << " GeV"
+    G4double e1 = 0.5*thKineticEnergy*thKineticEnergy/electron_mass_c2
+      - 2.0*electron_mass_c2;
+    G4double e2 = 0.5*maxKineticEnergy*maxKineticEnergy/electron_mass_c2
+      - 2.0*electron_mass_c2;
+    G4cout << "      e+ annihilation into hadrons active from "
+           << e1/GeV << " GeV to " << e2/GeV << " GeV"
            << G4endl;
+  }
 …
     csFactor = fac;
     if(verbose > 0)
       G4cout << "### G4eeToHadronsMultiModel: The cross section for G4eeToHadronsMultiModel is  "
              << "increased by the Factor= " << csFactor << G4endl;
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+      G4cout << "### G4eeToHadronsMultiModel: The cross section for G4eeToHadronsMultiModel "
+             << " is increased by the Factor= " << csFactor << G4endl;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eeToTwoPiModel.cc,v 1.5 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eeToTwoPiModel.cc,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   cross(cr)
+{
+  Initialise();
+  massPi = G4PionPlus::PionPlus()->GetPDGMass();
+  massRho = 775.5*MeV;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4eeToTwoPiModel::Initialise()
+G4double G4eeToTwoPiModel::ThresholdEnergy() const
+{
+  massPi = G4PionPlus::PionPlus()->GetPDGMass();
+  massRho = 770.*MeV;
+  highEnergy = 1.*GeV;
+  cross = new G4eeCrossSections();
+  return 2.0*massPi;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToTwoPiModel::PeakEnergy() const
+{
+  return massRho;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eeToTwoPiModel::ComputeCrossSection(G4double e) const
+{
+  G4double ee = std::min(HighEnergy(),e);
+  return cross->CrossSection2pi(ee);
+}
 …
                                                  G4double emax) const
+{
   G4double tmin = max(emin, 2.0*massPi);
   G4double tmax = max(tmin, emax);
+  G4double tmin = std::max(emin, 2.0*massPi);
+  G4double tmax = std::max(tmin, emax);
   G4int nbins = (G4int)((tmax - tmin)/(5.*MeV));
   G4PhysicsVector* v = new G4PhysicsLinearVector(emin,emax,nbins);
+  v->SetSpline(true);
   return v;
+}
 …
 void G4eeToTwoPiModel::SampleSecondaries(std::vector<G4DynamicParticle*>* newp,
             G4double e, const G4ThreeVector& direction) const
+            G4double e, const G4ThreeVector& direction)
+{
 …
   dir.rotateUz(direction);
   // create G4DynamicParticle object for delta ray
+  // create G4DynamicParticle objects
   G4DynamicParticle* pip =
      new G4DynamicParticle(G4PionPlus::PionPlus(),dir,tkin);

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hhIonisation.cc,v 1.6 2007/05/22 17:37:30 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hhIonisation.cc,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
     isInitialised(false)
+{
-  minKinEnergy = 0.1*keV;
-  maxKinEnergy = 100.*TeV;
-  SetDEDXBinning(120);
-  SetMinKinEnergy(minKinEnergy);
-  SetMaxKinEnergy(maxKinEnergy);
   SetStepFunction(0.1, 0.1*mm);
   SetVerboseLevel(1);
+  SetProcessSubType(fIonisation);
   mass = 0.0;
   ratio = 0.0;
 …
 G4hhIonisation::~G4hhIonisation()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4hhIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 100.0*MeV &&
+         !p.IsShortLived());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4hhIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                          const G4Material*,
+                                          G4double cut)
+{
+  G4double x = 0.5*cut/electron_mass_c2;
+  G4double y = electron_mass_c2/mass;
+  G4double g = x*y + std::sqrt((1. + x)*(1. + x*y*y));
+  return mass*(g - 1.0);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   G4int nm = 1;
+  minKinEnergy = MinKinEnergy();
   if(eth > minKinEnergy) {
     G4VEmModel* em = new G4BraggNoDeltaModel();
 …
+  }
   if(eth < maxKinEnergy) {
+  if(eth < MaxKinEnergy()) {
     G4VEmModel* em1 = new G4BetheBlochNoDeltaModel();
     em1->SetLowEnergyLimit(std::max(eth,minKinEnergy));
     em1->SetHighEnergyLimit(maxKinEnergy);
+    em1->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(nm, em1, flucModel);
+  }
   if(verboseLevel>0)
+  if(verboseLevel>1) {
     G4cout << "G4hhIonisation is initialised: Nmodels= " << nm << G4endl;
+  }
   isInitialised = true;
+}
 …
+{
   G4cout << "      Delta-ray will not be produced; "
-         << "Bether-Bloch model for E > " << std::max(eth,minKinEnergy)
          << G4endl;
-  if(eth > minKinEnergy) G4cout
-         << "      ICRU49 parametrisation scaled from protons below.";
-  G4cout << G4endl;
+}

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4mplIonisation.cc,v 1.5 2007/05/31 11:13:31 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4mplIonisation.cc,v 1.8 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   SetVerboseLevel(0);
+  SetProcessSubType(fIonisation);
+  SetStepFunction(0.2, 1*mm);
+}
 …
 G4mplIonisation::~G4mplIonisation()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4mplIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetParticleName() == "monopole");
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   G4mplIonisationModel* ion  = new G4mplIonisationModel(magneticCharge,"PAI");
   ion->SetLowEnergyLimit(0.1*keV);
   ion->SetHighEnergyLimit(100.*TeV);
+  ion->SetLowEnergyLimit(MinKinEnergy());
+  ion->SetHighEnergyLimit(MaxKinEnergy());
   AddEmModel(0,ion,ion);
-  SetStepFunction(0.2, 1*mm);
   isInitialised = true;

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4mplIonisationModel.cc,v 1.5 2007/11/13 18:36:29 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4mplIonisationModel.cc,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4mplIonisationModel::ComputeDEDXAhlen(const G4Material* material, G4double bg2)
+G4double G4mplIonisationModel::ComputeDEDXAhlen(const G4Material* material,
+                                                G4double bg2)
+{
   G4double eDensity = material->GetElectronDensity();
 …
   return dedx;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4mplIonisationModel::SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                                             const G4MaterialCutsCouple*,
+                                             const G4DynamicParticle*,
+                                             G4double,
+                                             G4double)
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   return loss;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4mplIonisationModel::Dispersion(const G4Material* material,
+                                          const G4DynamicParticle* dp,
+                                          G4double& tmax,
+                                          G4double& length)
+{
+  G4double siga = 0.0;
+  G4double tau   = dp->GetKineticEnergy()/mass;
+  if(tau > 0.0) {
+    G4double electronDensity = material->GetElectronDensity();
+    G4double gam   = tau + 1.0;
+    G4double invbeta2 = (gam*gam)/(tau * (tau+2.0));
+    siga  = (invbeta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
+      * electronDensity * chargeSquare;
+  }
+  return siga;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/lowenergy/GNUmakefile

-              r819
+              r961
 # $Id: GNUmakefile,v 1.5 2003/09/20 14:41:31 vnivanch Exp $
+# $Id: GNUmakefile,v 1.7 2008/11/20 12:06:28 alechner Exp $
 # --------------------------------------------------------------------
 # GNUmakefile for electromagnetic sub-library.  John Allison, 25/6/98.
 …
 CPPFLAGS += -I$(G4BASE)/global/management/include \
             -I$(G4BASE)/global/HEPRandom/include \
+            -I$(G4BASE)/global/HEPNumerics/include \
             -I$(G4BASE)/global/HEPGeometry/include \
             -I$(G4BASE)/geometry/management/include \
 …
             -I$(G4BASE)/processes/cuts/include \
             -I$(G4BASE)/processes/electromagnetic/utils/include \
+            -I$(G4BASE)/processes/electromagnetic/standard/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/particles/bosons/include \

trunk/source/processes/electromagnetic/lowenergy/History

-              r819
+              r961
 $Id: History,v 1.284 2007/11/26 17:27:09 pia Exp $
+$Id: History,v 1.346 2009/02/20 10:49:54 sincerti Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+.02.2009, S. Incerti, tag emlowen-V09-02-15
+            - added protections against FPE in G4hLowEnergyLoss.cc (see EM forum
+              item 893)
+.02.2009, S. Incerti, tag emlowen-V09-02-14
+            - removed compilation warning in G4DNAEmfietzoglouExcitationModel.cc
+.02.2009, S. Incerti, tag emlowen-V09-02-13
+            - improved energy limit display in Geant4-DNA model classes
+            - commented InitialiseElementSelectors call.
+.02.2009, S. Incerti, tag emlowen-V09-02-12
+            Made compatible with tag emutils-V09-02-00 the following files
+            - G4DNAElastic.cc
+            - G4DNAExcitation.cc
+            - G4DNAIonisation.cc
+            - G4DNAChargeDecrease.cc
+            - G4DNAChargeIncrease.cc
+.02.2009, S. Incerti, tag emlowen-V09-02-11
+            Added several corrections to migrated Geant4-DNA processes:
+            - G4DNABornIonisationModel.cc
+            - G4DNAEmfietzoglouExcitationModel.cc
+            - G4DNARuddIonisationModel.cc
+            - G4DNAIonisation.hh
+.02.2009, L. Pandola, tag emlowen-V09-02-10
+            - Added G4LivermoreIonisationModel, namely first implementation of
+              LowEnergyIonisation in the new design
+.01.2009, L. Pandola, tag emlowen-V09-02-09
+            - Updated public interface of G4eIonisationCrossSectionHandler.cc in order to
+              facilitate the migration from G4LowEnergyIonisation to G4LivermoreIonisationModel
+.01.2009, S. Incerti, tag emlowen-V09-02-08
+            - Fixed compilation error problem & code syntax in DNA model classes
+.01.2009, S. Incerti, tag emlowen-V09-02-07
+            - Updated Livermore photon processes classes for handling of compound materials
+            - Added pointer removal protections
+            - Involved classes are :
+              G4LivermoreRayleighModel.cc
+              G4LivermorePolarizedRayleighModel.cc
+              G4LivermorePolarizedComptonModel.cc
+              G4LivermorePhotoElectricModel.cc
+              G4LivermoreGammaconversionModel.cc
+              G4LivermoreComptonModel.cc
+.01.2009, S. Incerti, tag emlowen-V09-02-06
+            Added 'kill particle without total energy deposit' feature for DNA charge change processes
+            Involved files are :
+            - G4DNAProcess.icc,
+            - G4FinalStateProduct.hh,.cc,
+            - G4FinalStateChargeDecrease.cc
+            - G4FinalStateChargeIncrease.cc
+.01.2009, S. Incerti, tag emlowen-V09-02-05
+            - Corrected energy limits in G4CrossSectionIonisationBornPartial.cc
+            - Added proton case in G4CrossSectionExcitationMillerGreenPartial.cc
+            - Added protection (waterExcitation.ExcitationEnergy) in G4CrossSectionExcitationMillerGreenPartial.cc
+.01.2009, S. Incerti, tag emlowen-V09-02-04
+            Added angle initialisation in G4DNAScreenedRutherfordElasticModel
+.01.2009, S. Incerti, tag emlowen-V09-02-03
+            Added preliminary migrated Geant4-DNA processes and models.
+.01.2009  L. Pandola, tag emlowen-V09-02-02
+            Edited G4PenelopePhotoElectric.cc and G4PenelopePhotoElectricModel.cc
+            to suppress a warning message from G4AtomicTransitionManager appearing
+            for some elements (Oxygen ,Fluorine). This is due to the fact that
+            Penelope and G4AtomicTransitionManager databases may contain a different number
+            of shells. Physics results are unchanged.
+.12.2008  L. Pandola, tag emlowen-V09-02-01
+            Added G4RayleighScattering process (G4VEmProcess) to
+            describe Rayleigh scattering. This was not available within
+            the Std package
+.12.2008  L. Pandola, tag emlowen-V09-02-00
+            Same as the previous one (emlowen-V09-01-46). I arrived too late.
+.12.2008  L. Pandola, tag emlowen-V09-01-46
+            Added G4PenelopeBremsstrahlungModel, namely bremsstrahlung according to Penelope
+            model, migrated to the Std-design (inheriting from G4VEmModel). A few minor
+            cleaning of G4PenelopeBremsstrahlungContinuous.cc and G4PenelopeIonisation.cc.
+            From this tag, ALL Penelope processes have been migrated.
+.12.2008   S. Incerti, tag emlowen-V09-01-45
+             Upgrade to G4LogLogInterpolation_revision1c.cc
+.12.2008  S. Incerti, tag emlowen-V09-01-44
+            Added protection to G4FinalStateElasticChampion.cc for angular treatment of XS
+            at 180*deg
+.12.2008   S. Incerti, tag emlowen-V09-01-43
+             Contains G4PenelopeBremsstrahlungContinuous.hh/.cc from Luciano
+             Contains G4LogLogInterpolation_revision1b.cc
+.12.2008   S. Incerti, tag emlowen-V09-01-42
+             Upgrade to G4LogLogInterpolation_revision1b.cc
+.12.2008   S. Incerti, tag emlowen-V09-01-41
+             Return to original G4LogLogInterpolation.cc/.hh class
+             from tag emlowen-V09-01-20
+.12.2008   S. Incerti, tag emlowen-V09-01-40
+             Added protection in G4LogLogInterpolation.cc class
+             against null energy and cross section values
+.12.2008   S. Incerti, tag emlowen-V09-01-39
+             Added vector initialization and EOF protection in G4FinalStateElasticChampion.cc
+             Added EOF protection in G4FinalStateIonisationBorn.cc
+.12.2008   S. Incerti, tag emlowen-V09-01-38
+             Updated G4LogLogInterpolation class (hh and cc) provided by
+             Nicolas Karakatsanis (updated revision 1)
+.12.2008   S. Incerti, tag emlowen-V09-01-37
+             Updated G4LogLogInterpolation class (hh and cc) provided by
+             Nicolas Karakatsanis (revision 1)
+.12.2008   S. Incerti, tag emlowen-V09-01-36
+             Updated low energy limits of Geant4-DNA e- models (Brenner-Zaider and Champion's
+             elastic scattering and Emfietzoglou's excitation)
+.12.2008   S. Incerti, tag emlowen-V09-01-35
+             Added protection in G4FinalStateIonisationBorn.cc causing run-time error (valgrind with test20)
+.12.2008   L. Pandola, tag emlowen-V09-01-34
+             Correction for G4PenelopeComptonModel: now the cross section table
+             calculated by the model corresponds to the original FORTRAN-Penelope.
+             The difference was only for compounds materials and below 1 keV, so
+             irrelevant for virtually all applications.
+             First inclusion of G4PenelopeIonisationModel.
+.11.2008   G. Cosmo, tag emlowen-V09-01-33
+             Fixed compilation errors on gcc-4.3.2:
+             o added required names for struct types (and using G4 prefix);
+             o correctly initialise cached iterators (cannot be an integer!).
+.11.2008   A. Lechner, tag emlowen-V09-01-32
+             added and tagged new stopping power model for ions, which by default
+             uses ICRU 73 data tables. Following files are concerned:
+             G4IonParametrisedLossModel.hh
+             G4IonParametrisedLossModel.icc
+             G4IonParametrisedLossModel.cc
+             G4IonParametrisedLossTable.hh
+             G4IonParametrisedLossTable.icc
+.11.2008   S. Incerti, tag emlowen-V09-01-31
+             corrected bug in computation of diff cross section maximum in
+             G4FinalStateElasticBrennerZaider.cc
+.10.2008   S. Incerti, tag emlowen-V09-01-30
+             added & tagged new photon models compatible with standard EM design :
+             -- Penelope models are provided by L. Pandola :
+             G4PenelopeComptonModel.hh and .cc
+             G4PenelopeGammaConversionModel.hh and .cc
+             G4PenelopePhotoElectricModel.hh and .cc
+             G4PenelopeRayleighModel.hh and .cc
+             -- Livermore models are provided by S. Incerti :
+             G4LivermoreComptonModel.hh and .cc
+             G4LivermoreGammaConversionModel.hh and .cc
+             G4LivermorePhotoElectricModel.hh and .cc
+             G4LivermorePolarizedComptonModel.hh and .cc
+             G4LivermorePolarizedRayleighModel.hh and .cc
+             G4LivermoreRayleighModel.hh and .cc
+.10.2008   S. Incerti, tag emlowen-V09-01-29
+             - improved generation of scattering angle in G4FinalStateElasticChampion.cc
+.09.2008   S. Incerti, tag emlowen-V09-01-28
+             - removed G4cout in G4LowEnergyCompton.cc (bug report #1026)
+.08.2008   S. Incerti, tag emlowen-V09-01-27
+             - added KillParticle in G4FinalStateElasticChampion.cc below low energy limit
+             - modified condition on low energy limit in G4CrossSectionElasticChampion.cc and G4FinalStateElasticChampion.cc
+.08.2008   S. Incerti, tag emlowen-V09-01-26
+             - removed AddEnergyDeposit below low energy limit in G4FinalStateElasticBrennerZaider.cc (bug, thanks to Marion Bug)
+             - removed AddEnergyDeposit below low energy limit in G4FinalStateExcitationEmfietzoglou.cc (idem)
+             - removed AddEnergyDeposit below low energy limit in G4FinalStateIonisationRudd.cc (idem)
+             - decreased low energy limit for e- to 12.61 eV in G4CrossSectionIonisationBorn.cc (from sigma_ionisation_e_born.dat table in $G4LEDATA/dna) instead of 25 eV
+             - decreased low energy limit for e- to 12.61 eV in G4FinalStateIonisationBorn.cc (from sigma_ionisation_e_born.dat table in $G4LEDATA/dna) instead of 25 eV
+.07.2008   S. Incerti, tag emlowen-V09-01-25
+             added preliminary process for positronium production
+             from C. Champion's model
+             G4CrossSectionPsCreationChampion.hh and .cc
+             G4CrossSectionPsCreationChampionPartial.hh and .cc
+             G4FinalStatePsCreationChampion.hh and .cc
+             and updated G4DNAGenericIonsManager.cc
+             *** Will work only from version 6.2 of G4EMLOW data
+.07.2008   S. Incerti, tag emlowen-V09-01-24
+             added new elastic scattering process for electrons
+             (Geant4 DNA) from C. Champion's model
+             G4CrossSectionElasticChampion.hh and .cc
+             G4FinalStateElasticChampion.hh and .cc
+             *** Will work only from version 6.2 of G4EMLOW data
+.07.2008   S. Incerti, tag emlowen-V09-01-23
+             cleaned and updated energy limits of the following
+files (Geant4 DNA)
+-G4CrossSectionChargeDecrease.hh and .cc
+-G4CrossSectionChargeDecreasePartial.hh and .cc
+-G4CrossSectionChargeIncrease.hh and .cc
+-G4CrossSectionChargeIncreasePartial.hh and .cc
+-G4CrossSectionElasticScreenedRutherfordHE.hh and .cc
+-G4CrossSectionElasticScreenedRutherfordLE.hh and .cc
+-G4CrossSectionExcitationBorn.hh and .cc
+-G4CrossSectionExcitationBornPartial.hh and .cc
+-G4CrossSectionExcitationEmfietzoglou.hh and .cc
+-G4CrossSectionExcitationEmfietzoglouPartial.hh and .cc
+-G4CrossSectionExcitationMillerGreen.hh and .cc
+-G4CrossSectionExcitationMillerGreenPartial.hh and .cc
+-G4CrossSectionIonisationBorn.hh and .cc
+-G4CrossSectionIonisationBornPartial.hh and .cc
+-G4CrossSectionIonisationRudd.hh and .cc
+-G4CrossSectionIonisationRuddPartial.hh and .cc
+-G4FinalStateChargeDecrease.hh and .cc
+-G4FinalStateChargeIncrease.hh and .cc
+-G4FinalStateElasticBrennerZaider.hh and .cc
+-G4FinalStateElasticScreenedRutherford.hh and .cc
+-G4FinalStateExcitationBorn.hh and .cc
+-G4FinalStateExcitationEmfietzoglou.hh and .cc
+-G4FinalStateExcitationMillerGreen.hh and .cc
+-G4FinalStateIonisationBorn.hh and .cc
+-G4FinalStateIonisationRudd.hh and .cc
+.06.2008   S. Incerti, tag emlowen-V09-01-22
+             corrected wrong upper energy limit for :
+             - hydrogen in G4CrossSectionIonisationRudd
+             - proton in G4ChargeDecrease
+.06.2008   S. Incerti, tag emlowen-V09-01-21
+             - added two new classes for electron elastic scattering
+             G4CrossSectionElasticScreenedRutherfordLE.cc and .hh below 200 eV
+             G4CrossSectionElasticScreenedRutherfordHE.cc and .hh above 200 eV
+             that should replace the G4CrossSectionElasticScreenedRutherfordHE class
+             - raised lower energy limit of G4CrossSectionExcitationEmfietzoglou.cc up to 10 eV
+.06.2008   S. Incerti, tag emlowen-VO9-01-20
+             - added protection against negative log argument in G4LogLogInterpolation.cc
+             - added protection against energies above 200 eV in G4FinalStateElasticBrennerZaider.cc
+             - removed verbose in G4CrossSectionChargeTransferExp.cc and in G4CrossSectionExcitationBorn.cc
+.06.2208   S. Incerti, tag emlowen-V09-01-19
+             Added protection against FPE in G4hShellCrossSectionDoubleExp.cc
+.06.2008   S. Incerti, tag emlowen-V09-01-18
+             Added 4 protections against FPE in G4hLowEnergyLoss.cc
+.06.2008   S. Incerti, tag emlowen-V09-01-17
+             - added missing & for cosTheta and phi variables in G4FinalStateIonisationRudd.hh and .cc
+             which were causing wrong angular distributions (bug fix)
+             - removed annoying PrintData in G4CrossSectionExcitationBornPartial.cc
+.06.2008   S. Incerti, tag emlowen-V09-01-16
+             Removed while(1) statement in G4FinalStateIonisationBorn.cc
+             fixing compilation warning.
+             Restored headers for G4PaulKCrossSection, G4OrlicLCrossSection
+             and G4ecpssrCrossSection which were lost.
+.06.2008   F.Lei, tag emlowen-V09-01-15
+             Correction to the corrupted G4Augerdata.cc, and this tag is on top
+             of emlowen-V09-01-12! as emlowen-V09-01-13 is internal and incomplete.
+.05.2008   F.Lei, tag emlowen-V09-01-14
+             Load the the complete Auger dataset on initialization
+.05.2008   H.Ben Abdelouahed, tag emlowen-V09-01-12, emlowen-V09-01-13
+             Semi-Empirical model implementation for L-SubShells-Cross-Section
+             with protons projectiles
+.05.2008   MGP, tag emlowen-V09-01-11
+             Added Doppler broadening in G4LowEnergyComptonPolarized
+             (Francesco Longo), same model as in G4LowEnergyCompton
+             Added PIXE cross section, L shells, for protons in
+             G4OrlicLCrossSection (Haifa Ben Abdelwahed)
+             Corrected compilation warnings as in message by
+             G. Cosmo on 29/4/2008
+.04.2008   MGP, tag emlowen-V09-01-10
+             Fix in Doppler broadening of G4LowEnergyCompton
+             Attempts to fix floating point exceptions in
+             G4FinalStateElasticBrennerZaider and G4hLowEnergyLoss
+.04.2008   H.Ben Abdelouahed, tag emlowen-V09-01-09
+             ECPSSR model implementation for K-Shell-Cross-Section
+             with protons and alpha projectiles
+.03.2008   G.Cosmo, tag emlowen-V09-01-08
+             Fixed compilation error in G4CrossSectionChargeTransferExp.cc
+             for missing inclusion of <sstream>, detected on SUN-CC.
+.03.2008   MGP, tag emlowen-V09-01-07
+             New charge transfer process by incident protons
+             (two cross section and one final state policy classes)
+.03.2008   MGP, tag emlowen-V09-01-06
+             Doppler broadening added to G4LowEnergyCompton
+             based on Y. Namito, S. Ban and H. Hirayama,
+             NIM A 349, pp. 489-494, 1994
+.03.2008   MGP, tag emlowen-V09-01-05
+             Developments for Doppler broadening concerning data management
+.03.2008   MGP, tag emlowen-V09-01-04
+             Fixes to *DataSet files for better readability of the code
+             Extensions to G4ShellData to deal with shell data relevant to
+             Doppler broadening simulation
+.03.2008   MGP, tag emlowen-V09-01-03
+             Reverted to G4hLowEnergyIonisation.cc and G4hLowEnergyLoss.cc
+             as in emlowen-V09-01-01
+.03.2008   MGP, tag emlowen-V09-01-02
+             Operation for convenience of configuration management:
+             updated G4hLowEnergyIonisation.cc and G4hLowEnergyLoss.cc
+             to the head; the modifications to these two classes
+             were an attempt to address a PRS report by A. Howard,
+             but they proved ineffective and caused other problems;
+             a tag including them is made to facilitate later retrieve
+.03.2008   MGP, tag emlowen-V09-01-01
+             Restored readability of *DataSet* classes regards the
+             indentation of the code
+.02.2008   MGP, tag emlowen-V09-01-00
+             Bug fix in G4AtomicTransitionManager concerning
+             total radiative and non radiative probabilities
+             (fix provided by A. Mantero)
 .11.2007   MGP, tag emlowen-V09-00-28

trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh

r819	r961
26	26	//
27	27	// $Id: G4AtomicTransitionManager.hh,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicShell.hh

r819	r961
26	26	//
27	27	// $Id: G4AtomicShell.hh,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh

r819	r961
26	26	//
27	27	// $Id: G4AtomicTransitionManager.hh,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh

r819	r961
25	25	//
26	26	// $Id: G4AugerData.hh
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// Author: Alfonso Mantero (Alfonso.Mantero@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh

r819	r961
26	26	//
27	27	// $Id: G4BremsstrahlungParameters.hh,v 1.10 2006/06/29 19:33:06 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh

-              r819
+              r961
 //
 //
 // $Id: G4CompositeEMDataSet.hh,v 1.8 2006/06/29 19:33:08 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4CompositeEMDataSet.hh,v 1.12 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 // -------------------------------------------------------------------
 #ifndef   G4COMPOSITEEMDATASET_HH
  #define  G4COMPOSITEEMDATASET_HH 1
+#ifndef G4COMPOSITEEMDATASET_HH
+#define G4COMPOSITEEMDATASET_HH 1
  #include "globals.hh"
  #include "G4VEMDataSet.hh"
  #include <vector>
+#include "globals.hh"
+#include "G4VEMDataSet.hh"
+#include <vector>
  class G4VDataSetAlgorithm;
+class G4VDataSetAlgorithm;
+ class G4CompositeEMDataSet : public G4VEMDataSet
+ {
+  public:
+                                                G4CompositeEMDataSet(G4VDataSetAlgorithm* argAlgorithm, G4double argUnitEnergies=MeV, G4double argUnitData=barn, G4int argMinZ=1, G4int argMaxZ=99);
+   virtual                                     ~G4CompositeEMDataSet();
+class G4CompositeEMDataSet : public G4VEMDataSet
+{
+public:
+  G4CompositeEMDataSet(G4VDataSetAlgorithm* argAlgorithm,
+                       G4double eUnit=MeV,
+                       G4double dataUnit=barn,
+                       G4int zMin=1,
+                       G4int zMax=99);
+  virtual ~G4CompositeEMDataSet();
    virtual G4double                             FindValue(G4double argEnergy, G4int argComponentId=0) const;
+  virtual G4double FindValue(G4double x, G4int componentId=0) const;
    virtual void                                 PrintData(void) const;
+  virtual void PrintData(void) const;
    virtual const G4VEMDataSet *                 GetComponent(G4int argComponentId) const { return components[argComponentId]; }
    virtual void                                 AddComponent(G4VEMDataSet * argDataSet) { components.push_back(argDataSet); }
    virtual size_t                               NumberOfComponents(void) const { return components.size(); }
+  virtual const G4VEMDataSet* GetComponent(G4int componentId) const { return components[componentId]; }
+  virtual void AddComponent(G4VEMDataSet* dataSet) { components.push_back(dataSet); }
+  virtual size_t NumberOfComponents() const { return components.size(); }
    virtual const G4DataVector &                 GetEnergies(G4int argComponentId) const { return GetComponent(argComponentId)->GetEnergies(0); }
    virtual const G4DataVector &                 GetData(G4int argComponentId) const { return GetComponent(argComponentId)->GetData(0); }
    virtual void                                 SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int argComponentId);
+  virtual const G4DataVector& GetEnergies(G4int componentId) const { return GetComponent(componentId)->GetEnergies(0); }
+  virtual const G4DataVector& GetData(G4int componentId) const { return GetComponent(componentId)->GetData(0); }
+  virtual void SetEnergiesData(G4DataVector* x, G4DataVector* data, G4int componentId);
+   virtual G4bool                               LoadData(const G4String & argFileName);
+   virtual G4bool                               SaveData(const G4String & argFileName) const;
+  virtual G4bool LoadData(const G4String& fileName);
+  virtual G4bool SaveData(const G4String& fileName) const;
+ virtual G4double RandomSelect(G4int componentId) const;
+  private:
+   void                                         CleanUpComponents(void);
+private:
+  void CleanUpComponents(void);
    // Hide copy constructor and assignment operator
                                                 G4CompositeEMDataSet();
                                                 G4CompositeEMDataSet(const G4CompositeEMDataSet & copy);
    G4CompositeEMDataSet &                       operator=(const G4CompositeEMDataSet & right);
+  // Hide copy constructor and assignment operator
+  G4CompositeEMDataSet();
+  G4CompositeEMDataSet(const G4CompositeEMDataSet& copy);
+  G4CompositeEMDataSet& operator=(const G4CompositeEMDataSet& right);
    std::vector<G4VEMDataSet *>                  components;          // Owned pointers
+  std::vector<G4VEMDataSet*> components;    // Owned pointers
    G4VDataSetAlgorithm *                        algorithm;           // Owned pointer
+  G4VDataSetAlgorithm* algorithm;           // Owned pointer
    G4double                                     unitEnergies;
    G4double                                     unitData;
+  G4double unitEnergies;
+  G4double unitData;
    G4int                                        minZ;
    G4int                                        maxZ;
  };
+  G4int minZ;
+  G4int maxZ;
+};
 #endif /* G4COMPOSITEEMDATASET_HH */

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecrease.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeDecrease.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeDecrease.hh,v 1.2 2008/07/14 20:47:32 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONCHARGEDECREASE_HH
 #define G4CROSSSECTIONCHARGEDECREASE_HH 1
-#include "globals.hh"
-#include <map>
 #include "G4CrossSectionChargeDecreasePartial.hh"
+#include "G4Track.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
-class G4Track;
 class G4CrossSectionChargeDecrease
+{
 …
   G4double CrossSection(const G4Track&);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecreasePartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeDecreasePartial.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+// 08 Nov 2007  MGP               Got code from S.I.; lowercase data member
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeDecreasePartial.hh,v 1.2 2008/07/14 20:47:32 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONCHARGEDECREASEPARTIAL_HH
 #define G4CROSSSECTIONCHARGEDECREASEPARTIAL_HH 1
+#include "globals.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
 class G4ParticleDefinition;
 …
   G4int RandomSelect(G4double energy, const G4ParticleDefinition* particle);
-  // Copy constructor and assignment operator to be added here
 private:

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncrease.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeIncrease.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeIncrease.hh,v 1.2 2008/07/14 20:47:33 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONCHARGEIncrease_HH
 #define G4CROSSSECTIONCHARGEIncrease_HH 1
-#include "globals.hh"
-#include <map>
 #include "G4CrossSectionChargeIncreasePartial.hh"
+#include "G4Track.hh"
+#include "G4DNAGenericIonsManager.hh"
-class G4Track;
 class G4CrossSectionChargeIncrease
+{
 …
   G4double CrossSection(const G4Track&);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncreasePartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeIncreasePartial.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeIncreasePartial.hh,v 1.2 2008/07/14 20:47:33 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONCHARGEIncreasePARTIAL_HH
 #define G4CROSSSECTIONCHARGEIncreasePARTIAL_HH 1
+#include "globals.hh"
+class G4ParticleDefinition;
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
 class G4CrossSectionChargeIncreasePartial
 …
   G4int RandomSelect(G4double energy, const G4ParticleDefinition* particle);
-  // Copy constructor and assignment operator to be added here
 private:

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherford.hh

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionElasticScreenedRutherford.hh,v 1.1 2007/10/12 23:07:10 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBorn.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationBorn.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationBorn.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONEXCITATIONBORN_HH
 #define G4CROSSSECTIONEXCITATIONBORN_HH 1
-#include "globals.hh"
-#include <vector>
-#include "G4WaterExcitationStructure.hh"
 #include "G4DNACrossSectionDataSet.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
-class G4Track;
 class G4CrossSectionExcitationBorn
+{
 …
   G4double CrossSection(const G4Track& track);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimit;
   G4double highEnergyLimit;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBornPartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationBornPartial.hh,v 1.1 2007/10/15 08:34:12 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationBornPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONEXCITATIONBORNPARTIAL_HH
 #define G4CROSSSECTIONEXCITATIONBORNPARTIAL_HH 1
-#include "globals.hh"
-#include <vector>
 #include "G4DNACrossSectionDataSet.hh"
+#include "G4LogLogInterpolation.hh"
+#include "Randomize.hh"
+#include <deque>
 class G4CrossSectionExcitationBornPartial
 …
   virtual ~G4CrossSectionExcitationBornPartial();
-  // Select an excitation level according to the partial cross sections
   G4int RandomSelect(G4double energy);
-  // Copy constructor and assignment operator to be added here
 private:

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglou.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationEmfietzoglou.hh,v 1.2 2007/10/15 08:31:49 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationEmfietzoglou.hh,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONEXCITATIONEMFIETZOGLOU_HH
 #define G4CROSSSECTIONEXCITATIONEMFIETZOGLOU_HH 1
-#include "globals.hh"
 #include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "G4Track.hh"
-class G4Track;
 class G4CrossSectionExcitationEmfietzoglou
+{
 …
   G4double CrossSection(const G4Track&);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimit;
   G4double highEnergyLimit;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglouPartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationEmfietzoglouPartial.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationEmfietzoglouPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONEXCITATIONEMFIETZOGLOUPARTIAL_HH
 #define G4CROSSSECTIONEXCITATIONEMFIETZOGLOUPARTIAL_HH 1
-#include "globals.hh"
-#include <vector>
 #include "G4WaterExcitationStructure.hh"
+#include <deque>
+#include "Randomize.hh"
 class G4Track;
 …
   G4int RandomSelect(G4double energy);
-  // Copy constructor and assignment operator to be added here
 private:
- // Number of excitation levels of the water molecule
   G4int nLevels;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationMillerGreen.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationMillerGreen.hh,v 1.2 2007/11/08 19:56:02 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationMillerGreen.hh,v 1.3 2008/07/14 20:47:34 sincerti Exp $
 #ifndef G4CROSSSECTIONEXCITATIONMILLERGREEN_HH
 #define G4CROSSSECTIONEXCITATIONMILLERGREEN_HH 1
-#include "globals.hh"
-#include <map>
 #include "G4CrossSectionExcitationMillerGreenPartial.hh"
+class G4Track;
+#include "G4Track.hh"
+#include "G4Proton.hh"
+#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "G4DNAGenericIonsManager.hh"
 class G4CrossSectionExcitationMillerGreen
 …
   G4double CrossSection(const G4Track&);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;
 …
   G4CrossSectionExcitationMillerGreenPartial partialCrossSection;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationMillerGreenPartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationMillerGreenPartial.hh,v 1.1 2007/11/08 19:56:02 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationMillerGreenPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONEXCITATIONMILLERGREENPARTIAL_HH
 #define G4CROSSSECTIONEXCITATIONMILLERGREENPARTIAL_HH 1
-#include "globals.hh"
-#include <vector>
 #include "G4WaterExcitationStructure.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Track.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "Randomize.hh"
-class G4Track;
 class G4CrossSectionExcitationMillerGreenPartial
+{
 …
   G4int RandomSelect(G4double energy, const G4ParticleDefinition* particle);
-  // Copy constructor and assignment operator to be added here
 private:
-  // Number of excitation levels of the water molecule
   G4int nLevels;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionHandler.hh,v 1.9 2006/06/29 19:33:10 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBorn.hh

-              r819
+              r961
 //
 //
+// $Id: G4CrossSectionIonisationBorn.hh,v 1.1 2007/10/22 09:12:58 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for ionisation cross section in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationBorn.hh,v 1.3 2008/12/18 13:01:22 gunter Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONIONISATIONBORN_HH
 #define G4CROSSSECTIONIONISATIONBORN_HH 1
-#include "globals.hh"
-#include <map>
 #include "G4DNACrossSectionDataSet.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
-class G4Track;
 class G4CrossSectionIonisationBorn
+{
 …
   G4double CrossSection(const G4Track& track);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornElectron.hh

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionIonisationBornElectron.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationBornPartial.hh,v 1.1 2007/10/22 09:12:58 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for ionisation cross section in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationBornPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONIONISATIONBORNPARTIAL_HH
 #define G4CROSSSECTIONIONISATIONBORNPARTIAL_HH 1
-#include "globals.hh"
-#include <map>
-#include <functional>
 #include "G4DNACrossSectionDataSet.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "Randomize.hh"
-class G4Track;
 class G4CrossSectionIonisationBornPartial
+{
 …
   ~G4CrossSectionIonisationBornPartial();
-  // Partial cross section
-  // G4double CrossSection(G4double energy, const G4String& particle);
   G4double CrossSection(const G4Track& track);
-  // Sum of partial cross sections at a given energy value for a particle type
   G4double Sum(G4double energy, const G4String& particle);
   G4int RandomSelect(G4double energy,const G4String& particle );
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;
 …
   MapData tableData;
-  // G4DNACrossSectionDataSet* table;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartialElectron.hh

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionIonisationBornPartialElectron.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRudd.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationRudd.hh,v 1.1 2007/11/08 21:35:31 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for ionisation cross section in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationRudd.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONIONISATIONRUDD_HH
 #define G4CROSSSECTIONIONISATIONRUDD_HH 1
-#include "globals.hh"
-#include <map>
 #include "G4DNACrossSectionDataSet.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "G4DNAGenericIonsManager.hh"
-class G4Track;
 class G4CrossSectionIonisationRudd
+{
 …
   G4double CrossSection(const G4Track& track);
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRuddPartial.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationRuddPartial.hh,v 1.1 2007/11/08 21:35:31 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for ionisation cross section in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationRuddPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4CROSSSECTIONIONISATIONRuddPARTIAL_HH
 #define G4CROSSSECTIONIONISATIONRuddPARTIAL_HH 1
-#include "globals.hh"
-#include <map>
-#include <functional>
 #include "G4DNACrossSectionDataSet.hh"
+class G4Track;
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
 class G4CrossSectionIonisationRuddPartial
 …
   ~G4CrossSectionIonisationRuddPartial();
-  // Partial cross section
-  // G4double CrossSection(G4double energy, const G4String& particle);
   G4double CrossSection(const G4Track& track);
-  // Sum of partial cross sections at a given energy value for a particle type
   G4double Sum(G4double energy, const G4String& particle);
   G4int RandomSelect(G4double energy,const G4String& particle );
-  // Copy constructor and assignment operator to be added here
 private:
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;
 …
   typedef std::map<G4String,G4DNACrossSectionDataSet*,std::less<G4String> > MapData;
   MapData tableData;
-  // G4DNACrossSectionDataSet* table;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionKill.hh

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionKill.hh,v 1.1 2007/11/09 20:26:47 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh

-              r819
+              r961
 //
 //
 // $Id: G4DNACrossSectionDataSet.hh,v 1.4 2007/10/15 08:31:49 pia Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4DNACrossSectionDataSet.hh,v 1.6 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Riccardo Capra <capra@ge.infn.it>
 …
 // -------------------------------------------------------------------
 #ifndef   G4DNACROSSSECTIONDATASET_HH
  #define  G4DNACROSSSECTIONDATASET_HH 1
+#ifndef  G4DNACROSSSECTIONDATASET_HH
+#define  G4DNACROSSSECTIONDATASET_HH 1
  #include "G4ShellEMDataSet.hh"
+#include "G4ShellEMDataSet.hh"
+ class G4DNACrossSectionDataSet : public G4VEMDataSet
+ {
+  public:
+   G4DNACrossSectionDataSet(G4VDataSetAlgorithm* argAlgorithm,
+                            G4double argUnitEnergies=MeV,
+                            G4double argUnitData=barn);
+class G4DNACrossSectionDataSet : public G4VEMDataSet
+{
+   virtual ~G4DNACrossSectionDataSet();
+public:
+  G4DNACrossSectionDataSet(G4VDataSetAlgorithm* algo,
+                           G4double xUnit=MeV,
+                           G4double dataUnit=barn);
+   virtual G4double FindValue(G4double argEnergy, G4int argComponentId=0) const;
+  virtual ~G4DNACrossSectionDataSet();
+  virtual G4double FindValue(G4double e, G4int componentId=0) const;
    virtual void PrintData(void) const;
+  virtual void PrintData(void) const;
    virtual const G4VEMDataSet*  GetComponent(G4int argComponentId) const
    { return components[argComponentId]; }
+  virtual const G4VEMDataSet*  GetComponent(G4int componentId) const
+  { return components[componentId]; }
+   virtual void AddComponent(G4VEMDataSet * argDataSet)
+   { components.push_back(argDataSet); }
+   virtual size_t NumberOfComponents(void) const
+   { return components.size(); }
+  virtual void AddComponent(G4VEMDataSet* dataSet)
+  { components.push_back(dataSet); }
    virtual const G4DataVector& GetEnergies(G4int argComponentId) const
    { return GetComponent(argComponentId)->GetEnergies(0); }
+  virtual size_t NumberOfComponents(void) const
+  { return components.size(); }
    virtual const G4DataVector& GetData(G4int argComponentId) const
    { return GetComponent(argComponentId)->GetData(0); }
+  virtual const G4DataVector& GetEnergies(G4int componentId) const
+  { return GetComponent(componentId)->GetEnergies(0); }
+   virtual void SetEnergiesData(G4DataVector* argEnergies, G4DataVector* argData, G4int argComponentId);
+  virtual const G4DataVector& GetData(G4int componentId) const
+  { return GetComponent(componentId)->GetData(0); }
+   virtual G4bool LoadData(const G4String & argFileName);
+   virtual G4bool SaveData(const G4String & argFileName) const;
+  virtual void SetEnergiesData(G4DataVector* x, G4DataVector* values, G4int componentId);
+   //   void CleanUpComponents();
+  virtual G4bool LoadData(const G4String & argFileName);
+  virtual G4bool SaveData(const G4String & argFileName) const;
+  virtual G4double RandomSelect(G4int /*componentId */) const { return -1.; };
+  //   void CleanUpComponents();
   private:
+private:
    G4String FullFileName(const G4String & argFileName) const;
+  G4String FullFileName(const G4String & argFileName) const;
    // Hide copy constructor and assignment operator
    G4DNACrossSectionDataSet();
    G4DNACrossSectionDataSet(const G4DNACrossSectionDataSet & copy);
    G4DNACrossSectionDataSet& operator=(const G4DNACrossSectionDataSet & right);
+  // Hide copy constructor and assignment operator
+  G4DNACrossSectionDataSet();
+  G4DNACrossSectionDataSet(const G4DNACrossSectionDataSet & copy);
+  G4DNACrossSectionDataSet& operator=(const G4DNACrossSectionDataSet & right);
    std::vector<G4VEMDataSet*> components;          // Owned pointers
+  std::vector<G4VEMDataSet*> components;          // Owned pointers
    G4int z;
+  G4int z;
    G4VDataSetAlgorithm* algorithm;           // Owned pointer
+  G4VDataSetAlgorithm* algorithm;           // Owned pointer
    G4double unitEnergies;
    G4double unitData;
+  G4double unitEnergies;
+  G4double unitData;
    G4double GetUnitEnergies() const { return unitEnergies; }
    G4double GetUnitData() const { return unitData; }
    const G4VDataSetAlgorithm* GetAlgorithm() const { return algorithm; }
+  G4double GetUnitEnergies() const { return unitEnergies; }
+  G4double GetUnitData() const { return unitData; }
+  const G4VDataSetAlgorithm* GetAlgorithm() const { return algorithm; }
    void CleanUpComponents(void);
+  void CleanUpComponents(void);

trunk/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh

r819	r961
26	26	//
27	27	// $Id: G4DNAGenericIonsManager.hh,v 1.3 2006/06/29 19:34:16 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29
30	30	#ifndef G4DNAGENERICIONSMANAGER_HH

trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.hh

r819	r961
26	26	//
27	27	// $Id: G4DNAProcess.hh,v 1.5 2007/11/09 16:20:04 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.icc

-              r819
+              r961
 //
 //
 // $Id: G4DNAProcess.icc,v 1.11 2007/12/10 16:31:19 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4DNAProcess.icc,v 1.12 2009/01/20 07:50:28 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
       aParticleChange.ProposeEnergy(0.);
       aParticleChange.ProposeMomentumDirection( 0., 0., 0. );
+      aParticleChange.ProposeLocalEnergyDeposit(track.GetKineticEnergy() + deposit);
+      if (product.PrimaryParticleIsKilledAndDoNotDepositEnergy())
+      {
+        aParticleChange.ProposeLocalEnergyDeposit(deposit);
+      }
+      else
+      {
+        aParticleChange.ProposeLocalEnergyDeposit(track.GetKineticEnergy() + deposit);
+      }
+    }
   else

trunk/source/processes/electromagnetic/lowenergy/include/G4DummyFinalState.hh

r819	r961
26	26	//
27	27	// $Id: G4DummyFinalState.hh,v 1.2 2007/10/07 12:52:18 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh

-              r819
+              r961
 //
 //
 // $Id: G4EMDataSet.hh,v 1.7 2006/06/29 19:35:31 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EMDataSet.hh,v 1.12 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 #ifndef   G4EMDATASET_HH
  #define  G4EMDATASET_HH 1
+#define  G4EMDATASET_HH 1
  #include "globals.hh"
  #include "G4VEMDataSet.hh"
+#include "globals.hh"
+#include "G4VEMDataSet.hh"
  class G4VDataSetAlgorithm;
+class G4VDataSetAlgorithm;
+ class G4EMDataSet : public G4VEMDataSet
+ {
+  public:
+                                                G4EMDataSet(G4int argZ, G4VDataSetAlgorithm * argAlgorithm, G4double argUnitEnergies=MeV, G4double argUnitData=barn);
+                                                G4EMDataSet(G4int argZ, G4DataVector * argEnergies, G4DataVector * argData, G4VDataSetAlgorithm * argAlgorithm, G4double argUnitEnergues=MeV, G4double argUnitData=barn);
+   virtual                                     ~G4EMDataSet();
+class G4EMDataSet : public G4VEMDataSet
+{
+public:
+  G4EMDataSet(G4int argZ,
+              G4VDataSetAlgorithm* algo,
+              G4double xUnit=MeV,
+              G4double yUnit=barn,
+              G4bool random=false);
+  G4EMDataSet(G4int argZ,
+              G4DataVector* xData,
+              G4DataVector* data,
+              G4VDataSetAlgorithm* algo,
+              G4double xUnit=MeV,
+              G4double yUnit=barn,
+              G4bool random=false);
+  virtual ~G4EMDataSet();
    virtual G4double                             FindValue(G4double argEnergy, G4int argComponentId=0) const;
+  virtual G4double FindValue(G4double x, G4int componentId=0) const;
    virtual void                                 PrintData(void) const;
+  virtual void PrintData(void) const;
+   virtual const G4VEMDataSet *                 GetComponent(G4int /* argComponentId */) const { return 0; }
+   virtual void                                 AddComponent(G4VEMDataSet * /* argDataSet */) {}
+   virtual size_t                               NumberOfComponents(void) const { return 0; }
+  virtual const G4VEMDataSet* GetComponent(G4int /* componentId */) const { return 0; }
+   virtual const G4DataVector &                 GetEnergies(G4int /* argComponentId */) const { return *energies; }
+   virtual const G4DataVector &                 GetData(G4int /* argComponentId */) const { return *data; }
+   virtual void                                 SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int argComponentId);
+  virtual void AddComponent(G4VEMDataSet* /* dataSet */) {}
+   virtual G4bool                               LoadData(const G4String & argFileName);
+   virtual G4bool                               SaveData(const G4String & argFileName) const;
+  private:
+   size_t                                       FindLowerBound(G4double argEnergy) const;
+   G4String                                     FullFileName(const G4String & argFileName) const;
+  virtual size_t NumberOfComponents(void) const { return 0; }
+   // Hide copy constructor and assignment operator
+                                                G4EMDataSet();
+                                                G4EMDataSet(const G4EMDataSet & copy);
+   G4EMDataSet &                                operator=(const G4EMDataSet & right);
+  virtual const G4DataVector& GetEnergies(G4int /* componentId */) const { return *energies; }
+  virtual const G4DataVector& GetData(G4int /* componentId */) const { return *data; }
+  virtual void SetEnergiesData(G4DataVector* xData, G4DataVector* data, G4int componentId);
+   G4int                                        z;
+  virtual G4bool LoadData(const G4String& fileName);
+  virtual G4bool SaveData(const G4String& fileName) const;
    G4DataVector *                               energies;            // Owned pointer
    G4DataVector *                               data;                // Owned pointer
+  virtual G4double RandomSelect(G4int componentId = 0) const;
+   G4VDataSetAlgorithm *                        algorithm;           // Owned pointer
+private:
+  size_t FindLowerBound(G4double energy) const;
+  size_t FindLowerBound(G4double x, G4DataVector* values) const;
+  G4double IntegrationFunction(G4double x);
+  virtual void BuildPdf();
+   G4double                                     unitEnergies;
+   G4double                                     unitData;
+ };
+  G4String FullFileName(const G4String& fileName) const;
+  // Hide copy constructor and assignment operator
+  G4EMDataSet();
+  G4EMDataSet(const G4EMDataSet& copy);
+  G4EMDataSet& operator=(const G4EMDataSet& right);
+  G4int z;
+  G4DataVector* energies;            // Owned pointer
+  G4DataVector* data;                // Owned pointer
+  G4VDataSetAlgorithm* algorithm;    // Owned pointer
+  G4double unitEnergies;
+  G4double unitData;
+  G4DataVector* pdf;
+  G4bool randomSet;
+};
 #endif /* G4EMDATASET_HH */

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeDecrease.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateChargeDecrease.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateChargeDecrease.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATECHARGEDECREASE_HH
 #define G4FINALSTATECHARGEDECREASE_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
-//#include "G4WaterExcitationStructure.hh"
 #include "G4CrossSectionChargeDecreasePartial.hh"
+class G4Track;
+class G4Step;
+ class G4FinalStateChargeDecrease
+ {
+class G4FinalStateChargeDecrease
+{
  public:
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeIncrease.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateChargeIncrease.hh,v 1.1 2007/11/08 18:24:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateChargeIncrease.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATECHARGEIncrease_HH
 #define G4FINALSTATECHARGEIncrease_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
 #include "G4CrossSectionChargeIncreasePartial.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+class G4Track;
+class G4Step;
+ class G4FinalStateChargeIncrease
+ {
+class G4FinalStateChargeIncrease
+{
  public:
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticBrennerZaider.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateElasticBrennerZaider.hh,v 1.1 2007/10/12 23:07:10 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateElasticBrennerZaider.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEELASTICBRENNERZAIDER_HH
 #define G4FINALSTATEELASTICBRENNERZAIDER_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
+#include "Randomize.hh"
 class G4Track;
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
  };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticScreenedRutherford.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateElasticScreenedRutherford.hh,v 1.2 2007/10/12 23:02:55 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateElasticScreenedRutherford.hh,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEELASTICSCREENEDRUTHERFORD_HH
 #define G4FINALSTATEELASTICSCREENEDRUTHERFORD_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
+#include "Randomize.hh"
 class G4Track;
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
  };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationBorn.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationBorn.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationBorn.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEEXCITATIONBORN_HH
 #define G4FINALSTATEEXCITATIONBORN_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
 #include "G4WaterExcitationStructure.hh"
 #include "G4CrossSectionExcitationBornPartial.hh"
+class G4Track;
+class G4Step;
+ class G4FinalStateExcitationBorn
+ {
+class G4FinalStateExcitationBorn
+{
  public:
 …
  private:
+   // Copy constructor and assignment operator to be added here
+   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationEmfietzoglou.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationEmfietzoglou.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationEmfietzoglou.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEEXCITATIONEMFIETZOGLOU_HH
 #define G4FINALSTATEEXCITATIONEMFIETZOGLOU_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
-#include "G4WaterExcitationStructure.hh"
 #include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationMillerGreen.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationMillerGreen.hh,v 1.1 2007/11/08 19:56:02 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationMillerGreen.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEEXCITATIONMILLERGREEN_HH
 #define G4FINALSTATEEXCITATIONMILLERGREEN_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
-#include "G4WaterExcitationStructure.hh"
 #include "G4CrossSectionExcitationMillerGreenPartial.hh"
+class G4Track;
+class G4Step;
+ class G4FinalStateExcitationMillerGreen
+ {
+class G4FinalStateExcitationMillerGreen
+{
  public:
 …
  private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimit;
    G4double highEnergyLimit;
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationBorn.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateIonisationBorn.hh,v 1.3 2007/11/13 15:20:19 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateIonisationBorn.hh,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4FINALSTATEIONISATIONBORN_HH
 #define G4FINALSTATEIONISATIONBORN_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
 #include "G4WaterIonisationStructure.hh"
 …
 class G4Step;
  class G4FinalStateIonisationBorn
+ {
+class G4FinalStateIonisationBorn
+{
  public:
 …
    const G4FinalStateProduct& GenerateFinalState(const G4Track& track, const G4Step& step);
  private:
+private:
-   // Copy constructor and assignment operator to be added here
-   G4String name;
    G4double lowEnergyLimitDefault;
    G4double highEnergyLimitDefault;
 …
    TriDimensionMap eDiffCrossSectionData[6];
    TriDimensionMap pDiffCrossSectionData[6];
-   // TriDimensionMap eDiffCrossSectionData;
-   // TriDimensionMap pDiffCrossSectionData;
    std::vector<double> eTdummyVec;
    std::vector<double> pTdummyVec;
 …
    VecMap pVecm;
-   //   std::ifstream eDiffCrossSection;
-   //   std::ifstream pDiffCrossSection;
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationRudd.hh

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateIonisationRudd.hh,v 1.2 2007/11/09 16:30:56 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateIonisationRudd.hh,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 …
 #define G4FINALSTATEIONISATIONRUDD_HH 1
-#include "globals.hh"
 #include "G4FinalStateProduct.hh"
 #include "G4WaterIonisationStructure.hh"
 #include "G4CrossSectionIonisationRuddPartial.hh"
+class G4Track;
+class G4Step;
+class G4ParticleDefinition;
+#include "G4Electron.hh"
+#include "G4Proton.hh"
 class G4FinalStateIonisationRudd
 …
 private:
-  // Copy constructor and assignment operator to be added here
-  G4String name;
   G4double lowEnergyLimitDefault;
   G4double highEnergyLimitDefault;
 …
                                          G4double incomingParticleEnergy,
                                          G4double outgoingParticleEnergy,
                                          G4double cosTheta,
                                          G4double phi);
+                                         G4double & cosTheta,
+                                         G4double & phi);
   G4double  DifferentialCrossSection(G4ParticleDefinition* particleDefinition,
 …
 };
 #endif

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateKill.hh

r819	r961
26	26	//
27	27	// $Id: G4FinalStateKill.hh,v 1.1 2007/11/09 20:26:47 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateProduct.hh

-              r819
+              r961
 //
 //
 // $Id: G4FinalStateProduct.hh,v 1.4 2007/10/15 08:31:49 pia Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4FinalStateProduct.hh,v 1.5 2009/01/20 07:50:28 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
   void ModifyPrimaryParticle(const G4ThreeVector& direction, G4double energy);
+  void DoNotDepositEnergy();
   void KillPrimaryParticle();
   G4bool PrimaryParticleIsKilled() const { return killStatus; }
+  G4bool PrimaryParticleIsKilledAndDoNotDepositEnergy() const { return doNotDepositStatus; }
   G4bool PrimaryParticleIsModified() const { return isModified; }
 …
   G4bool killStatus;
+  G4bool doNotDepositStatus;
   G4bool isModified;
   G4double localEnergyDeposit;

trunk/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh

r819	r961
26	26	//
27	27	// $Id: G4FluoTransition.hh,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh

r819	r961
26	26	//
27	27	// $Id: G4LinInterpolation.hh,v 1.3 2006/06/29 19:35:45 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh

-              r819
+              r961
 //
 //
 // $Id: G4LogLogInterpolation.hh,v 1.4 2006/06/29 19:35:51 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LogLogInterpolation.hh,v 1.6 2008/12/09 13:28:02 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh

r819	r961
27	27	// -------------------------------------------------------------------
28	28	// $Id: G4LowEnergyBremsstrahlung.hh,v 1.37 2006/06/29 19:35:55 gunter Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LowEnergyCompton.hh,v 1.21 2006/06/29 19:35:57 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4LowEnergyCompton.hh,v 1.24 2008/11/04 10:14:00 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: A. Forti
 …
 #include "globals.hh"
 #include "G4VDiscreteProcess.hh"
+#include "G4ShellData.hh"
+#include "G4DopplerProfile.hh"
 class G4Track;
 …
   G4bool IsApplicable(const G4ParticleDefinition& definition);
   void BuildPhysicsTable(const G4ParticleDefinition& photon);
+  void BuildPhysicsTable(const G4ParticleDefinition& definition);
   G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep);
+  G4VParticleChange* PostStepDoIt(const G4Track& track, const G4Step& step);
   // For testing purpose only
   G4double DumpMeanFreePath(const G4Track& aTrack,
+  G4double DumpMeanFreePath(const G4Track& track,
                             G4double previousStepSize,
                             G4ForceCondition* condition)
   { return GetMeanFreePath(aTrack, previousStepSize, condition); }
+  { return GetMeanFreePath(track, previousStepSize, condition); }
 protected:
   G4double GetMeanFreePath(const G4Track& aTrack,
+  G4double GetMeanFreePath(const G4Track& track,
                            G4double previousStepSize,
                            G4ForceCondition* condition);
 …
   const G4double intrinsicHighEnergyLimit;
+  G4ShellData shellData;
+  G4DopplerProfile profileData;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh

r819	r961
26	26	//
27	27	// $Id: G4LowEnergyGammaConversion.hh,v 1.15 2006/06/29 19:35:59 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh

r819	r961
26	26	// -------------------------------------------------------------------
27	27	// $Id: G4LowEnergyIonisation.hh,v 1.41 2006/06/29 19:36:01 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh

r819	r961
26	26	//
27	27	// $Id: G4LowEnergyPhotoElectric.hh,v 1.28 2006/06/29 19:36:03 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh

-              r819
+              r961
 //
 //
 // $Id: G4LowEnergyPolarizedCompton.hh,v 1.9 2006/06/29 19:36:05 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LowEnergyPolarizedCompton.hh,v 1.10 2008/05/02 13:04:41 flongo Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
 …
 #include "globals.hh"
 #include "G4VDiscreteProcess.hh"
+// Doppler Broadening
+#include "G4ShellData.hh"
+#include "G4DopplerProfile.hh"
 class G4Track;
 …
                          G4ThreeVector& polarization0, G4ThreeVector& polarization1);
+  // Doppler Broadening
+  G4ShellData shellData;
+  G4DopplerProfile profileData;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh

r819	r961
25	25	//
26	26	// $Id: G4LowEnergyPolarizedRayleigh.hh,v 1.5 2006/06/29 19:36:07 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh

r819	r961
26	26	//
27	27	// $Id: G4LowEnergyRayleigh.hh,v 1.16 2006/06/29 19:36:09 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh

r819	r961
27	27	// -------------------------------------------------------------------
28	28	// $Id: G4PenelopeBremsstrahlung.hh,v 1.8 2006/06/29 19:36:15 gunter Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: L.Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh

r819	r961
27	27	// -------------------------------------------------------------------
28	28	// $Id: G4PenelopeBremsstrahlungAngular.hh,v 1.3 2006/06/29 19:36:17 gunter Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: L.Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh

-              r819
+              r961
 //
 // -------------------------------------------------------------------
 // $Id: G4PenelopeBremsstrahlungContinuous.hh,v 1.3 2006/06/29 19:36:19 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PenelopeBremsstrahlungContinuous.hh,v 1.4 2008/12/09 15:04:05 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: L.Pandola
 …
 // 20 Feb 2003  L. Pandola       1st implementation
 // 17 Mar 2003  L. Pandola       Added the correction for positrons
+// 09 Dec 2008  L. Pandola       Cosmetics: say what variables are
+//
 // Class description:
 // Calculation of continuous energy loss for Penelope Bremsstrahlung
 …
 public:
+  G4PenelopeBremsstrahlungContinuous(G4int Zmat,G4double tCut, G4double emin, G4double emax,
+                                     const G4String partName);
+  G4PenelopeBremsstrahlungContinuous(G4int Z,G4double energyCut, G4double energyMin,
+                                     G4double energyMax,
+                                     const G4String particleName);
   ~G4PenelopeBremsstrahlungContinuous();
   G4double CalculateStopping(G4double PrimaryEnergy);
+  G4double CalculateStopping(G4double energy);
 private:
   void PrepareInterpolationTable();
   void LoadFromFile();
 …
   G4double ExtendedLogEnergy[NumberofExtendedEGrid];
   G4double p0[NumberofExtendedEGrid][NumberofKPoints];
   //G4double Pbcut[NumberofExtendedEGrid]; //serve?
+  //G4double Pbcut[NumberofExtendedEGrid]; //useful?
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PenelopeCompton.hh,v 1.10 2006/06/29 19:36:21 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PenelopeCompton.hh,v 1.11 2008/03/26 15:30:19 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Luciano Pandola
 …
 // 26 Mar 2003   L.Pandola    Added fluorescence
 // 18 Mar 2004   L.Pandola    Use of std::map (code review)
+// 26 Mar 2008   L.Pandola    Add boolean flag to control atomic de-excitation
 //
 // -------------------------------------------------------------------
 …
   { return GetMeanFreePath(aTrack, previousStepSize, condition); }
+  void SetUseAtomicDeexcitation(G4bool value){fUseAtomicDeexcitation = value;};
+  G4bool GetUseAtomicDeexcitation(){return fUseAtomicDeexcitation;};
 protected:
 …
   std::vector<G4VEMDataSet*> *matCrossSections; //for random choice of atom
   G4double cutForLowEnergySecondaryPhotons;
+  G4bool fUseAtomicDeexcitation;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh

r819	r961
26	26	//
27	27	// $Id: G4PenelopeGammaConversion.hh,v 1.2 2006/06/29 19:36:25 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: L. Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh

r819	r961
26	26	// -------------------------------------------------------------------
27	27	// $Id: G4PenelopeIonisation.hh,v 1.5 2006/06/29 19:36:33 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: L. Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh

r819	r961
26	26	//
27	27	// $Id: G4PenelopePhotoElectric.hh,v 1.4 2006/06/29 19:36:35 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: L.Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh

r819	r961
26	26	//
27	27	// $Id: G4PenelopeRayleigh.hh,v 1.5 2006/06/29 19:36:37 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Luciano Pandola

trunk/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh

r819	r961
26	26	//
27	27	// $Id: G4RangeNoTest.hh,v 1.4 2006/06/29 19:36:47 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh

r819	r961
26	26	//
27	27	// $Id: G4RangeTest.hh,v 1.4 2006/06/29 19:36:49 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh

r819	r961
26	26	//
27	27	// $Id: G4SemiLogInterpolation.hh,v 1.4 2006/06/29 19:36:51 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh

-              r819
+              r961
 //
 //
 // $Id: G4ShellData.hh,v 1.5 2007/02/20 16:53:16 mantero Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ShellData.hh,v 1.7 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 public:
   G4ShellData(G4int minZ = 1, G4int maxZ = 100);
+  G4ShellData(G4int minZ = 1, G4int maxZ = 100, G4bool isOccupancy = false);
   ~G4ShellData();
 …
   G4int ShellId(G4int Z, G4int shellIndex) const;
+  const G4DataVector& ShellIdVector(G4int Z) const;
+  G4double ShellOccupancyProbability(G4int Z, G4int shellIndex) const;
+  const std::vector<G4double>& ShellIdVector(G4int Z) const;
   G4double BindingEnergy(G4int Z, G4int shellIndex) const;
+  void SetOccupancyData() { occupancyData = true; }
   void LoadData(const G4String& fileName);
   void PrintData() const;
+  // Randomly select a shell based on shell occupancy
+  G4int SelectRandomShell(G4int Z) const;
 private:
 …
   G4ShellData(const G4ShellData&);
+   G4int zMin;
+  const std::vector<G4double>& ShellVector(G4int Z) const;
+  G4int zMin;
   G4int zMax;
+  std::map<G4int,G4DataVector*,std::less<G4int> > idMap;
+  G4bool occupancyData;
+  std::map<G4int,std::vector<G4double>*,std::less<G4int> > idMap;
   std::map<G4int,G4DataVector*,std::less<G4int> > bindingMap;
   std::vector<G4int> nShells;
+  std::map<G4int,std::vector<G4double>*,std::less<G4int> > occupancyPdfMap;
 };

trunk/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh

-              r819
+              r961
 //
 //
 // $Id: G4ShellEMDataSet.hh,v 1.9 2007/10/15 08:31:49 pia Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ShellEMDataSet.hh,v 1.12 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 // -----------
 // 31 Jul 2001   MGP        Created
+//  9 Mar 2008   MGP        Cleaned up unreadable code modified by former developer
+//                          (Further clean-up needed)
 //
 // -------------------------------------------------------------------
 …
 // -------------------------------------------------------------------
 #ifndef   G4SHELLEMDATASET_HH
  #define  G4SHELLEMDATASET_HH 1
+#ifndef  G4SHELLEMDATASET_HH
+#define  G4SHELLEMDATASET_HH 1
  #include "globals.hh"
  #include "G4VEMDataSet.hh"
  #include <vector>
+#include "globals.hh"
+#include "G4VEMDataSet.hh"
+#include <vector>
  class G4VDataSetAlgorithm;
+class G4VDataSetAlgorithm;
+ class G4ShellEMDataSet : public G4VEMDataSet
+ {
+  public:
+   G4ShellEMDataSet(G4int argZ, G4VDataSetAlgorithm* argAlgorithm, G4double argUnitEnergies=MeV, G4double argUnitData=barn);
+   virtual ~G4ShellEMDataSet();
+class G4ShellEMDataSet : public G4VEMDataSet
+{
+public:
+  G4ShellEMDataSet(G4int Z,
+                   G4VDataSetAlgorithm* algo,
+                   G4double eUnit=MeV,
+                   G4double dataUnit=barn);
+  virtual ~G4ShellEMDataSet();
    virtual G4double FindValue(G4double argEnergy, G4int argComponentId=0) const;
+  virtual G4double FindValue(G4double energy, G4int componentId=0) const;
    virtual void PrintData(void) const;
+  virtual void PrintData(void) const;
    virtual const G4VEMDataSet*  GetComponent(G4int argComponentId) const { return components[argComponentId]; }
    virtual void AddComponent(G4VEMDataSet * argDataSet) { components.push_back(argDataSet); }
    virtual size_t NumberOfComponents(void) const { return components.size(); }
+  virtual const G4VEMDataSet*  GetComponent(G4int componentId) const { return components[componentId]; }
+  virtual void AddComponent(G4VEMDataSet* dataSet) { components.push_back(dataSet); }
+  virtual size_t NumberOfComponents(void) const { return components.size(); }
    virtual const G4DataVector& GetEnergies(G4int argComponentId) const { return GetComponent(argComponentId)->GetEnergies(0); }
    virtual const G4DataVector& GetData(G4int argComponentId) const { return GetComponent(argComponentId)->GetData(0); }
    virtual void SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int argComponentId);
+  virtual const G4DataVector& GetEnergies(G4int componentId) const { return GetComponent(componentId)->GetEnergies(0); }
+  virtual const G4DataVector& GetData(G4int componentId) const { return GetComponent(componentId)->GetData(0); }
+  virtual void SetEnergiesData(G4DataVector* energies, G4DataVector* data, G4int componentId);
+   virtual G4bool LoadData(const G4String & argFileName);
+   virtual G4bool SaveData(const G4String & argFileName) const;
+  virtual G4bool LoadData(const G4String& fileName);
+  virtual G4bool SaveData(const G4String& fileName) const;
+  virtual G4double RandomSelect(G4int /*componentId = 0*/) const { return -1.; };
+ protected:
+   G4double GetUnitEnergies() const { return unitEnergies; }
+   G4double GetUnitData() const { return unitData; }
+   const G4VDataSetAlgorithm* GetAlgorithm() const { return algorithm; }
+protected:
+  G4double GetUnitEnergies() const { return unitEnergies; }
+  G4double GetUnitData() const { return unitData; }
+  const G4VDataSetAlgorithm* GetAlgorithm() const { return algorithm; }
    void CleanUpComponents(void);
+  void CleanUpComponents(void);
+ private:
+   G4String FullFileName(const G4String & argFileName) const;
+private:
+  G4String FullFileName(const G4String& fileName) const;
    // Hide copy constructor and assignment operator
    G4ShellEMDataSet();
    G4ShellEMDataSet(const G4ShellEMDataSet & copy);
    G4ShellEMDataSet& operator=(const G4ShellEMDataSet & right);
+  // Hide copy constructor and assignment operator
+  G4ShellEMDataSet();
+  G4ShellEMDataSet(const G4ShellEMDataSet& copy);
+  G4ShellEMDataSet& operator=(const G4ShellEMDataSet& right);
    std::vector<G4VEMDataSet*> components;          // Owned pointers
+  std::vector<G4VEMDataSet*> components;          // Owned pointers
    G4int z;
+  G4int z;
    G4VDataSetAlgorithm* algorithm;           // Owned pointer
+  G4VDataSetAlgorithm* algorithm;           // Owned pointer
    G4double unitEnergies;
    G4double unitData;
  };
+  G4double unitEnergies;
+  G4double unitData;
+};
 #endif /* G4SHELLEMDATASET_HH */

trunk/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh

r819	r961
26	26	//
27	27	// $Id: G4VCrossSectionHandler.hh,v 1.14 2006/06/29 19:37:01 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh

r819	r961
26	26	//
27	27	// $Id: G4VDataSetAlgorithm.hh,v 1.7 2006/06/29 19:37:07 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh

-              r819
+              r961
 //
 //
 // $Id: G4VEMDataSet.hh,v 1.9 2007/10/15 08:31:49 pia Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEMDataSet.hh,v 1.12 2008/03/17 13:45:25 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 // -------------------------------------------------------------------
 #ifndef   G4VEMDATASET_HH
  #define  G4VEMDATASET_HH 1
+#ifndef  G4VEMDATASET_HH
+#define  G4VEMDATASET_HH 1
  #include "globals.hh"
  #include "G4DataVector.hh"
+#include "globals.hh"
+#include "G4DataVector.hh"
  class G4VEMDataSet
+ {
   public:
                                                 G4VEMDataSet() { }
    virtual                                     ~G4VEMDataSet() { }
+class G4VEMDataSet
+{
+public:
+  G4VEMDataSet() { }
+  virtual ~G4VEMDataSet() { }
    virtual G4double                             FindValue(G4double argEnergy, G4int argComponentId=0) const = 0;
+  virtual G4double FindValue(G4double x, G4int componentId = 0) const = 0;
    virtual void                                 PrintData(void) const = 0;
+  virtual void PrintData(void) const = 0;
    virtual const G4VEMDataSet *                 GetComponent(G4int argComponentId) const = 0;
    virtual void                                 AddComponent(G4VEMDataSet * argDataSet) = 0;
    virtual size_t                               NumberOfComponents(void) const = 0;
+  virtual const G4VEMDataSet* GetComponent(G4int componentId) const = 0;
+  virtual void AddComponent(G4VEMDataSet* dataSet) = 0;
+  virtual size_t NumberOfComponents(void) const = 0;
    virtual const G4DataVector &                 GetEnergies(G4int argComponentId) const = 0;
    virtual const G4DataVector &                 GetData(G4int argComponentId) const = 0;
    virtual void                                 SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int argComponent=0) = 0;
+  virtual const G4DataVector& GetEnergies(G4int componentId) const = 0;
+  virtual const G4DataVector& GetData(G4int componentId) const = 0;
+  virtual void SetEnergiesData(G4DataVector* x, G4DataVector* data, G4int component=0) = 0;
+   virtual G4bool                               LoadData(const G4String & argFileName) = 0;
+   virtual G4bool                               SaveData(const G4String & argFileName) const = 0;
+  virtual G4bool LoadData(const G4String& fileName) = 0;
+  virtual G4bool SaveData(const G4String& fileName) const = 0;
+  virtual G4double RandomSelect(G4int componentId = 0) const = 0;
   private:
    // Hide copy constructor and assignment operator
                                                 G4VEMDataSet(const G4VEMDataSet & copy);
    G4VEMDataSet &                               operator=(const G4VEMDataSet & right);
  };
+private:
+  // Hide copy constructor and assignment operator
+  G4VEMDataSet(const G4VEMDataSet& copy);
+  G4VEMDataSet& operator=(const G4VEMDataSet& right);
+};
 #endif /* G4VEMDATASET_HH */

trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh

r819	r961
25	25	//
26	26	// $Id: G4VLowEnergyDiscretePhotonProcess.hh,v 1.4 2006/06/29 19:37:13 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh

r819	r961
26	26	//
27	27	// $Id: G4VLowEnergyTestableDiscreteProcess.hh,v 1.3 2006/06/29 19:37:17 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

trunk/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh

r819	r961
26	26	//
27	27	// $Id: G4VRangeTest.hh,v 1.3 2006/06/29 19:37:21 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh

r819	r961
26	26	//
27	27	// $Id: G4VeLowEnergyLoss.hh,v 1.9 2006/06/29 19:37:23 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// 3.4.2000 Veronique Lefebure:

trunk/source/processes/electromagnetic/lowenergy/include/G4WaterExcitationStructure.hh

r819	r961
26	26	//
27	27	// $Id: G4WaterExcitationStructure.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4WaterIonisationStructure.hh

r819	r961
26	26	//
27	27	// $Id: G4WaterIonisationStructure.hh,v 1.1 2007/11/08 20:38:40 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh

r819	r961
25	25	//
26	26	// $Id: G4eBremsstrahlungSpectrum.hh,v 1.8 2006/06/29 19:37:33 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionExcitationEmfietzoglou.hh

r819	r961
26	26	//
27	27	// $Id: G4eCrossSectionExcitationEmfietzoglou.hh,v 1.1 2007/05/02 17:18:48 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionScreenedRutherford.hh

r819	r961
26	26	//
27	27	// $Id: G4eCrossSectionScreenedRutherford.hh,v 1.2 2007/10/12 12:26:34 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eIonisationCrossSectionHandler.hh,v 1.6 2006/06/29 19:37:36 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eIonisationCrossSectionHandler.hh,v 1.7 2009/01/29 08:13:27 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // Modified:
 // 10 Oct 2001  M.G. Pia        Revision to improve code quality and consistency with design
+//
+// 28 Jan 2009  L.Pandola    Added public method to make a easier migration of
+//                           G4LowEnergyIonisation to G4LivermoreIonisationModel
 // -------------------------------------------------------------------
 …
   ~G4eIonisationCrossSectionHandler();
+  G4double GetCrossSectionAboveThresholdForElement(G4double energy,
+                                                   G4double cutEnergy,
+                                                   G4int Z);
 protected:

trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh

r819	r961
26	26	//
27	27	// $Id: G4eIonisationParameters.hh,v 1.8 2006/06/29 19:37:38 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh

r819	r961
25	25	//
26	26	// $Id: G4eIonisationSpectrum.hh,v 1.7 2006/06/29 19:37:40 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh

r819	r961
26	26	//
27	27	// $Id: G4eLowEnergyLoss.hh,v 1.14 2006/06/29 19:37:42 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc

r819	r961
26	26	//
27	27	// $Id: G4eLowEnergyLoss.icc,v 1.8 2006/06/29 19:37:44 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// ---------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh

r819	r961
26	26	//
27	27	// $Id: G4hLowEnergyLoss.hh,v 1.17 2006/06/29 19:37:58 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// $Id:

trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc

r819	r961
26	26	//
27	27	// $Id: G4hLowEnergyLoss.icc,v 1.3 2006/06/29 19:38:00 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// $Id:

trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh

r819	r961
45	45	// -------------------------------------------------------------------
46	46	// $Id: G4hShellCrossSectionDoubleExp.hh,v 1.3 2006/06/29 19:38:12 gunter Exp $
47		// GEANT4 tag $Name: $
	47	// GEANT4 tag $Name: geant4-09-02-ref-02 $
48	48
49	49	#ifndef G4HSHELLCROSSSECTIONDOUBLEEXP_HH

trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh

r819	r961
40	40	// -------------------------------------------------------------------
41	41	// $Id: G4hShellCrossSectionDoubleExpData.hh,v 1.3 2006/06/29 19:38:14 gunter Exp $
42		// GEANT4 tag $Name: $
	42	// GEANT4 tag $Name: geant4-09-02-ref-02 $
43	43
44	44	#ifndef G4hShellCrossSectionDoubleExpData_HH

trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh

r819	r961
45	45	// -------------------------------------------------------------------
46	46	// $Id: G4hShellCrossSectionExp.hh,v 1.3 2006/06/29 19:38:16 gunter Exp $
47		// GEANT4 tag $Name: $
	47	// GEANT4 tag $Name: geant4-09-02-ref-02 $
48	48
49	49	#ifndef G4HSHELLCROSSSECTIONEXP_HH

trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh

r819	r961
38	38	// -------------------------------------------------------------------
39	39	// $Id: G4hShellCrossSectionExpData.hh,v 1.3 2006/06/29 19:38:18 gunter Exp $
40		// GEANT4 tag $Name: $
	40	// GEANT4 tag $Name: geant4-09-02-ref-02 $
41	41
42	42	#ifndef G4hShellCrossSectionExpData_HH

trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc

r819	r961
26	26	//
27	27	// $Id: G4AtomicDeexcitation.cc,v 1.11
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicShell.cc

r819	r961
26	26	//
27	27	// $Id: G4AtomicShell.cc,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc

-              r819
+              r961
 //
 // $Id: G4AtomicTransitionManager.cc,v 1.2 ????
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
 …
         G4double totalRadTransProb = 0;
+      for (size_t j = 1; j<transProb.size(); j++)
+        for (size_t j = 0; j<transProb.size(); j++) // AM -- corrected, it was 1
+        {
           totalRadTransProb = totalRadTransProb + transProb[j];
 …
       G4double totalRadTransProb = 0;
       for(size_t j = 1; j<transProb.size(); j++)
+      for(size_t j = 0; j<transProb.size(); j++) // AM -- Corrected, was 1
+        {
           totalRadTransProb = totalRadTransProb + transProb[j];

trunk/source/processes/electromagnetic/lowenergy/src/G4AugerData.cc

-              r819
+              r961
   for (G4int element = 6; element < 101; element++)
+  for (G4int element = 6; element < 100; element++)
+    {
+      if(nMaterials == 0 || activeZ.contains(element)) {
+        augerTransitionTable.insert(trans_Table::value_type(element,LoadData(element)));
+        G4cout << "G4AugerData for Element no. " << element << " are loaded" << G4endl;
+      //      PrintData(element);
+      }
+    }
+  G4cout << "AugerTransitionTable complete"<< G4endl;
+      //      if(nMaterials == 0 || activeZ.contains(element)) {
+      augerTransitionTable.insert(trans_Table::value_type(element,LoadData(element)));
+      //        G4cout << "G4AugerData for Element no. " << element << " are loaded" << G4endl;
+      // G4cout << "G4AugerData for Element no. " << element << " are loaded" << G4endl;
+      G4cout << "AugerTransitionTable complete"<< G4endl;
+    }
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc

r819	r961
25	25	//
26	26	// $Id: G4BremsstrahlungCrossSectionHandler.cc,v 1.9 2006/06/29 19:38:42 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc

r819	r961
26	26	//
27	27	// $Id: G4BremsstrahlungParameters.cc,v 1.19 2006/06/29 19:38:44 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc

-              r819
+              r961
 //
 //
 // $Id: G4CompositeEMDataSet.cc,v 1.9 2006/06/29 19:38:46 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4CompositeEMDataSet.cc,v 1.13 2008/03/17 13:40:53 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 #include <sstream>
+                                                G4CompositeEMDataSet :: G4CompositeEMDataSet(G4VDataSetAlgorithm* argAlgorithm, G4double argUnitEnergies, G4double argUnitData, G4int argMinZ, G4int argMaxZ)
+:
+ algorithm(argAlgorithm),
+ unitEnergies(argUnitEnergies),
+ unitData(argUnitData),
+ minZ(argMinZ),
+ maxZ(argMaxZ)
+G4CompositeEMDataSet::G4CompositeEMDataSet(G4VDataSetAlgorithm* argAlgorithm,
+                                           G4double argUnitEnergies,
+                                           G4double argUnitData,
+                                           G4int argMinZ,
+                                           G4int argMaxZ)
+  :
+  algorithm(argAlgorithm),
+  unitEnergies(argUnitEnergies),
+  unitData(argUnitData),
+  minZ(argMinZ),
+  maxZ(argMaxZ)
+{
  if (algorithm == 0)
   G4Exception("G4CompositeEMDataSet::G4CompositeEMDataSet - interpolation == 0");
+  if (algorithm == 0)
+    G4Exception("G4CompositeEMDataSet::G4CompositeEMDataSet - interpolation == 0");
+}
                                                 G4CompositeEMDataSet :: ~G4CompositeEMDataSet()
+G4CompositeEMDataSet::~G4CompositeEMDataSet()
+{
+ CleanUpComponents();
+  CleanUpComponents();
+  if (algorithm) delete algorithm;
+}
+ if (algorithm)
+  delete algorithm;
+G4double G4CompositeEMDataSet::FindValue(G4double argEnergy, G4int argComponentId) const
+{
+  const G4VEMDataSet* component(GetComponent(argComponentId));
+  if (component) return component->FindValue(argEnergy);
+  std::ostringstream message;
+  message << "G4CompositeEMDataSet::FindValue - component " << argComponentId << " not found";
+  G4Exception(message.str().c_str());
+  return 0.;
+}
+void G4CompositeEMDataSet::PrintData(void) const
+{
+  const size_t n(NumberOfComponents());
+  G4cout << "The data set has " << n << " components" << G4endl;
+  G4cout << G4endl;
+  size_t i(0);
+  while (i<n)
+    {
+      G4cout << "--- Component " << i << " ---" << G4endl;
+      GetComponent(i)->PrintData();
+      i++;
+    }
+}
+void G4CompositeEMDataSet::SetEnergiesData(G4DataVector* argEnergies, G4DataVector* argData, G4int argComponentId)
+{
+  G4VEMDataSet * component(components[argComponentId]);
+  if (component)
+    {
+      component->SetEnergiesData(argEnergies, argData, 0);
+      return;
+    }
+  std::ostringstream message;
+  message << "G4CompositeEMDataSet::SetEnergiesData - component " << argComponentId << " not found";
+  G4Exception(message.str().c_str());
+}
+G4bool G4CompositeEMDataSet::LoadData(const G4String& argFileName)
+{
+  CleanUpComponents();
+  for (G4int z(minZ); z<maxZ; z++)
+    {
+      G4VEMDataSet* component = new G4EMDataSet(z, algorithm->Clone(), unitEnergies, unitData);
+      if (!component->LoadData(argFileName))
+        {
+          delete component;
+          return false;
+        }
+      AddComponent(component);
+    }
+  return true;
+}
+G4bool G4CompositeEMDataSet::SaveData(const G4String& argFileName) const
+{
+  for (G4int z=minZ; z<maxZ; z++)
+    {
+      const G4VEMDataSet* component(GetComponent(z-minZ));
+      if (!component)
+        {
+          std::ostringstream message;
+          message << "G4CompositeEMDataSet::SaveData - component " << (z-minZ) << " not found";
+          G4Exception(message.str().c_str());
+        }
+      if (!component->SaveData(argFileName))
+        return false;
+    }
+  return true;
+}
+G4double                                        G4CompositeEMDataSet :: FindValue(G4double argEnergy, G4int argComponentId) const
+void G4CompositeEMDataSet::CleanUpComponents(void)
+{
+ const G4VEMDataSet * component(GetComponent(argComponentId));
+ if (component)
+  return component->FindValue(argEnergy);
+ std::ostringstream message;
+ message << "G4CompositeEMDataSet::FindValue - component " << argComponentId << " not found";
+ G4Exception(message.str().c_str());
+ return 0.;
+  while (!components.empty())
+    {
+      if (components.back())
+        delete components.back();
+      components.pop_back();
+    }
+}
+void                                            G4CompositeEMDataSet :: PrintData(void) const
+G4double G4CompositeEMDataSet::RandomSelect(G4int componentId) const
+{
+ const size_t n(NumberOfComponents());
+ G4cout << "The data set has " << n << " components" << G4endl;
+ G4cout << G4endl;
+ size_t i(0);
+ while (i<n)
+ {
+  G4cout << "--- Component " << i << " ---" << G4endl;
+  GetComponent(i)->PrintData();
+  i++;
+ }
+  G4double value = 0.;
+  if (componentId >= 0 && componentId < (G4int)components.size())
+    {
+      const G4VEMDataSet* dataSet = GetComponent(componentId);
+      value = dataSet->RandomSelect();
+    }
+  return value;
+}
-void                                            G4CompositeEMDataSet :: SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int argComponentId)
+{
- G4VEMDataSet * component(components[argComponentId]);
- if (component)
+ {
-  component->SetEnergiesData(argEnergies, argData, 0);
-  return;
+ }
- std::ostringstream message;
- message << "G4CompositeEMDataSet::SetEnergiesData - component " << argComponentId << " not found";
- G4Exception(message.str().c_str());
+}
-G4bool                                          G4CompositeEMDataSet :: LoadData(const G4String & argFileName)
+{
- CleanUpComponents();
- for (G4int z(minZ); z<maxZ; z++)
+ {
-  G4VEMDataSet * component=new G4EMDataSet(z, algorithm->Clone(), unitEnergies, unitData);
-  if (!component->LoadData(argFileName))
+  {
-   delete component;
-   return false;
+  }
-  AddComponent(component);
+ }
- return true;
+}
-G4bool                                          G4CompositeEMDataSet :: SaveData(const G4String & argFileName) const
+{
- for (G4int z(minZ); z<maxZ; z++)
+ {
-  const G4VEMDataSet * component(GetComponent(z-minZ));
-  if (!component)
+  {
-   std::ostringstream message;
-   message << "G4CompositeEMDataSet::SaveData - component " << (z-minZ) << " not found";
-   G4Exception(message.str().c_str());
+  }
-  if (!component->SaveData(argFileName))
-   return false;
+ }
- return true;
+}
-void                                            G4CompositeEMDataSet :: CleanUpComponents(void)
+{
- while (!components.empty())
+ {
-  if (components.back())
-   delete components.back();
-  components.pop_back();
+ }
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecrease.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeDecrease.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeDecrease.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionChargeDecrease.hh"
+#include "G4Track.hh"
+#include "G4DynamicParticle.hh"
+#include "G4Proton.hh"
+#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeDecrease::G4CrossSectionChargeDecrease()
+{
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  name = "ChargeDecrease";
   lowEnergyLimitDefault = 1 * keV;
   highEnergyLimitDefault = 10 * MeV;
 …
   if (protonDef != 0)
+    {
       proton = protonDef->GetParticleName();
       lowEnergyLimit[proton] = 1. * keV;
       highEnergyLimit[proton] = 10. * keV;
+    }
+  {
+    proton = protonDef->GetParticleName();
+    lowEnergyLimit[proton] = 1. * keV;
+    highEnergyLimit[proton] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeDecrease Constructor: proton is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeDecrease Constructor: proton is not defined");
+  }
   if (alphaPlusPlusDef != 0)
+    {
       alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
       lowEnergyLimit[alphaPlusPlus] = 1. * keV;
       highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+    }
+  {
+    alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlusPlus] = 1. * keV;
+    highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeDecrease Constructor: alphaPlusPlus is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeDecrease Constructor: alphaPlusPlus is not defined");
+  }
   if (alphaPlusDef != 0)
+    {
       alphaPlus = alphaPlusDef->GetParticleName();
       lowEnergyLimit[alphaPlus] = 1. * keV;
       highEnergyLimit[alphaPlus] = 10. * MeV;
+    }
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlus] = 1. * keV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeDecrease Constructor: alphaPlus is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeDecrease Constructor: alphaPlus is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeDecrease::~G4CrossSectionChargeDecrease()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeDecrease::CrossSection(const G4Track& track)
 …
     G4Exception("G4CrossSectionChargeDecrease: attempting to calculate cross section for wrong particle");
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
       lowLim = pos1->second;
+    }
+  {
+    lowLim = pos1->second;
+  }
-  // Upper limit
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
+      highLim = pos2->second;
+    }
+  //
+  {
+    highLim = pos2->second;
+  }
   G4double crossSection(0.);
   if (k >= lowLim && k <= highLim)
+    {
+  {
       crossSection = partialCrossSection.Sum(k,particleDefinition);
+    }
+  }
   return crossSection;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecreasePartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeDecreasePartial.cc,v 1.1 2007/11/08 18:25:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+// 08 Nov 2007  MGP               Got code from S.I.; added variable initialisation to avoid compilation warnings
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeDecreasePartial.cc,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionChargeDecreasePartial.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeDecreasePartial::G4CrossSectionChargeDecreasePartial()
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeDecreasePartial::~G4CrossSectionChargeDecreasePartial()
+{ }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeDecreasePartial::CrossSection(G4double k, G4int index,
                                                            const G4ParticleDefinition* particleDefinition)
 …
   if (x1[index][particleTypeIndex]<x0[index][particleTypeIndex])
+    {
+  {
       //
       // if x1 < x0 means that x1 and b1 will be calculated with the following formula (this piece of code is run on all alphas and not on protons)
 …
         + b0[index][particleTypeIndex] - c0[index][particleTypeIndex] * std::pow(x1[index][particleTypeIndex]
                                                                                  - x0[index][particleTypeIndex], d0[index][particleTypeIndex]);
+    }
+  }
   G4double x(std::log10(k/eV));
 …
   while (i>0)
+    {
+  {
       i--;
       values[i]=CrossSection(k, i, particleDefinition);
       value+=values[i];
+    }
+  }
   value*=G4UniformRand();
 …
   i=n;
   while (i>0)
+    {
+  {
       i--;
 …
       value-=values[i];
+    }
+  }
   delete[] values;
 …
   return i;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeDecreasePartial::Sum(G4double k, const G4ParticleDefinition* particleDefinition)
 …
   for (G4int i=0; i<numberOfPartialCrossSections[particleTypeIndex]; i++)
+    {
       totalCrossSection += CrossSection(k,i,particleDefinition);
+    }
+  {
+    totalCrossSection += CrossSection(k,i,particleDefinition);
+  }
   return totalCrossSection;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncrease.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeIncrease.cc,v 1.3 2007/12/10 16:31:21 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeIncrease.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionChargeIncrease.hh"
+#include "G4Track.hh"
+#include "G4DynamicParticle.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeIncrease::G4CrossSectionChargeIncrease()
+{
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  name = "ChargeIncrease";
   lowEnergyLimitDefault = 1 * keV;
   highEnergyLimitDefault = 10 * MeV;
 …
   if (hydrogenDef != 0)
+    {
       hydrogen = hydrogenDef->GetParticleName();
       lowEnergyLimit[hydrogen] = 1. * keV;
       highEnergyLimit[hydrogen] = 10. * MeV;
+    }
+  {
+    hydrogen = hydrogenDef->GetParticleName();
+    lowEnergyLimit[hydrogen] = 1. * keV;
+    highEnergyLimit[hydrogen] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeIncrease Constructor: hydrogen is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeIncrease Constructor: hydrogen is not defined");
+  }
   if (alphaPlusDef != 0)
+    {
       alphaPlus = alphaPlusDef->GetParticleName();
       lowEnergyLimit[alphaPlus] = 1. * keV;
       highEnergyLimit[alphaPlus] = 10. * MeV;
+    }
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlus] = 1. * keV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeIncrease Constructor: alphaPlus is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeIncrease Constructor: alphaPlus is not defined");
+  }
   if (heliumDef != 0)
+    {
       helium = heliumDef->GetParticleName();
       lowEnergyLimit[helium] = 1. * keV;
       highEnergyLimit[helium] = 10. * MeV;
+    }
+  {
+    helium = heliumDef->GetParticleName();
+    lowEnergyLimit[helium] = 1. * keV;
+    highEnergyLimit[helium] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionChargeIncrease Constructor: helium is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionChargeIncrease Constructor: helium is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeIncrease::~G4CrossSectionChargeIncrease()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeIncrease::CrossSection(const G4Track& track)
 …
     G4Exception("G4CrossSectionChargeIncrease: attempting to calculate cross section for wrong particle");
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
       lowLim = pos1->second;
+    }
+  {
+    lowLim = pos1->second;
+  }
-  // Upper limit
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
       highLim = pos2->second;
+    }
+  {
+    highLim = pos2->second;
+  }
   G4double totalCrossSection = 0.;
   if (k >= lowLim && k <= highLim)
+    {
+  {
       //HYDROGEN
       if (particleDefinition == instance->GetIon("hydrogen"))
+        {
+      {
           const  G4double aa = 2.835;
           const  G4double bb = 0.310;
 …
           G4double sigmah = temp * (aa * std::log(1.0 + x) + bb) / x;
           totalCrossSection = 1.0/(1.0/sigmal + 1.0/sigmah) *m*m;
+        }
+      }
       else
+        {
+      {
           totalCrossSection = partialCrossSection.Sum(k,particleDefinition);
+        }
+    }
+      }
+  }
   return totalCrossSection;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncreasePartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionChargeIncreasePartial.cc,v 1.1 2007/11/08 18:25:25 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionChargeIncreasePartial.cc,v 1.2 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionChargeIncreasePartial.hh"
+#include "G4DynamicParticle.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeIncreasePartial::G4CrossSectionChargeIncreasePartial()
+{
   //ALPHA+
   f0[0][0]=1.;
   a0[0][0]=2.25;
 …
   numberOfPartialCrossSections[1]=2;
+}
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionChargeIncreasePartial::~G4CrossSectionChargeIncreasePartial()
 { }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeIncreasePartial::CrossSection(G4double k, G4int index,
                                                            const G4ParticleDefinition* particleDefinition)
 …
   if (x1[index][particleTypeIndex]<x0[index][particleTypeIndex])
+    {
+  {
       //
       // if x1 < x0 means that x1 and b1 will be calculated with the following formula (this piece of code is run on all alphas and not on protons)
 …
       x1[index][particleTypeIndex]=x0[index][particleTypeIndex] + std::pow((a0[index][particleTypeIndex] - a1[index][particleTypeIndex]) / (c0[index][particleTypeIndex] * d0[index][particleTypeIndex]), 1. / (d0[index][particleTypeIndex] - 1.));
       b1[index][particleTypeIndex]=(a0[index][particleTypeIndex] - a1[index][particleTypeIndex]) * x1[index][particleTypeIndex] + b0[index][particleTypeIndex] - c0[index][particleTypeIndex] * std::pow(x1[index][particleTypeIndex] - x0[index][particleTypeIndex], d0[index][particleTypeIndex]);
+    }
+  }
   G4double x(std::log10(k/eV));
 …
   return f0[index][particleTypeIndex] * std::pow(10., y)*m*m;
+}
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionChargeIncreasePartial::RandomSelect(G4double k,
 …
   while (i>0)
+    {
+  {
       i--;
       values[i]=CrossSection(k, i, particleDefinition);
       value+=values[i];
+    }
+  }
   value*=G4UniformRand();
 …
   i=n;
   while (i>0)
+    {
+  {
       i--;
 …
       value-=values[i];
+    }
+  }
   delete[] values;
 …
   return i;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionChargeIncreasePartial::Sum(G4double k, const G4ParticleDefinition* particleDefinition)
 …
   for (G4int i=0; i<numberOfPartialCrossSections[particleTypeIndex]; i++)
+    {
       totalCrossSection += CrossSection(k,i,particleDefinition);
+    }
+  {
+    totalCrossSection += CrossSection(k,i,particleDefinition);
+  }
   return totalCrossSection;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherford.cc

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionElasticScreenedRutherford.cc,v 1.1 2007/10/12 23:11:41 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBorn.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationBorn.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationBorn.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationBorn.hh"
-#include "G4Track.hh"
-#include "G4DynamicParticle.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4Electron.hh"
-#include "G4LogLogInterpolation.hh"
+#include "Randomize.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationBorn::G4CrossSectionExcitationBorn()
+{
+  // ---- MGP ---- Limits to be checked: current values are just temporary for testing purpose
+  name = "ExcitationBorn";
+  lowEnergyLimit = 1. * keV;
+  lowEnergyLimit = 500. * keV;
   highEnergyLimit = 10 * MeV;
   table = 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationBorn::~G4CrossSectionExcitationBorn()
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationBorn::CrossSection(const G4Track& track)
+{
+  // Lazy initialisation: load cross section tables in memory the first time access to them is required
   G4double sigma = 0.;
   if (table == 0)
+    {
+      // Load tables
+      // ---- MGP ----
+      table = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,(1e-22/3.343)*m*m );
+      table->LoadData("dna/sigma_excitation_p_born");
+      // ---- MGP ---- Temporary
+      table->PrintData();
+    }
+  {
+    table = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,(1e-22/3.343)*m*m );
+    table->LoadData("dna/sigma_excitation_p_born");
+  }
   const G4DynamicParticle* particle = track.GetDynamicParticle();
   G4double k = particle->GetKineticEnergy();
   if (k > lowEnergyLimit && k < highEnergyLimit)
+    {
       sigma = table->FindValue(k); // no electron interaction ---- MGP ---- What does this mean?
+    }
+  if (k >= lowEnergyLimit && k <= highEnergyLimit)
+  {
+    sigma = table->FindValue(k);
+  }
   return sigma;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBornPartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationBornPartial.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationBornPartial.cc,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationBornPartial.hh"
-#include "G4Track.hh"
-#include "G4DynamicParticle.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4Electron.hh"
-#include "G4LogLogInterpolation.hh"
+#include "Randomize.hh"
+#include <deque>
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationBornPartial::G4CrossSectionExcitationBornPartial()
+{
   table = 0;
-  // nLevels = waterExcitation.NumberOfLevels();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationBornPartial::~G4CrossSectionExcitationBornPartial()
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionExcitationBornPartial::RandomSelect(G4double k)
+{
-  // Lazy initialisation: load cross section tables in memory the first time access to them is required
   G4int level = 0;
   if (table == 0)
+    {
+      // Load tables
+      // ---- MGP ----
+      table = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,(1e-22/3.343)*m*m );
+      table->LoadData("dna/sigma_excitation_p_born");
+      // ---- MGP ---- Temporary
+      table->PrintData();
+    }
+  {
+    table = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,(1e-22/3.343)*m*m );
+    table->LoadData("dna/sigma_excitation_p_born");
+  }
   G4double* valuesBuffer = new G4double[table->NumberOfComponents()];
 …
   while (i>0)
+    {
       i--;
       valuesBuffer[i] = table->GetComponent(i)->FindValue(k);
       value += valuesBuffer[i];
+    }
+  {
+    i--;
+    valuesBuffer[i] = table->GetComponent(i)->FindValue(k);
+    value += valuesBuffer[i];
+  }
   value *= G4UniformRand();
 …
   while (i > 0)
+  {
+    i--;
+    if (valuesBuffer[i] > value)
+    {
+      i--;
+      if (valuesBuffer[i] > value)
+        {
+          delete[] valuesBuffer;
+          return i;
+        }
+      delete[] valuesBuffer;
+      return i;
+    }
       value -= valuesBuffer[i];
+    }
+  }
-  // It should never end up here
-  // ---- MGP ---- Is the following line really necessary?
   if (valuesBuffer) delete[] valuesBuffer;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglou.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationEmfietzoglou.cc,v 1.2 2007/10/15 08:36:35 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationEmfietzoglou.cc,v 1.5 2008/12/05 11:58:16 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationEmfietzoglou.hh"
+#include "G4Track.hh"
+#include "G4DynamicParticle.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationEmfietzoglou::G4CrossSectionExcitationEmfietzoglou()
+{
+  name = "CrossSectionExcitationEmfietzoglou";
+  lowEnergyLimit = 7.4 * eV;
+  lowEnergyLimit = 8.23 * eV;
   highEnergyLimit = 10. * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationEmfietzoglou::~G4CrossSectionExcitationEmfietzoglou()
 { }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationEmfietzoglou::CrossSection(const G4Track& track)
 …
   G4double k = particle->GetKineticEnergy();
-  // Cross section = 0 outside the energy validity limits set in the constructor
-  // ---- MGP ---- Better handling of these limits to be set in a following design iteration
   G4double sigma = 0.;
   if (k > lowEnergyLimit && k < highEnergyLimit) sigma = partialCrossSection.Sum(k);
+  if (k >= lowEnergyLimit && k <= highEnergyLimit) sigma = partialCrossSection.Sum(k);
   return sigma;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglouPartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationEmfietzoglouPartial.cc,v 1.2 2007/12/10 16:31:26 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationEmfietzoglouPartial.cc,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
-#include "G4Track.hh"
-#include "G4DynamicParticle.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4Electron.hh"
+#include "Randomize.hh"
+#include <deque>
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationEmfietzoglouPartial::G4CrossSectionExcitationEmfietzoglouPartial()
+{
   nLevels = waterExcitation.NumberOfLevels();
-  //G4cout << "Water excitation energy: number of levels = " << nLevels << G4endl;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationEmfietzoglouPartial::~G4CrossSectionExcitationEmfietzoglouPartial()
 { }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationEmfietzoglouPartial::CrossSection(G4double t, G4int level)
+{
 …
   // Aj, Bj, Cj & Pj are parameters that can be found in Emfietzoglou's papers
   //
-  //
   // From Phys. Med. Biol. 48 (2003) 2355-2371, D.Emfietzoglou,
   // Monte Carlo Simulation of the energy loss of low energy electrons in liquid Water
+  //
   // Scaling for macroscopic cross section: number of water moleculs per unit volume
+  // (capra) const G4double sigma0 = (10. / 3.343e22) * cm2;
+  // const G4double sigma0 = (10. / 3.343e22) * cm2;
   const G4double density = 3.34192e+19 * mm3;
 …
   G4double exc = waterExcitation.ExcitationEnergy(level);
+  // G4cout << "Water excitation energy " << exc/keV << " level = " << level << G4endl;
   if (t >= exc)
+    {
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionExcitationEmfietzoglouPartial::RandomSelect(G4double k)
+{
 …
   std::deque<double> values;
   // ---- MGP ---- The following algorithm is wrong: it works is the cross section
+  // ---- MGP ---- The following algorithm is wrong: it works if the cross section
   // is a monotone increasing function.
   // The algorithm should be corrected by building the cumulative function
 …
   while (i > 0)
+    {
       i--;
       G4double partial = CrossSection(k,i);
       values.push_front(partial);
       value += partial;
+    }
+  {
+    i--;
+    G4double partial = CrossSection(k,i);
+    values.push_front(partial);
+    value += partial;
+  }
     value *= G4UniformRand();
+  value *= G4UniformRand();
     i = nLevels;
+  i = nLevels;
     while (i > 0)
+      {
         i--;
         if (values[i] > value) return i;
         value -= values[i];
+      }
+  while (i > 0)
+  {
+    i--;
+    if (values[i] > value) return i;
+    value -= values[i];
+  }
     return 0;
+  return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationEmfietzoglouPartial::Sum(G4double k)
 …
   for (G4int i=0; i<nLevels; i++)
+    {
       totalCrossSection += CrossSection(k,i);
+    }
+  {
+    totalCrossSection += CrossSection(k,i);
+  }
   return totalCrossSection;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.3 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationMillerGreen.hh"
+#include "G4Track.hh"
+#include "G4DynamicParticle.hh"
+#include "G4Proton.hh"
+#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationMillerGreen::G4CrossSectionExcitationMillerGreen()
+{
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  name = "ExcitationMillerGreen";
   lowEnergyLimitDefault = 10 * eV;
   highEnergyLimitDefault = 10 * MeV;
 …
   if (protonDef != 0)
+    {
       proton = protonDef->GetParticleName();
       lowEnergyLimit[proton] = 10. * eV;
       highEnergyLimit[proton] = 500. * keV;
+    }
+  {
+    proton = protonDef->GetParticleName();
+    lowEnergyLimit[proton] = 10. * eV;
+    highEnergyLimit[proton] = 500. * keV;
+  }
   else
+    {
       G4Exception("G4CrossSectionExcitationMillerGreen Constructor: proton is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: proton is not defined");
+  }
   if (alphaPlusPlusDef != 0)
+    {
       alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
       lowEnergyLimit[alphaPlusPlus] = 1. * keV;
       highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+    }
+  {
+    alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlusPlus] = 1. * keV;
+    highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+  }
   else
+    {
+  {
       G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlusPlus is not defined");
+    }
+  }
   if (alphaPlusDef != 0)
+    {
       alphaPlus = alphaPlusDef->GetParticleName();
       lowEnergyLimit[alphaPlus] = 1. * keV;
       highEnergyLimit[alphaPlus] = 10. * MeV;
+    }
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlus] = 1. * keV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+  }
   else
+    {
       G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlus is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlus is not defined");
+  }
   if (heliumDef != 0)
+    {
       helium = heliumDef->GetParticleName();
       lowEnergyLimit[helium] = 1. * keV;
       highEnergyLimit[helium] = 10. * MeV;
+    }
+  {
+    helium = heliumDef->GetParticleName();
+    lowEnergyLimit[helium] = 1. * keV;
+    highEnergyLimit[helium] = 10. * MeV;
+  }
   else
+    {
+      G4Exception("G4CrossSectionExcitationMillerGreen Constructor: helium is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: helium is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationMillerGreen::~G4CrossSectionExcitationMillerGreen()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreen::CrossSection(const G4Track& track)
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
       lowLim = pos1->second;
+    }
+  {
+    lowLim = pos1->second;
+  }
-  // Upper limit
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
       highLim = pos2->second;
+    }
+  {
+    highLim = pos2->second;
+  }
-  //
   const G4ParticleDefinition* particleDefinition = track.GetDefinition();
 …
   if (k >= lowLim && k <= highLim)
+  {
+    crossSection = partialCrossSection.Sum(k,particleDefinition);
+    G4DNAGenericIonsManager *instance;
+    instance = G4DNAGenericIonsManager::Instance();
+    // add ONE or TWO electron-water excitation for alpha+ and helium
+    if ( particleDefinition == instance->GetIon("alpha+")
+         ||
+         particleDefinition == instance->GetIon("helium")
+       )
+    {
-      crossSection = partialCrossSection.Sum(k,particleDefinition);
-      G4DNAGenericIonsManager *instance;
-      instance = G4DNAGenericIonsManager::Instance();
-      // add ONE or TWO electron-water excitation for alpha+ and helium
-      if ( particleDefinition == instance->GetIon("alpha+")
-           ||
-           particleDefinition == instance->GetIon("helium")
+           )
+        {
           G4CrossSectionExcitationEmfietzoglouPartial * excitationXS =
             new G4CrossSectionExcitationEmfietzoglouPartial();
           G4double sigmaExcitation=0;
           if (k*0.511/3728 > 7.4*eV && k*0.511/3728 < 10*keV) sigmaExcitation = excitationXS->Sum(k*0.511/3728);
 …
           if ( particleDefinition == instance->GetIon("alpha+") )
             crossSection = crossSection +  sigmaExcitation ;
           if ( particleDefinition == instance->GetIon("helium") )
             crossSection = crossSection + 2*sigmaExcitation ;
           delete excitationXS;
+        }
+    }
+    }
+  }
   return crossSection;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreenPartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionExcitationMillerGreenPartial.cc,v 1.1 2007/11/08 19:57:23 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionExcitationMillerGreenPartial.cc,v 1.3 2009/01/20 07:40:53 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionExcitationMillerGreenPartial.hh"
+#include "G4Track.hh"
+#include "G4DynamicParticle.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Proton.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
+#include "Randomize.hh"
+#include <deque>
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationMillerGreenPartial::G4CrossSectionExcitationMillerGreenPartial()
+{
   nLevels = waterExcitation.NumberOfLevels();
-  //G4cout << "Water excitation energy: number of levels = " << nLevels << G4endl;
   //PROTON
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionExcitationMillerGreenPartial::~G4CrossSectionExcitationMillerGreenPartial()
+{ }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::CrossSection(G4double k, G4int excitationLevel,
                                                                   const G4ParticleDefinition* particleDefinition)
 …
   tCorrected = k * kineticEnergyCorrection[particleTypeIndex];
+  // Assume that the material is water; proper algorithm to calculate correctly for any material to be inserted here
+  // SI - added protection
+  if (tCorrected < waterExcitation.ExcitationEnergy(excitationLevel)) return 0;
+  //
   G4int z = 10;
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionExcitationMillerGreenPartial::RandomSelect(G4double k,
                                                                const G4ParticleDefinition* particle)
 …
   std::deque<double> values;
   // ---- MGP ---- The following algorithm is wrong: it works is the cross section
+  // ---- MGP ---- The following algorithm is wrong: it works if the cross section
   // is a monotone increasing function.
   // The algorithm should be corrected by building the cumulative function
 …
   // ELECTRON CORRECTION
+  if ( particle == instance->GetIon("alpha++"))
+    {  while (i > 0)
+      {
+  if ( particle == instance->GetIon("alpha++")||
+       particle == G4Proton::ProtonDefinition())
+  {  while (i > 0)
+     {
         i--;
         G4double partial = CrossSection(k,i,particle);
         values.push_front(partial);
         value += partial;
+      }
     value *= G4UniformRand();
+     }
+     value *= G4UniformRand();
     i = nLevels;
     while (i > 0)
+      {
+     i = nLevels;
+     while (i > 0)
+     {
         i--;
         if (values[i] > value) return i;
         value -= values[i];
+      }
+    }
+  //
+     }
+  }
   // add ONE or TWO electron-water excitation for alpha+ and helium
 …
        ||
        particle == instance->GetIon("helium")
+       )
+     )
+  {
+    while (i>0)
+    {
-      while (i>0)
+        {
           i--;
 …
           value += partial;
           delete excitationXS;
+        }
       value*=G4UniformRand();
       i=5;
       while (i>0)
+        {
+    }
+    value*=G4UniformRand();
+    i=5;
+    while (i>0)
+    {
           i--;
 …
           value-=values[i];
+        }
+    }
+    }
+  }
   //
   return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::Sum(G4double k, const G4ParticleDefinition* particle)
+{
 …
   for (G4int i=0; i<nLevels; i++)
+    {
       totalCrossSection += CrossSection(k,i,particle);
+    }
+  {
+    totalCrossSection += CrossSection(k,i,particle);
+  }
   return totalCrossSection;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::S_1s(G4double t,
 …
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::S_2s(G4double t,
                                                           G4double energyTransferred,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::S_2p(G4double t,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionExcitationMillerGreenPartial::R(G4double t,

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionHandler.cc,v 1.18 2006/06/29 19:38:48 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBorn.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationBorn.cc,v 1.2 2007/11/08 18:51:34 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationBorn.cc,v 1.4 2008/08/20 14:51:48 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionIonisationBorn.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4Electron.hh"
-#include "G4Proton.hh"
-#include "G4Track.hh"
-#include "G4LogLogInterpolation.hh"
-#include "G4SystemOfUnits.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationBorn::G4CrossSectionIonisationBorn()
+{
+  name = "IonisationBorn";
+  // Default energy limits (defined for protection against anomalous behaviour only)
+  lowEnergyLimitDefault = 25 * eV;
+  lowEnergyLimitDefault = 12.61 * eV; // SI: i/o 25 eV
   highEnergyLimitDefault = 30 * keV;
 …
   G4String proton;
-  // Factor to scale microscopic/macroscopic cross section data in water
-  // ---- MGP ---- Hardcoded (taken from prototype code); to be replaced with proper calculation
   G4double scaleFactor = (1.e-22 / 3.343) * m*m;
+  if (electronDef != 0)
+  {
+    electron = electronDef->GetParticleName();
+    tableFile[electron] = fileElectron;
+  // Data members for electrons
+    lowEnergyLimit[electron] = 12.61 * eV; // SI: i/o 25 eV
+    highEnergyLimit[electron] = 30. * keV;
+  if (electronDef != 0)
+    {
+      electron = electronDef->GetParticleName();
+      tableFile[electron] = fileElectron;
+      // Energy limits
+      lowEnergyLimit[electron] = 25. * eV;
+      highEnergyLimit[electron] = 30. * keV;
+      // Create data set with electron cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableE = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableE->LoadData(fileElectron);
+    G4DNACrossSectionDataSet* tableE = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableE->LoadData(fileElectron);
+      // Insert key-table pair in map
+      tableData[electron] = tableE;
+    }
+    tableData[electron] = tableE;
+  }
   else
+    {
+      G4Exception("G4CrossSectionIonisationBorn Constructor: electron is not defined");
+    }
+  // Data members for protons
+  {
+    G4Exception("G4CrossSectionIonisationBorn Constructor: electron is not defined");
+  }
   if (protonDef != 0)
+    {
       proton = protonDef->GetParticleName();
       tableFile[proton] = fileProton;
+  {
+    proton = protonDef->GetParticleName();
+    tableFile[proton] = fileProton;
+      // Energy limits
+      lowEnergyLimit[proton] = 500. * keV;
+      highEnergyLimit[proton] = 10. * MeV;
+    lowEnergyLimit[proton] = 500. * keV;
+    highEnergyLimit[proton] = 10. * MeV;
+      // Create data set with proton cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableP = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableP->LoadData(fileProton);
+    G4DNACrossSectionDataSet* tableP = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableP->LoadData(fileProton);
+      // Insert key-table pair in map
+      tableData[proton] = tableP;
+    }
+    tableData[proton] = tableP;
+  }
   else
+    {
       G4Exception("G4CrossSectionIonisationBorn Constructor: proton is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionIonisationBorn Constructor: proton is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationBorn::~G4CrossSectionIonisationBorn()
+{
-   // Destroy the content of the map
   std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
   for (pos = tableData.begin(); pos != tableData.end(); ++pos)
+    {
       G4DNACrossSectionDataSet* table = pos->second;
       delete table;
+    }
+  {
+    G4DNACrossSectionDataSet* table = pos->second;
+    delete table;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationBorn::CrossSection(const G4Track& track )
 …
   G4double k = particle->GetKineticEnergy();
-  // Cross section = 0 outside the energy validity limits set in the constructor
   G4double sigma = 0.;
-  // ---- MGP ---- Better handling of these limits to be set in a following design iteration
   G4double lowLim = lowEnergyLimitDefault;
   G4double highLim = highEnergyLimitDefault;
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
+  // Retrieve energy limits for the current particle type
+  std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
+  pos1 = lowEnergyLimit.find(particleName);
+    std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
+    pos1 = lowEnergyLimit.find(particleName);
+  if (pos1 != lowEnergyLimit.end())
+  {
+    lowLim = pos1->second;
+  }
+    // Lower limit
+    if (pos1 != lowEnergyLimit.end())
+  std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
+  pos2 = highEnergyLimit.find(particleName);
+  if (pos2 != highEnergyLimit.end())
+  {
+    highLim = pos2->second;
+  }
+  if (k > lowLim && k < highLim)
+  {
+    std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+    pos = tableData.find(particleName);
+    if (pos != tableData.end())
+    {
+      G4DNACrossSectionDataSet* table = pos->second;
+      if (table != 0)
+      {
         lowLim = pos1->second;
+        sigma = table->FindValue(k);
+      }
+    }
+    else
+    {
+      G4Exception("G4CrossSectionIonisationBorn: attempting to calculate cross section for wrong particle");
+    }
+  }
+    // Upper limit
+    std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
+    pos2 = highEnergyLimit.find(particleName);
+    if (pos2 != highEnergyLimit.end())
+      {
+        highLim = pos2->second;
+      }
+    // Verify that the current track is within the energy limits of validity of the cross section model
+    if (k > lowLim && k < highLim)
+      {
+        std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+        pos = tableData.find(particleName);
+        if (pos != tableData.end())
+          {
+            G4DNACrossSectionDataSet* table = pos->second;
+            if (table != 0)
+              {
+                // Cross section
+                sigma = table->FindValue(k);
+              }
+          }
+        else
+          {
+            // The track does not corresponds to a particle pertinent to this model
+            G4Exception("G4CrossSectionIonisationBorn: attempting to calculate cross section for wrong particle");
+          }
+      }
+    return sigma;
+  return sigma;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornElectron.cc

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionIonisationBornElectron.cc,v 1.2 2007/11/08 18:51:34 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationBornPartial.cc,v 1.3 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationBornPartial.cc,v 1.5 2009/01/20 07:40:53 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionIonisationBornPartial.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "G4SystemOfUnits.hh"
+#include "Randomize.hh"
+#include <utility>
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationBornPartial::G4CrossSectionIonisationBornPartial()
+{
+  name = "IonisationBorn";
+  // Default energy limits (defined for protection against anomalous behaviour only)
+  name = "IonisationBornPartial";
+  lowEnergyLimitDefault = 25 * eV;
+  lowEnergyLimitDefault = 12.61 * eV;
   highEnergyLimitDefault = 30 * keV;
 …
   G4String proton;
-  // Factor to scale microscopic/macroscopic cross section data in water
-  // ---- MGP ---- Hardcoded (taken from prototype code); to be replaced with proper calculation
   G4double scaleFactor = (1.e-22 / 3.343) * m*m;
-  // Data members for electrons
   if (electronDef != 0)
+    {
+      electron = electronDef->GetParticleName();
+      tableFile[electron] = fileElectron;
+      // Energy limits
+      lowEnergyLimit[electron] = 25. * eV;
+      highEnergyLimit[electron] = 30. * keV;
+      // Create data set with electron cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableE = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableE->LoadData(fileElectron);
+  {
+    electron = electronDef->GetParticleName();
+    tableFile[electron] = fileElectron;
+    lowEnergyLimit[electron] = 12.61 * eV;
+    highEnergyLimit[electron] = 30. * keV;
+    G4DNACrossSectionDataSet* tableE = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableE->LoadData(fileElectron);
+      // Insert key-table pair in map
+      tableData[electron] = tableE;
+    }
+    tableData[electron] = tableE;
+  }
   else
+    {
+      G4Exception("G4CrossSectionIonisationBornPartial Constructor: electron is not defined");
+    }
+  // Data members for protons
+  {
+    G4Exception("G4CrossSectionIonisationBornPartial Constructor: electron is not defined");
+  }
   if (protonDef != 0)
+    {
+      proton = protonDef->GetParticleName();
+      tableFile[proton] = fileProton;
+      // Energy limits
+      lowEnergyLimit[proton] = 500. * keV;
+      highEnergyLimit[proton] = 10. * MeV;
+      // Create data set with proton cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableP = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableP->LoadData(fileProton);
+  {
+    proton = protonDef->GetParticleName();
+    tableFile[proton] = fileProton;
+    lowEnergyLimit[proton] = 500. * keV;
+    highEnergyLimit[proton] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableP = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableP->LoadData(fileProton);
+      // Insert key-table pair in map
+      tableData[proton] = tableP;
+    }
+    tableData[proton] = tableP;
+  }
   else
+    {
+      G4Exception("G4CrossSectionIonisationBornPartial Constructor: proton is not defined");
+    }
+}
+  {
+    G4Exception("G4CrossSectionIonisationBornPartial Constructor: proton is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationBornPartial::~G4CrossSectionIonisationBornPartial()
+{
-   // Destroy the content of the map
   std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
   for (pos = tableData.begin(); pos != tableData.end(); ++pos)
+    {
+      G4DNACrossSectionDataSet* table = pos->second;
+      delete table;
+    }
+}
+  {
+    G4DNACrossSectionDataSet* table = pos->second;
+    delete table;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionIonisationBornPartial::RandomSelect(G4double k, const G4String& particle )
+{
   G4int level = 0;
+  // Retrieve data table corresponding to the current particle type
+    std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+    pos = tableData.find(particle);
+    if (pos != tableData.end())
+  std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+  pos = tableData.find(particle);
+  if (pos != tableData.end())
+  {
+    G4DNACrossSectionDataSet* table = pos->second;
+    if (table != 0)
+    {
+      G4double* valuesBuffer = new G4double[table->NumberOfComponents()];
+      const size_t n(table->NumberOfComponents());
+      size_t i(n);
+      G4double value = 0.;
+      while (i>0)
+      {
+        i--;
+        valuesBuffer[i] = table->GetComponent(i)->FindValue(k);
+        value += valuesBuffer[i];
+      }
+      value *= G4UniformRand();
+      i = n;
+      while (i > 0)
+      {
+        G4DNACrossSectionDataSet* table = pos->second;
+        if (table != 0)
+          {
+            // C-style arrays are used in G4DNACrossSectionDataSet: this design feature was
+            // introduced without authorization and should be replaced by the use of STL containers
+            G4double* valuesBuffer = new G4double[table->NumberOfComponents()];
+            const size_t n(table->NumberOfComponents());
+            size_t i(n);
+            G4double value = 0.;
+            while (i>0)
+              {
+                i--;
+                valuesBuffer[i] = table->GetComponent(i)->FindValue(k);
+                value += valuesBuffer[i];
+              }
+            value *= G4UniformRand();
+            i = n;
+            while (i > 0)
+              {
+                i--;
+                if (valuesBuffer[i] > value)
+                  {
+                    delete[] valuesBuffer;
+                    return i;
+                  }
+                value -= valuesBuffer[i];
+              }
+            // It should never end up here
+            // ---- MGP ---- Is the following line really necessary?
+            if (valuesBuffer) delete[] valuesBuffer;
+          }
+        i--;
+        if (valuesBuffer[i] > value)
+        {
+          delete[] valuesBuffer;
+          return i;
+        }
+        value -= valuesBuffer[i];
+      }
+    else
+      {
+        G4Exception("G4CrossSectionIonisationBornPartial: attempting to calculate cross section for wrong particle");
+      }
+      if (valuesBuffer) delete[] valuesBuffer;
+    }
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationBornPartial: attempting to calculate cross section for wrong particle");
+  }
   return level;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationBornPartial::CrossSection(const G4Track& track )
 …
   G4double k = particle->GetKineticEnergy();
-  // Cross section = 0 outside the energy validity limits set in the constructor
-  // ---- MGP ---- Better handling of these limits to be set in a following design iteration
   G4double lowLim = lowEnergyLimitDefault;
   G4double highLim = highEnergyLimitDefault;
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
+  // Retrieve energy limits for the current particle type
+    std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
+    pos1 = lowEnergyLimit.find(particleName);
+    // Lower limit
+    if (pos1 != lowEnergyLimit.end())
+      {
+        lowLim = pos1->second;
+      }
+    // Upper limit
+    std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
+    pos2 = highEnergyLimit.find(particleName);
+    if (pos2 != highEnergyLimit.end())
+      {
+        highLim = pos2->second;
+      }
+    // Verify that the current track is within the energy limits of validity of the cross section model
+    if (k > lowLim && k < highLim)
+      {
+        std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+        pos = tableData.find(particleName);
+  std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
+  pos1 = lowEnergyLimit.find(particleName);
+  if (pos1 != lowEnergyLimit.end())
+  {
+    lowLim = pos1->second;
+  }
+  std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
+  pos2 = highEnergyLimit.find(particleName);
+  if (pos2 != highEnergyLimit.end())
+  {
+     highLim = pos2->second;
+  }
+  if (k > lowLim && k < highLim)
+  {
+     std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+     pos = tableData.find(particleName);
+        if (pos != tableData.end())
+          {
+            G4DNACrossSectionDataSet* table = pos->second;
+            if (table != 0)
+              {
+                // ---- MGP ---- Temporary
+                // table->PrintData();
+                // Cross section
+                sigma = table->FindValue(k);
+              }
+          }
+        else
+          {
+            // The track corresponds to a not pertinent particle
+            G4Exception("G4CrossSectionIonisationBornPartial: attempting to calculate cross section for wrong particle");
+          }
+      }
+    return sigma;
+}
+     if (pos != tableData.end())
+     {
+       G4DNACrossSectionDataSet* table = pos->second;
+       if (table != 0)
+       {
+         sigma = table->FindValue(k);
+       }
+     }
+     else
+     {
+       G4Exception("G4CrossSectionIonisationBornPartial: attempting to calculate cross section for wrong particle");
+     }
+  }
+  return sigma;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationBornPartial::Sum(G4double /* energy */, const G4String& /* particle */)
+{
   return 0;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartialElectron.cc

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionIonisationBornPartialElectron.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRudd.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationRudd.cc,v 1.2 2007/11/09 16:20:16 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationRudd.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionIonisationRudd.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationRudd::G4CrossSectionIonisationRudd()
+{
-  name = "IonisationRudd";
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  // ZERO LOW ENERGY LIMIT FOR ALLOWED KILLING
   lowEnergyLimitDefault = 0 * eV;
   highEnergyLimitDefault = 100 * MeV;
 …
   G4String helium;
-  // Factor to scale microscopic/macroscopic cross section data in water
-  // ---- MGP ---- Hardcoded (taken from prototype code); to be replaced with proper calculation
   G4double scaleFactor = 1 * m*m;
-  // Data members for protons
   if (protonDef != 0)
+    {
+      proton = protonDef->GetParticleName();
+      tableFile[proton] = fileProton;
+      // Energy limits
+      lowEnergyLimit[proton] = 0. * eV;
+      highEnergyLimit[proton] = 500. * keV;
+      // Create data set with proton cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableProton = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
+  {
+    proton = protonDef->GetParticleName();
+    tableFile[proton] = fileProton;
+    lowEnergyLimit[proton] = 0. * eV;
+    highEnergyLimit[proton] = 500. * keV;
+    G4DNACrossSectionDataSet* tableProton = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
                                                                            eV,
                                                                            scaleFactor );
+      tableProton->LoadData(fileProton);
+      // Insert key-table pair in map
+      tableData[proton] = tableProton;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: proton is not defined");
+    }
+  // Data members for hydrogen
+    tableProton->LoadData(fileProton);
+    tableData[proton] = tableProton;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: proton is not defined");
+  }
   if (hydrogenDef != 0)
+    {
+      hydrogen = hydrogenDef->GetParticleName();
+      tableFile[hydrogen] = fileHydrogen;
+      // Energy limits
+      lowEnergyLimit[hydrogen] = 0. * eV;
+      highEnergyLimit[hydrogen] = 100. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableHydrogen = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
+  {
+    hydrogen = hydrogenDef->GetParticleName();
+    tableFile[hydrogen] = fileHydrogen;
+    lowEnergyLimit[hydrogen] = 0. * eV;
+    highEnergyLimit[hydrogen] = 100. * MeV;
+    G4DNACrossSectionDataSet* tableHydrogen = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
                                                                              eV,
                                                                              scaleFactor );
       tableHydrogen->LoadData(fileHydrogen);
+    tableHydrogen->LoadData(fileHydrogen);
+      // Insert key-table pair in map
+      tableData[hydrogen] = tableHydrogen;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: hydrogen is not defined");
+    }
+  // Data members for alphaPlusPlus
+    tableData[hydrogen] = tableHydrogen;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: hydrogen is not defined");
+  }
   if (alphaPlusPlusDef != 0)
+    {
+      alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+      tableFile[alphaPlusPlus] = fileAlphaPlusPlus;
+      // Energy limits
+      lowEnergyLimit[alphaPlusPlus] = 0. * keV;
+      highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableAlphaPlusPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
+  {
+    alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+    tableFile[alphaPlusPlus] = fileAlphaPlusPlus;
+    lowEnergyLimit[alphaPlusPlus] = 0. * eV;
+    highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableAlphaPlusPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
                                                                                   eV,
                                                                                   scaleFactor );
       tableAlphaPlusPlus->LoadData(fileAlphaPlusPlus);
+    tableAlphaPlusPlus->LoadData(fileAlphaPlusPlus);
+      // Insert key-table pair in map
+      tableData[alphaPlusPlus] = tableAlphaPlusPlus;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlusPlus is not defined");
+    }
+  // Data members for alphaPlus
+    tableData[alphaPlusPlus] = tableAlphaPlusPlus;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlusPlus is not defined");
+  }
   if (alphaPlusDef != 0)
+    {
+      alphaPlus = alphaPlusDef->GetParticleName();
+      tableFile[alphaPlus] = fileAlphaPlus;
+      // Energy limits
+      lowEnergyLimit[alphaPlus] = 0. * keV;
+      highEnergyLimit[alphaPlus] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableAlphaPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    tableFile[alphaPlus] = fileAlphaPlus;
+    lowEnergyLimit[alphaPlus] = 0. * eV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableAlphaPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
                                                                               eV,
                                                                               scaleFactor );
+      tableAlphaPlus->LoadData(fileAlphaPlus);
+      // Insert key-table pair in map
+      tableData[alphaPlus] = tableAlphaPlus;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlus is not defined");
+    }
+  // Data members for helium
+    tableAlphaPlus->LoadData(fileAlphaPlus);
+    tableData[alphaPlus] = tableAlphaPlus;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlus is not defined");
+  }
   if (heliumDef != 0)
+    {
+      helium = heliumDef->GetParticleName();
+      tableFile[helium] = fileHelium;
+      // Energy limits
+      lowEnergyLimit[helium] = 0. * keV;
+      highEnergyLimit[helium] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableHelium = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
+  {
+    helium = heliumDef->GetParticleName();
+    tableFile[helium] = fileHelium;
+    lowEnergyLimit[helium] = 0. * eV;
+    highEnergyLimit[helium] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableHelium = new G4DNACrossSectionDataSet(new G4LogLogInterpolation,
                                                                            eV,
                                                                            scaleFactor );
+      tableHelium->LoadData(fileHelium);
+      // Insert key-table pair in map
+      tableData[helium] = tableHelium;
+    tableHelium->LoadData(fileHelium);
+    tableData[helium] = tableHelium;
+    }
   else
+    {
       G4Exception("G4CrossSectionIonisationRudd Constructor: helium is not defined");
+    }
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: helium is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationRudd::~G4CrossSectionIonisationRudd()
+{
-  // Destroy the content of the map
   std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
   for (pos = tableData.begin(); pos != tableData.end(); ++pos)
+    {
       G4DNACrossSectionDataSet* table = pos->second;
       delete table;
+    }
+  {
+    G4DNACrossSectionDataSet* table = pos->second;
+    delete table;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationRudd::CrossSection(const G4Track& track )
 …
       &&
       track.GetDefinition() != instance->GetIon("helium")
+      )
+     )
     G4Exception("G4CrossSectionIonisationRudd: attempting to calculate cross section for wrong particle");
-  // Cross section = 0 outside the energy validity limits set in the constructor
   G4double sigma = 0.;
-  // ---- MGP ---- Better handling of these limits to be set in a following design iteration
   G4double lowLim = lowEnergyLimitDefault;
   G4double highLim = highEnergyLimitDefault;
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
+      lowLim = pos1->second;
+    }
+  // Upper limit
+  {
+    lowLim = pos1->second;
+  }
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+  {
+    highLim = pos2->second;
+  }
+  if (k >= lowLim && k <= highLim)
+  {
+    std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+    pos = tableData.find(particleName);
+    if (pos != tableData.end())
+    {
+      highLim = pos2->second;
+    }
+  // Verify that the current track is within the energy limits of validity of the cross section model
+  if (k >= lowLim && k <= highLim)
+    {
+      std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
+      pos = tableData.find(particleName);
+      if (pos != tableData.end())
+        {
+          G4DNACrossSectionDataSet* table = pos->second;
+          if (table != 0)
+            {
+              // Cross section
+       G4DNACrossSectionDataSet* table = pos->second;
+       if (table != 0)
+       {
               sigma = table->FindValue(k);
               // BEGIN ELECTRON CORRECTION
 …
                    particle->GetDefinition() == instance->GetIon("helium")
+                   )
+                {
+              {
                   G4DNACrossSectionDataSet* electronDataset = new G4DNACrossSectionDataSet
 …
                   if ( particle->GetDefinition() == instance->GetIon("alpha+") )
+                    {
+                  {
                       G4double tmp1 = table->FindValue(k) + electronDataset->FindValue(kElectron);
                       delete electronDataset;
                       return tmp1;
+                    }
+                  }
                   if ( particle->GetDefinition() == instance->GetIon("helium") )
+                    {
+                  {
                       G4double tmp2 = table->FindValue(k) +  2. * electronDataset->FindValue(kElectron);
                       delete electronDataset;
                       return tmp2;
+                    }
+                }
+                  }
+              }
               // END ELECTRON CORRECTION
+            }
+        }
+      else
+        {
+          // The track does not corresponds to a particle pertinent to this model
+          G4Exception("G4CrossSectionIonisationRudd: attempting to calculate cross section for wrong particle");
+        }
+       }
+    }
+    else
+    {
+        G4Exception("G4CrossSectionIonisationRudd: attempting to calculate cross section for wrong particle");
+    }
+  }
   return sigma;

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRuddPartial.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4CrossSectionIonisationRuddPartial.cc,v 1.3 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Geant4-DNA Cross total cross section for electron elastic scattering in water
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4CrossSectionIonisationRuddPartial.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4CrossSectionIonisationRuddPartial.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4Track.hh"
+#include "G4LogLogInterpolation.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4DNAGenericIonsManager.hh"
+#include "Randomize.hh"
+#include <utility>
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationRuddPartial::G4CrossSectionIonisationRuddPartial()
+{
-  name = "IonisationRudd";
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  name = "IonisationRuddPartial";
   lowEnergyLimitDefault = 100 * eV;
   highEnergyLimitDefault = 100 * MeV;
 …
   G4String helium;
-  // Factor to scale microscopic/macroscopic cross section data in water
-  // ---- MGP ---- Hardcoded (taken from prototype code); to be replaced with proper calculation
   G4double scaleFactor = 1 * m*m;
-  // Data members for protons
   if (protonDef != 0)
+    {
+      proton = protonDef->GetParticleName();
+      tableFile[proton] = fileProton;
+      // Energy limits
+      lowEnergyLimit[proton] = 100. * eV;
+      highEnergyLimit[proton] = 500. * keV;
+      // Create data set with proton cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableProton = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableProton->LoadData(fileProton);
+      // Insert key-table pair in map
+      tableData[proton] = tableProton;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: proton is not defined");
+    }
+  // Data members for hydrogen
+  {
+    proton = protonDef->GetParticleName();
+    tableFile[proton] = fileProton;
+    lowEnergyLimit[proton] = 100. * eV;
+    highEnergyLimit[proton] = 500. * keV;
+    G4DNACrossSectionDataSet* tableProton = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableProton->LoadData(fileProton);
+    tableData[proton] = tableProton;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: proton is not defined");
+  }
   if (hydrogenDef != 0)
+    {
+      hydrogen = hydrogenDef->GetParticleName();
+      tableFile[hydrogen] = fileHydrogen;
+      // Energy limits
+      lowEnergyLimit[hydrogen] = 100. * eV;
+      highEnergyLimit[hydrogen] = 100. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableHydrogen = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableHydrogen->LoadData(fileHydrogen);
+      // Insert key-table pair in map
+      tableData[hydrogen] = tableHydrogen;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: hydrogen is not defined");
+    }
+  // Data members for alphaPlusPlus
+  {
+    hydrogen = hydrogenDef->GetParticleName();
+    tableFile[hydrogen] = fileHydrogen;
+    lowEnergyLimit[hydrogen] = 100. * eV;
+    highEnergyLimit[hydrogen] = 100. * MeV;
+    G4DNACrossSectionDataSet* tableHydrogen = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableHydrogen->LoadData(fileHydrogen);
+    tableData[hydrogen] = tableHydrogen;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: hydrogen is not defined");
+  }
   if (alphaPlusPlusDef != 0)
+    {
+      alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+      tableFile[alphaPlusPlus] = fileAlphaPlusPlus;
+      // Energy limits
+      lowEnergyLimit[alphaPlusPlus] = 1. * keV;
+      highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableAlphaPlusPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableAlphaPlusPlus->LoadData(fileAlphaPlusPlus);
+      // Insert key-table pair in map
+      tableData[alphaPlusPlus] = tableAlphaPlusPlus;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlusPlus is not defined");
+    }
+  // Data members for alphaPlus
+  {
+    alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+    tableFile[alphaPlusPlus] = fileAlphaPlusPlus;
+    lowEnergyLimit[alphaPlusPlus] = 1. * keV;
+    highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableAlphaPlusPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableAlphaPlusPlus->LoadData(fileAlphaPlusPlus);
+    tableData[alphaPlusPlus] = tableAlphaPlusPlus;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlusPlus is not defined");
+  }
   if (alphaPlusDef != 0)
+    {
+      alphaPlus = alphaPlusDef->GetParticleName();
+      tableFile[alphaPlus] = fileAlphaPlus;
+      // Energy limits
+      lowEnergyLimit[alphaPlus] = 1. * keV;
+      highEnergyLimit[alphaPlus] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableAlphaPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableAlphaPlus->LoadData(fileAlphaPlus);
+      // Insert key-table pair in map
+      tableData[alphaPlus] = tableAlphaPlus;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlus is not defined");
+    }
+  // Data members for helium
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    tableFile[alphaPlus] = fileAlphaPlus;
+    lowEnergyLimit[alphaPlus] = 1. * keV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableAlphaPlus = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableAlphaPlus->LoadData(fileAlphaPlus);
+    tableData[alphaPlus] = tableAlphaPlus;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: alphaPlus is not defined");
+  }
   if (heliumDef != 0)
+    {
+      helium = heliumDef->GetParticleName();
+      tableFile[helium] = fileHelium;
+      // Energy limits
+      lowEnergyLimit[helium] = 1. * keV;
+      highEnergyLimit[helium] = 10. * MeV;
+      // Create data set with hydrogen cross section data and load values stored in file
+      G4DNACrossSectionDataSet* tableHelium = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+      tableHelium->LoadData(fileHelium);
+      // Insert key-table pair in map
+      tableData[helium] = tableHelium;
+    }
+  else
+    {
+      G4Exception("G4CrossSectionIonisationRudd Constructor: helium is not defined");
+    }
+}
+  {
+    helium = heliumDef->GetParticleName();
+    tableFile[helium] = fileHelium;
+    lowEnergyLimit[helium] = 1. * keV;
+    highEnergyLimit[helium] = 10. * MeV;
+    G4DNACrossSectionDataSet* tableHelium = new G4DNACrossSectionDataSet(new G4LogLogInterpolation, eV,scaleFactor );
+    tableHelium->LoadData(fileHelium);
+    tableData[helium] = tableHelium;
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRudd Constructor: helium is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4CrossSectionIonisationRuddPartial::~G4CrossSectionIonisationRuddPartial()
+{
-  // Destroy the content of the map
   std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
   for (pos = tableData.begin(); pos != tableData.end(); ++pos)
+    {
+      G4DNACrossSectionDataSet* table = pos->second;
+      delete table;
+    }
+}
+  {
+    G4DNACrossSectionDataSet* table = pos->second;
+    delete table;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4CrossSectionIonisationRuddPartial::RandomSelect(G4double k, const G4String& particle )
 …
        particle == instance->GetIon("helium")->GetParticleName()
+       )
+    {
+  {
       electronDataset->LoadData("dna/sigma_ionisation_e_born");
 …
       electronComponent = electronDataset->FindValue(kElectron);
+    }
+  }
   delete electronDataset;
 …
   if (pos != tableData.end())
+    {
+  {
       G4DNACrossSectionDataSet* table = pos->second;
       if (table != 0)
+        {
+          // C-style arrays are used in G4DNACrossSectionDataSet: this design feature was
+          // introduced without authorization and should be replaced by the use of STL containers
+      {
           G4double* valuesBuffer = new G4double[table->NumberOfComponents()];
 …
           while (i>0)
+            {
+          {
               i--;
               valuesBuffer[i] = table->GetComponent(i)->FindValue(k);
 …
               value += valuesBuffer[i];
+            }
+          }
           value *= G4UniformRand();
 …
           while (i > 0)
+            {
+          {
               i--;
               if (valuesBuffer[i] > value)
+                {
+              {
                   delete[] valuesBuffer;
                   return i;
+                }
+              }
               value -= valuesBuffer[i];
+            }
+          // It should never end up here
+          // ---- MGP ---- Is the following line really necessary?
+          }
           if (valuesBuffer) delete[] valuesBuffer;
+        }
+    }
   else
+    {
       G4Exception("G4CrossSectionIonisationRuddPartial: attempting to calculate cross section for wrong particle");
+    }
+      }
+  }
+  else
+  {
+    G4Exception("G4CrossSectionIonisationRuddPartial: attempting to calculate cross section for wrong particle");
+  }
   return level;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationRuddPartial::CrossSection(const G4Track& track )
 …
   G4double k = particle->GetKineticEnergy();
-  // Cross section = 0 outside the energy validity limits set in the constructor
-  // ---- MGP ---- Better handling of these limits to be set in a following design iteration
   G4double lowLim = lowEnergyLimitDefault;
   G4double highLim = highEnergyLimitDefault;
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
+      lowLim = pos1->second;
+    }
+  // Upper limit
+  {
+    lowLim = pos1->second;
+  }
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
+      highLim = pos2->second;
+    }
+  // Verify that the current track is within the energy limits of validity of the cross section model
+  {
+    highLim = pos2->second;
+  }
   if (k >= lowLim && k <= highLim)
+    {
+  {
       std::map< G4String,G4DNACrossSectionDataSet*,std::less<G4String> >::iterator pos;
       pos = tableData.find(particleName);
       if (pos != tableData.end())
+        {
+      {
           G4DNACrossSectionDataSet* table = pos->second;
           if (table != 0)
+            {
+              // ---- MGP ---- Temporary
+              // table->PrintData();
+              // Cross section
+          {
               sigma = table->FindValue(k);
+            }
+        }
+          }
+      }
       else
+        {
+          // The track corresponds to a not pertinent particle
+      {
           G4Exception("G4CrossSectionIonisationRuddPartial: attempting to calculate cross section for wrong particle");
+        }
+    }
+      }
+  }
   return sigma;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4CrossSectionIonisationRuddPartial::Sum(G4double /* energy */, const G4String& /* particle */)
+{
   return 0;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionKill.cc

r819	r961
26	26	//
27	27	// $Id: G4CrossSectionKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc

r819	r961
27	27
28	28	// $Id: G4DNACrossSectionDataSet.cc,v 1.7 2007/11/09 18:06:26 pia Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: Riccardo Capra <capra@ge.infn.it>

trunk/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4DNAGenericIonsManager.cc,v 1.4 2006/06/29 19:39:24 gunter Exp $
+// GEANT4 tag $Name:  $
+// $Id: G4DNAGenericIonsManager.cc,v 1.5 2008/07/16 19:01:07 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4DNAGenericIonsManager.hh"
 …
 #include "G4Ions.hh"
+G4DNAGenericIonsManager *                G4DNAGenericIonsManager :: Instance(void)
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4DNAGenericIonsManager * G4DNAGenericIonsManager :: Instance(void)
+{
  if (!theInstance)
 …
+}
+G4ParticleDefinition *                   G4DNAGenericIonsManager :: GetIon(const G4String & name)
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4ParticleDefinition * G4DNAGenericIonsManager :: GetIon(const G4String & name)
+{
  IonsMap::const_iterator i(map.find(name));
 …
   return 0;
-// return map[name];
  return i->second;
+}
+                                         G4DNAGenericIonsManager :: G4DNAGenericIonsManager()
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4DNAGenericIonsManager :: G4DNAGenericIonsManager()
+{
  //               name             mass          width         charge
 …
  //             stable         lifetime    decay table
  G4Ions *helium;
  G4Ions *hydrogen;
  G4Ions *alphaPlus;
+ G4Ions *positronium1s;
+ G4Ions *positronium2s;
  helium=     new G4Ions("helium",    3.727417*GeV,       0.0*MeV,  +0.0*eplus,
 …
 ,               0,             0,
                        "nucleus",              +1,            +1,           0,
+                      true,            -1.0,             0, false,
+                        true,            -1.0,             0, false,
+                              "",               0,             0.0);
+ positronium1s= new G4Ions("Ps-1s",   2*electron_mass_c2,      0.0*MeV,  +0.0*eplus,
+,               0,             0,
+,               0,             0,
+                       "nucleus",               0,             0,           0,
+                            true,            -1.0,             0, false,
+                              "",               0,             0.0);
+ positronium2s= new G4Ions("Ps-2s",   2*electron_mass_c2,      0.0*MeV,  +0.0*eplus,
+,               0,             0,
+,               0,             0,
+                       "nucleus",               0,             0,           0,
+                            true,            -1.0,             0, false,
                               "",               0,             0.0);
 …
  map["alpha+"]=alphaPlus;
  map["alpha++"]=G4Alpha::Alpha();
+ map["Ps-1s"]=positronium1s;
+ map["Ps-2s"]=positronium2s;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4DNAGenericIonsManager *                G4DNAGenericIonsManager::theInstance(0);
+G4DNAGenericIonsManager * G4DNAGenericIonsManager::theInstance(0);

trunk/source/processes/electromagnetic/lowenergy/src/G4DummyFinalState.cc

r819	r961
26	26	//
27	27	// $Id: G4DummyFinalState.cc,v 1.2 2007/10/15 08:36:35 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc

-              r819
+              r961
 //
 //
 // $Id: G4EMDataSet.cc,v 1.12 2006/06/29 19:39:44 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EMDataSet.cc,v 1.18 2008/03/17 13:40:53 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 #include <fstream>
 #include <sstream>
+                                                 G4EMDataSet :: G4EMDataSet(G4int argZ, G4VDataSetAlgorithm * argAlgorithm, G4double argUnitEnergies, G4double argUnitData)
+:
+ z(argZ),
+ energies(0),
+ data(0),
+ algorithm(argAlgorithm),
+ unitEnergies(argUnitEnergies),
+ unitData(argUnitData)
+{
+ if (algorithm == 0)
+  G4Exception("G4EMDataSet::G4EMDataSet - interpolation == 0");
+}
+                                                 G4EMDataSet :: G4EMDataSet(G4int argZ, G4DataVector * argEnergies, G4DataVector * argData, G4VDataSetAlgorithm * argAlgorithm, G4double argUnitEnergies, G4double argUnitData)
+:
+ z(argZ),
+ energies(argEnergies),
+ data(argData),
+ algorithm(argAlgorithm),
+ unitEnergies(argUnitEnergies),
+ unitData(argUnitData)
+{
+ if (algorithm==0)
+  G4Exception("G4EMDataSet::G4EMDataSet - interpolation == 0");
+ if ((energies==0) ^ (data==0))
+  G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data (zero case)");
+ if (energies==0)
+  return;
+ if (energies->size()!=data->size())
+  G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data");
+}
+                                                 G4EMDataSet :: ~G4EMDataSet()
+#include "G4Integrator.hh"
+#include "Randomize.hh"
+#include "G4LinInterpolation.hh"
+G4EMDataSet::G4EMDataSet(G4int Z,
+                         G4VDataSetAlgorithm* algo,
+                         G4double xUnit,
+                         G4double yUnit,
+                         G4bool random):
+  z(Z),
+  energies(0),
+  data(0),
+  algorithm(algo),
+  unitEnergies(xUnit),
+  unitData(yUnit),
+  pdf(0),
+  randomSet(random)
+{
+  if (algorithm == 0) G4Exception("G4EMDataSet::G4EMDataSet - interpolation == 0");
+  if (randomSet) BuildPdf();
+}
+G4EMDataSet::G4EMDataSet(G4int argZ,
+                         G4DataVector* dataX,
+                         G4DataVector* dataY,
+                         G4VDataSetAlgorithm* algo,
+                         G4double xUnit,
+                         G4double yUnit,
+                         G4bool random):
+  z(argZ),
+  energies(dataX),
+  data(dataY),
+  algorithm(algo),
+  unitEnergies(xUnit),
+  unitData(yUnit),
+  pdf(0),
+  randomSet(random)
+{
+  if (algorithm == 0) G4Exception("G4EMDataSet::G4EMDataSet - interpolation == 0");
+  if ((energies == 0) ^ (data == 0))
+    G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data (zero case)");
+  if (energies == 0) return;
+  if (energies->size() != data->size())
+    G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data");
+  if (randomSet) BuildPdf();
+}
+G4EMDataSet::~G4EMDataSet()
+{
+ delete algorithm;
+ if (energies)
+  delete energies;
+ if (data)
+  delete data;
+}
+G4double                                        G4EMDataSet :: FindValue(G4double argEnergy, G4int /* argComponentId */) const
+{
+ if (!energies)
+  G4Exception("G4EMDataSet::FindValue - energies == 0");
+ if (energies->empty())
+  return 0;
+ if (argEnergy <= (*energies)[0])
+  return (*data)[0];
+ size_t i(energies->size()-1);
+ if (argEnergy >= (*energies)[i])
+  return (*data)[i];
+ return algorithm->Calculate(argEnergy, FindLowerBound(argEnergy), *energies, *data);
+}
+void                                            G4EMDataSet :: PrintData(void) const
+{
+ if (!energies)
+ {
+  G4cout << "Data not available." << G4endl;
+  return;
+ }
+ size_t size = energies->size();
+ for (size_t i(0); i<size; i++)
+  G4cout << "Point: " << ((*energies)[i]/unitEnergies)
+         << " - Data value : " << ((*data)[i]/unitData) << G4endl;
+}
+void                                            G4EMDataSet :: SetEnergiesData(G4DataVector * argEnergies, G4DataVector * argData, G4int /* argComponentId */)
+{
+ if (energies)
+  delete energies;
+ energies=argEnergies;
+ if (data)
+  delete data;
+ data=argData;
+ if ((energies==0) ^ (data==0))
+  G4Exception("G4EMDataSet::SetEnergiesData - different size for energies and data (zero case)");
+ if (energies==0)
+  return;
+ if (energies->size()!=data->size())
+  G4Exception("G4EMDataSet::SetEnergiesData - different size for energies and data");
+}
+G4bool                                          G4EMDataSet :: LoadData(const G4String & argFileName)
+{
+ // The file is organized into two columns:
+ // 1st column is the energy
+ // 2nd column is the corresponding value
+ // The file terminates with the pattern: -1   -1
+ //                                       -2   -2
+ G4String fullFileName(FullFileName(argFileName));
+ std::ifstream in(fullFileName);
+ if (!in.is_open())
+ {
+  G4String message("G4EMDataSet::LoadData - data file \"");
+  message+=fullFileName;
+  message+="\" not found";
+  G4Exception(message);
+ }
+ G4DataVector * argEnergies=new G4DataVector;
+ G4DataVector * argData=new G4DataVector;
+ G4double a;
+ bool energyColumn(true);
+ do
+ {
+  in >> a;
+  if (a!=-1 && a!=-2)
+  {
+   if (energyColumn)
+    argEnergies->push_back(a*unitEnergies);
+   else
+    argData->push_back(a*unitData);
+   energyColumn=(!energyColumn);
+  }
+ }
+ while (a != -2);
+ SetEnergiesData(argEnergies, argData, 0);
+ return true;
+}
+G4bool                                          G4EMDataSet :: SaveData(const G4String & argFileName) const
+{
+ // The file is organized into two columns:
+ // 1st column is the energy
+ // 2nd column is the corresponding value
+ // The file terminates with the pattern: -1   -1
+ //                                       -2   -2
+ G4String fullFileName(FullFileName(argFileName));
+ std::ofstream out(fullFileName);
+ if (!out.is_open())
+ {
+  G4String message("G4EMDataSet::SaveData - cannot open \"");
+  message+=fullFileName;
+  message+="\"";
+  G4Exception(message);
+ }
+ out.precision(10);
+ out.width(15);
+ out.setf(std::ofstream::left);
+ if (energies!=0 && data!=0)
+ {
+  G4DataVector::const_iterator i(energies->begin());
+  G4DataVector::const_iterator endI(energies->end());
+  G4DataVector::const_iterator j(data->begin());
+  while (i!=endI)
+  {
+   out.precision(10);
+   out.width(15);
+   out.setf(std::ofstream::left);
+   out << ((*i)/unitEnergies) << ' ';
+   out.precision(10);
+   out.width(15);
+   out.setf(std::ofstream::left);
+   out << ((*j)/unitData) << std::endl;
+   i++;
+   j++;
+  }
+ }
+ out.precision(10);
+ out.width(15);
+ out.setf(std::ofstream::left);
+ out << -1.f << ' ';
+ out.precision(10);
+ out.width(15);
+ out.setf(std::ofstream::left);
+ out << -1.f << std::endl;
+ out.precision(10);
+ out.width(15);
+ out.setf(std::ofstream::left);
+ out << -2.f << ' ';
+ out.precision(10);
+ out.width(15);
+ out.setf(std::ofstream::left);
+ out << -2.f << std::endl;
+ return true;
+}
+size_t                                          G4EMDataSet :: FindLowerBound(G4double argEnergy) const
+{
+ size_t lowerBound(0);
+ size_t upperBound(energies->size() - 1);
+ while (lowerBound <= upperBound)
+ {
+  size_t midBin((lowerBound + upperBound)/2);
+  if (argEnergy < (*energies)[midBin])
+   upperBound = midBin-1;
+  delete algorithm;
+  if (energies) delete energies;
+  if (data) delete data;
+  if (pdf) delete pdf;
+}
+G4double G4EMDataSet::FindValue(G4double energy, G4int /* componentId */) const
+{
+  if (!energies) G4Exception("G4EMDataSet::FindValue - energies == 0");
+  if (energies->empty()) return 0;
+  if (energy <= (*energies)[0]) return (*data)[0];
+  size_t i = energies->size()-1;
+  if (energy >= (*energies)[i]) return (*data)[i];
+  return algorithm->Calculate(energy, FindLowerBound(energy), *energies, *data);
+}
+void G4EMDataSet::PrintData(void) const
+{
+  if (!energies)
+    {
+      G4cout << "Data not available." << G4endl;
+    }
   else
+   lowerBound = midBin+1;
+ }
+ return upperBound;
+}
+G4String                                        G4EMDataSet :: FullFileName(const G4String & argFileName) const
+{
+ char* path = getenv("G4LEDATA");
+ if (!path)
+  G4Exception("G4EMDataSet::FullFileName - G4LEDATA environment variable not set");
+ std::ostringstream fullFileName;
+ fullFileName << path << '/' << argFileName << z << ".dat";
+    {
+      size_t size = energies->size();
+      for (size_t i(0); i<size; i++)
+        {
+          G4cout << "Point: " << ((*energies)[i]/unitEnergies)
+                 << " - Data value: " << ((*data)[i]/unitData);
+          if (pdf != 0) G4cout << " - PDF : " << (*pdf)[i];
+          G4cout << G4endl;
+        }
+    }
+}
+void G4EMDataSet::SetEnergiesData(G4DataVector* dataX,
+                                  G4DataVector* dataY,
+                                  G4int /* componentId */)
+{
+  if (energies) delete energies;
+  energies = dataX;
+  if (data) delete data;
+  data = dataY;
+  if ((energies == 0) ^ (data==0))
+    G4Exception("G4EMDataSet::SetEnergiesData - different size for energies and data (zero case)");
+  if (energies == 0) return;
+  if (energies->size() != data->size())
+    G4Exception("G4EMDataSet::SetEnergiesData - different size for energies and data");
+}
+G4bool G4EMDataSet::LoadData(const G4String& fileName)
+{
+  // The file is organized into two columns:
+  // 1st column is the energy
+  // 2nd column is the corresponding value
+  // The file terminates with the pattern: -1   -1
+  //                                       -2   -2
+  G4String fullFileName(FullFileName(fileName));
+  std::ifstream in(fullFileName);
+  if (!in.is_open())
+    {
+      G4String message("G4EMDataSet::LoadData - data file \"");
+      message += fullFileName;
+      message += "\" not found";
+      G4Exception(message);
+    }
+  G4DataVector* argEnergies=new G4DataVector;
+  G4DataVector* argData=new G4DataVector;
+  G4double a;
+  bool energyColumn(true);
+  do
+    {
+      in >> a;
+      if (a!=-1 && a!=-2)
+        {
+          if (energyColumn)
+            argEnergies->push_back(a*unitEnergies);
+          else
+            argData->push_back(a*unitData);
+          energyColumn=(!energyColumn);
+        }
+    }
+  while (a != -2);
+  SetEnergiesData(argEnergies, argData, 0);
+  if (randomSet) BuildPdf();
+  return true;
+}
+G4bool G4EMDataSet::SaveData(const G4String& name) const
+{
+  // The file is organized into two columns:
+  // 1st column is the energy
+  // 2nd column is the corresponding value
+  // The file terminates with the pattern: -1   -1
+  //                                       -2   -2
+  G4String fullFileName(FullFileName(name));
+  std::ofstream out(fullFileName);
+  if (!out.is_open())
+    {
+      G4String message("G4EMDataSet::SaveData - cannot open \"");
+      message+=fullFileName;
+      message+="\"";
+      G4Exception(message);
+    }
+  out.precision(10);
+  out.width(15);
+  out.setf(std::ofstream::left);
+  if (energies!=0 && data!=0)
+    {
+      G4DataVector::const_iterator i(energies->begin());
+      G4DataVector::const_iterator endI(energies->end());
+      G4DataVector::const_iterator j(data->begin());
+      while (i!=endI)
+        {
+          out.precision(10);
+          out.width(15);
+          out.setf(std::ofstream::left);
+          out << ((*i)/unitEnergies) << ' ';
+          out.precision(10);
+          out.width(15);
+          out.setf(std::ofstream::left);
+          out << ((*j)/unitData) << std::endl;
+          i++;
+          j++;
+        }
+    }
+  out.precision(10);
+  out.width(15);
+  out.setf(std::ofstream::left);
+  out << -1.f << ' ';
+  out.precision(10);
+  out.width(15);
+  out.setf(std::ofstream::left);
+  out << -1.f << std::endl;
+  out.precision(10);
+  out.width(15);
+  out.setf(std::ofstream::left);
+  out << -2.f << ' ';
+  out.precision(10);
+  out.width(15);
+  out.setf(std::ofstream::left);
+  out << -2.f << std::endl;
+  return true;
+}
+size_t G4EMDataSet::FindLowerBound(G4double x) const
+{
+  size_t lowerBound = 0;
+  size_t upperBound(energies->size() - 1);
+  while (lowerBound <= upperBound)
+    {
+      size_t midBin((lowerBound + upperBound) / 2);
+      if (x < (*energies)[midBin]) upperBound = midBin - 1;
+      else lowerBound = midBin + 1;
+    }
+  return upperBound;
+}
+size_t G4EMDataSet::FindLowerBound(G4double x, G4DataVector* values) const
+{
+  size_t lowerBound = 0;;
+  size_t upperBound(values->size() - 1);
+  while (lowerBound <= upperBound)
+    {
+      size_t midBin((lowerBound + upperBound) / 2);
+      if (x < (*values)[midBin]) upperBound = midBin - 1;
+      else lowerBound = midBin + 1;
+    }
+  return upperBound;
+}
+G4String G4EMDataSet::FullFileName(const G4String& name) const
+{
+  char* path = getenv("G4LEDATA");
+  if (!path)
+    G4Exception("G4EMDataSet::FullFileName - G4LEDATA environment variable not set");
+  std::ostringstream fullFileName;
+  fullFileName << path << '/' << name << z << ".dat";
+ return G4String(fullFileName.str().c_str());
+}
+  return G4String(fullFileName.str().c_str());
+}
+void G4EMDataSet::BuildPdf()
+{
+  pdf = new G4DataVector;
+  G4Integrator <G4EMDataSet, G4double(G4EMDataSet::*)(G4double)> integrator;
+  G4int nData = data->size();
+  pdf->push_back(0.);
+  // Integrate the data distribution
+  G4int i;
+  G4double totalSum = 0.;
+  for (i=1; i<nData; i++)
+    {
+      G4double xLow = (*energies)[i-1];
+      G4double xHigh = (*energies)[i];
+      G4double sum = integrator.Legendre96(this, &G4EMDataSet::IntegrationFunction, xLow, xHigh);
+      totalSum = totalSum + sum;
+      pdf->push_back(totalSum);
+    }
+  // Normalize to the last bin
+  G4double tot = 0.;
+  if (totalSum > 0.) tot = 1. / totalSum;
+  for (i=1;  i<nData; i++)
+    {
+      (*pdf)[i] = (*pdf)[i] * tot;
+    }
+}
+G4double G4EMDataSet::RandomSelect(G4int /* componentId */) const
+{
+  // Random select a X value according to the cumulative probability distribution
+  // derived from the data
+  if (!pdf) G4Exception("G4EMDataSet::RandomSelect - PDF has not been created for this data set");
+  G4double value = 0.;
+  G4double x = G4UniformRand();
+  // Locate the random value in the X vector based on the PDF
+  size_t bin = FindLowerBound(x,pdf);
+  // Interpolate the PDF to calculate the X value:
+  // linear interpolation in the first bin (to avoid problem with 0),
+  // interpolation with associated data set algorithm in other bins
+  G4LinInterpolation linearAlgo;
+  if (bin == 0) value = linearAlgo.Calculate(x, bin, *pdf, *energies);
+  else value = algorithm->Calculate(x, bin, *pdf, *energies);
+  //  G4cout << x << " random bin "<< bin << " - " << value << G4endl;
+  return value;
+}
+G4double G4EMDataSet::IntegrationFunction(G4double x)
+{
+  // This function is needed by G4Integrator to calculate the integral of the data distribution
+  G4double y = 0;
+ // Locate the random value in the X vector based on the PDF
+  size_t bin = FindLowerBound(x);
+  // Interpolate to calculate the X value:
+  // linear interpolation in the first bin (to avoid problem with 0),
+  // interpolation with associated algorithm in other bins
+  G4LinInterpolation linearAlgo;
+  if (bin == 0) y = linearAlgo.Calculate(x, bin, *energies, *data);
+  else y = algorithm->Calculate(x, bin, *energies, *data);
+  return y;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeDecrease.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateChargeDecrease.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateChargeDecrease.cc,v 1.4 2009/01/20 07:50:28 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateChargeDecrease.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-//#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4SystemOfUnits.hh"
+//#include "G4ParticleMomentum.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateChargeDecrease::G4FinalStateChargeDecrease()
+{
-  name = "ChargeDecrease";
   lowEnergyLimit = 1 * keV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateChargeDecrease::~G4FinalStateChargeDecrease()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateChargeDecrease::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
 …
   if (outK<0)
+    {
       G4String message;
       message="ChargeDecreaseDingfelder::GenerateFinalState - Final kinetic energy is below 0! Process ";
       G4Exception(message);
+    }
+  {
+    G4String message;
+    message="ChargeDecreaseDingfelder::GenerateFinalState - Final kinetic energy is below 0! Process ";
+    G4Exception(message);
+  }
+  // Primary particle
+  //SI - Added protection against total energy deposit
+  product.DoNotDepositEnergy();
+  //
   product.KillPrimaryParticle();
   product.AddEnergyDeposit(waterBindingEnergy);
+  //Secondary particle
   G4DynamicParticle* aSecondary = new G4DynamicParticle(OutgoingParticleDefinition(definition, finalStateIndex),
                                                         track.GetDynamicParticle()->GetMomentumDirection(),
 …
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4FinalStateChargeDecrease::NumberOfFinalStates(G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == instance->GetIon("alpha++") )
+    {
       if (finalStateIndex==0)  return 1;
       return 2;
+    }
+  {
+    if (finalStateIndex==0)  return 1;
+    return 2;
+  }
   if (particleDefinition == instance->GetIon("alpha+") ) return 1;
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4ParticleDefinition* G4FinalStateChargeDecrease::OutgoingParticleDefinition (G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == instance->GetIon("alpha++") )
+    {
+      if (finalStateIndex == 0) return instance->GetIon("alpha+");
+      return instance->GetIon("helium");
+    }
+  {
+    if (finalStateIndex == 0) return instance->GetIon("alpha+");
+    return instance->GetIon("helium");
+  }
   if (particleDefinition == instance->GetIon("alpha+") ) return instance->GetIon("helium");
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateChargeDecrease::WaterBindingEnergyConstant(G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == instance->GetIon("alpha++") )
+    {
+  {
       // Binding energy for    W+ -> W++ + e-    10.79 eV
       // Binding energy for    W  -> W+  + e-    10.79 eV
 …
       return 10.79*2*eV;
+    }
+  }
   if (particleDefinition == instance->GetIon("alpha+") )
+    {
+  {
       // Binding energy for    W+ -> W++ + e-    10.79 eV
       // Binding energy for    W  -> W+  + e-    10.79 eV
 …
       return 10.79*eV;
+    }
+  }
   return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateChargeDecrease::OutgoingParticleBindingEnergyConstant(G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == instance->GetIon("alpha++") )
+    {
+  {
       // Binding energy for    He+ -> He++ + e-    54.509 eV
       // Binding energy for    He  -> He+  + e-    24.587 eV
 …
       return (54.509 + 24.587)*eV;
+    }
+  }
   if (particleDefinition == instance->GetIon("alpha+") )
+    {
+  {
       // Binding energy for    He+ -> He++ + e-    54.509 eV
       // Binding energy for    He  -> He+  + e-    24.587 eV
       return 24.587*eV;
+    }
+  }
   return 0;

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeIncrease.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateChargeIncrease.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateChargeIncrease.cc,v 1.4 2009/01/20 07:50:28 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateChargeIncrease.hh"
+#include "G4Track.hh"
+#include "G4Step.hh"
+#include "G4DynamicParticle.hh"
+#include "Randomize.hh"
+#include "G4Electron.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateChargeIncrease::G4FinalStateChargeIncrease()
+{
-  name = "ChargeIncrease";
   lowEnergyLimit = 1 * keV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateChargeIncrease::~G4FinalStateChargeIncrease()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateChargeIncrease::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
+  // Primary particle
+  //SI - Added protection against total energy deposit
+  product.DoNotDepositEnergy();
+  //
   product.KillPrimaryParticle();
   product.AddEnergyDeposit(0.);
   G4ParticleDefinition* definition = track.GetDefinition();
-  // Secondaries
   G4double inK = track.GetDynamicParticle()->GetKineticEnergy();
 …
   if (outK<0)
+    {
       G4String message;
       message="G4FinalStateChargeIncrease - Final kinetic energy is below 0! Process ";
+    }
+  {
+    G4String message;
+    message="G4FinalStateChargeIncrease - Final kinetic energy is below 0! Process ";
+  }
   product.AddSecondary(new G4DynamicParticle(OutgoingParticleDefinition(definition,finalStateIndex),
 …
   while (n>0)
+    {
+      n--;
+      product.AddSecondary
+  {
+    n--;
+    product.AddSecondary
         (new G4DynamicParticle(G4Electron::Electron(), track.GetDynamicParticle()->GetMomentumDirection(), electronK));
+    }
+  }
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4int G4FinalStateChargeIncrease::NumberOfFinalStates(G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == instance->GetIon("helium"))
     {    if (finalStateIndex==0) return 2;
     return 3;
+    }
+  {    if (finalStateIndex==0) return 2;
+       return 3;
+  }
   return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4ParticleDefinition*  G4FinalStateChargeIncrease::OutgoingParticleDefinition (G4ParticleDefinition* particleDefinition,
 …
   if(particleDefinition == instance->GetIon("alpha+"))
+    {
+  {
       // Binding energy for    He+ -> He++ + e-    54.509 eV
       // Binding energy for    He  -> He+  + e-    24.587 eV
       return 54.509*eV;
+    }
+  }
   if(particleDefinition == instance->GetIon("helium"))
+    {
+  {
       // Binding energy for    He+ -> He++ + e-    54.509 eV
       // Binding energy for    He  -> He+  + e-    24.587 eV
 …
       if (finalStateIndex==0) return 24.587*eV;
       return (54.509 + 24.587)*eV;
+    }
+  }
   return 0;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticBrennerZaider.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateElasticBrennerZaider.cc,v 1.1 2007/10/12 23:11:41 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateElasticBrennerZaider.cc,v 1.8 2008/12/05 11:58:16 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateElasticBrennerZaider.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateElasticBrennerZaider::G4FinalStateElasticBrennerZaider()
+{
+  // These data members will be used in the next implementation iteration,
+  // when the enriched PhysicsModel policy is implemented
+  name = "FinalStateElasticBrennerZaider";
+  lowEnergyLimit = 7.4 * eV;
+  highEnergyLimit = 10 * MeV;
+  lowEnergyLimit = 8.23 * eV; // SI : i/o of 7.4 * eV;
+  highEnergyLimit = 200 * eV;
   betaCoeff.push_back(7.51525);
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateElasticBrennerZaider::~G4FinalStateElasticBrennerZaider()
+{
+  // empty
+  // G4DynamicParticle objects produced are owned by client
+}
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateElasticBrennerZaider::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
-  // Kinetic energy of primary particle
   G4double k = track.GetDynamicParticle()->GetKineticEnergy();
+  if ( k>= lowEnergyLimit && k<=highEnergyLimit )
+  {
+    G4double cosTheta = RandomizeCosTheta(k);
+    G4double phi = 2. * pi * G4UniformRand();
   // Assume material = water; H2O number of electrons
   // ---- MGP ---- To be generalized later
   // const G4int z = 10;
+    G4ThreeVector zVers = track.GetDynamicParticle()->GetMomentumDirection();
+    G4ThreeVector xVers = zVers.orthogonal();
+    G4ThreeVector yVers = zVers.cross(xVers);
+  G4double cosTheta = RandomizeCosTheta(k);
+    G4double xDir = std::sqrt(1. - cosTheta*cosTheta);
+    G4double yDir = xDir;
+    xDir *= std::cos(phi);
+    yDir *= std::sin(phi);
+    G4ThreeVector zPrimeVers((xDir*xVers + yDir*yVers + cosTheta*zVers));
+    product.ModifyPrimaryParticle(zPrimeVers,k);
+  }
+  if (k<lowEnergyLimit)
+  {
+    product.KillPrimaryParticle();
+  }
-  G4double phi = 2. * pi * G4UniformRand();
-  // G4cout << "cosTheta in GenerateFinalState = " << cosTheta << ", phi = " << phi << G4endl;
-  G4ThreeVector zVers = track.GetDynamicParticle()->GetMomentumDirection();
-  G4ThreeVector xVers = zVers.orthogonal();
-  G4ThreeVector yVers = zVers.cross(xVers);
-  G4double xDir = std::sqrt(1. - cosTheta*cosTheta);
-  G4double yDir = xDir;
-  xDir *= std::cos(phi);
-  yDir *= std::sin(phi);
-  // G4cout << "xDir, yDir = " << xDir <<", " << yDir << G4endl;
-  // G4ThreeVector zPrimeVers((xDir*xVers + yDir*yVers + cosTheta*zVers).unit());
-  G4ThreeVector zPrimeVers((xDir*xVers + yDir*yVers + cosTheta*zVers));
-  // G4cout << "zPrimeVers = (" << zPrimeVers.x() << ", "<< zPrimeVers.y() << ", "<< zPrimeVers.z() << ") " << G4endl;
-  //  product.ModifyPrimaryParticle(zPrimeVers.x(),zPrimeVers.y(),zPrimeVers.z(),k);
-  product.ModifyPrimaryParticle(zPrimeVers,k);
-  //  this->aParticleChange.ProposeEnergy(k);
-  //  this->aParticleChange.ProposeMomentumDirection(zPrimeVers);
-  //  this->aParticleChange.SetNumberOfSecondaries(0);
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateElasticBrennerZaider::RandomizeCosTheta(G4double k)
 …
   //   d Omega           (1 + 2 gamma(K) - cos(theta))^2     (1 + 2 delta(K) + cos(theta))^2
   //
   // Maximum is < 1/(4 gamma(K)^2) + beta(K)/(4 delta(K)^2)
+  // Maximum is < 1/(4 gamma(K)^2) + beta(K)/((2+2delta(K))^2)
   //
   // Phys. Med. Biol. 29 N.4 (1983) 443-447
   // gamma(K), beta(K) and delta(K) are polynomials with coefficients for energy measured in eV
   k /= eV;
   G4double beta = std::exp(CalculatePolynomial(k,betaCoeff));
   G4double delta = std::exp(CalculatePolynomial(k,deltaCoeff));
+  G4double gamma;
-  G4double gamma;
   if (k > 100.)
+    {
+      gamma = CalculatePolynomial(k, gamma100_200Coeff); // Only in this case it is not the exponent of the polynomial
+    }
+  {
+      gamma = CalculatePolynomial(k, gamma100_200Coeff);
+      // Only in this case it is not the exponent of the polynomial
+  }
   else
+    {
+  {
+      if (k>10)
+      {
+          gamma = std::exp(CalculatePolynomial(k, gamma10_100Coeff));
+      }
+      else
+      {
+          gamma = std::exp(CalculatePolynomial(k, gamma035_10Coeff));
+      }
+  }
+      if (k>10)
+        {
+          gamma = std::exp(CalculatePolynomial(k, gamma10_100Coeff));
+        }
+      else
+        {
+          gamma = std::exp(CalculatePolynomial(k, gamma035_10Coeff));
+        }
+    }
+  // G4cout << "beta = " << beta << ", gamma = " << gamma << ", delta = " << delta << G4endl;
+  G4double oneOverMax = 1. / (1./(4.*gamma*gamma) + beta/(4.*delta*delta));
+  G4double oneOverMax = 1. / (1./(4.*gamma*gamma) + beta/( (2.+2.*delta)*(2.+2.*delta) ));
   G4double cosTheta = 0.;
 …
   do
+    {
+  {
       cosTheta = 2. * G4UniformRand() - 1.;
+      leftDenominator = (1 + 2.*gamma - cosTheta);
+      rightDenominator = (1 + 2.*delta + cosTheta);
+      fCosTheta = oneOverMax * (1./(leftDenominator*leftDenominator) + beta/(rightDenominator*rightDenominator));
+    }
+      leftDenominator = (1. + 2.*gamma - cosTheta);
+      rightDenominator = (1. + 2.*delta + cosTheta);
+      if ( (leftDenominator * rightDenominator) != 0. )
+      {
+          fCosTheta = oneOverMax * (1./(leftDenominator*leftDenominator) + beta/(rightDenominator*rightDenominator));
+      }
+  }
   while (fCosTheta < G4UniformRand());
-  //  G4cout << "cosTheta = " << cosTheta << G4endl;
   return cosTheta;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateElasticBrennerZaider::CalculatePolynomial(G4double k, std::vector<G4double>& vec)

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticScreenedRutherford.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateElasticScreenedRutherford.cc,v 1.2 2007/10/12 23:10:33 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateElasticScreenedRutherford.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateElasticScreenedRutherford.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateElasticScreenedRutherford::G4FinalStateElasticScreenedRutherford()
+{
+  // These data members will be used in the next implementation iteration,
+  // when the enriched PhysicsModel policy is implemented
+  name = "FinalStateElasticScreenedRutherford";
+  lowEnergyLimit = 7.4 * eV;
+  lowEnergyLimit = 200 * eV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateElasticScreenedRutherford::~G4FinalStateElasticScreenedRutherford()
+{
+  // empty
+  // G4DynamicParticle objects produced are owned by client
+}
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateElasticScreenedRutherford::GenerateFinalState(const G4Track& track, const G4Step& step)
+const G4FinalStateProduct& G4FinalStateElasticScreenedRutherford::GenerateFinalState(const G4Track& track, const G4Step& )
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
-  // Kinetic energy of primary particle
   G4double k = track.GetDynamicParticle()->GetKineticEnergy();
-  // Assume material = water; H2O number of electrons
-  // ---- MGP ---- To be generalized later
   const G4int z = 10;
 …
   G4double phi = 2. * pi * G4UniformRand();
-  // G4cout << "cosTheta in GenerateFinalState = " << cosTheta << ", phi = " << phi << G4endl;
   G4ThreeVector zVers = track.GetDynamicParticle()->GetMomentumDirection();
 …
   yDir *= std::sin(phi);
-  // G4cout << "xDir, yDir = " << xDir <<", " << yDir << G4endl;
-  // G4ThreeVector zPrimeVers((xDir*xVers + yDir*yVers + cosTheta*zVers).unit());
   G4ThreeVector zPrimeVers((xDir*xVers + yDir*yVers + cosTheta*zVers));
-  // G4cout << "zPrimeVers = (" << zPrimeVers.x() << ", "<< zPrimeVers.y() << ", "<< zPrimeVers.z() << ") " << G4endl;
-  //  product.ModifyPrimaryParticle(zPrimeVers.x(),zPrimeVers.y(),zPrimeVers.z(),k);
   product.ModifyPrimaryParticle(zPrimeVers,k);
-  //  this->aParticleChange.ProposeEnergy(k);
-  //  this->aParticleChange.ProposeMomentumDirection(zPrimeVers);
-  //  this->aParticleChange.SetNumberOfSecondaries(0);
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateElasticScreenedRutherford::RandomizeCosTheta(G4double k, G4int z) const
 …
  do
+   {
      cosTheta = 2. * G4UniformRand() - 1.;
      fCosTheta = (1 + 2.*n - cosTheta);
      fCosTheta = oneOverMax / (fCosTheta*fCosTheta);
+   }
+ {
+   cosTheta = 2. * G4UniformRand() - 1.;
+   fCosTheta = (1 + 2.*n - cosTheta);
+   fCosTheta = oneOverMax / (fCosTheta*fCosTheta);
+ }
  while (fCosTheta < G4UniformRand());
  return cosTheta;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateElasticScreenedRutherford::ScreeningFactor(G4double k, G4int z) const
 …
   G4double result = 0.;
   if (denominator != 0.)
+    {
       result = numerator / denominator;
+    }
+  {
+    result = numerator / denominator;
+  }
   else
+    {
+      // Throw an exception
+      G4Exception("G4FinalStateElasticScreenedRutherford::ScreeningFactor - denominator = 0");
+    }
+  {
+    G4Exception("G4FinalStateElasticScreenedRutherford::ScreeningFactor - denominator = 0");
+  }
   return result;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationBorn.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationBorn.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationBorn.cc,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateExcitationBorn.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationBorn::G4FinalStateExcitationBorn()
+{
+  name = "FinalStateExcitationBorn";
+  lowEnergyLimit = 7.4 * eV;
+  lowEnergyLimit = 500 * keV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationBorn::~G4FinalStateExcitationBorn()
+{
+  // empty
+  // G4DynamicParticle objects produced are owned by client
+}
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateExcitationBorn::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
   const G4DynamicParticle* particle = track.GetDynamicParticle();
-  // Kinetic energy of primary particle
   G4double k = particle->GetKineticEnergy();
-  // Select excitation level on the basis of partial excitation cross section
   G4int level = cross.RandomSelect(k);
-  // Excitation energy corresponding to the selected level
   G4double excitationEnergy = waterStructure.ExcitationEnergy(level);
   G4double newEnergy = k - excitationEnergy;
+  if (newEnergy > lowEnergyLimit)
+    {
+      // Deposit excitation energy locally, modify primary energy accordingly
+      // Particle direction is unchanged
+      product.ModifyPrimaryParticle(particle->GetMomentumDirection(),newEnergy);
+      product.AddEnergyDeposit(excitationEnergy);
+    }
+  else
+    {
+      // Primary particle is killed
+      product.KillPrimaryParticle();
+    }
+  if (newEnergy > 0)
+  {
+    product.ModifyPrimaryParticle(particle->GetMomentumDirection(),newEnergy);
+    product.AddEnergyDeposit(excitationEnergy);
+  }
   return product;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationEmfietzoglou.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationEmfietzoglou.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationEmfietzoglou.cc,v 1.5 2008/12/05 11:58:16 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateExcitationEmfietzoglou.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationEmfietzoglou::G4FinalStateExcitationEmfietzoglou()
+{
+  name = "FinalStateExcitationEmfietzoglou";
+  lowEnergyLimit = 7.4 * eV;
+  lowEnergyLimit = 8.23 * eV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationEmfietzoglou::~G4FinalStateExcitationEmfietzoglou()
+{
+  // empty
+  // G4DynamicParticle objects produced are owned by client
+}
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateExcitationEmfietzoglou::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
   const G4DynamicParticle* particle = track.GetDynamicParticle();
-  // Kinetic energy of primary particle
   G4double k = particle->GetKineticEnergy();
-  // Select excitation level on the basis of partial excitation cross section
   G4int level = cross.RandomSelect(k);
+  // Excitation energy corresponding to the selected level
   G4double excitationEnergy = waterStructure.ExcitationEnergy(level);
   G4double newEnergy = k - excitationEnergy;
+  if (newEnergy > lowEnergyLimit)
+    {
+      // Deposit excitation energy locally, modify primary energy accordingly
+      // Particle direction is unchanged
+  if (newEnergy >= lowEnergyLimit)
+  {
       product.ModifyPrimaryParticle(particle->GetMomentumDirection(),newEnergy);
       product.AddEnergyDeposit(excitationEnergy);
+    }
+  else
+    {
+      // Primary particle is killed
+      product.KillPrimaryParticle();
+    }
+  }
+  else product.KillPrimaryParticle();
   return product;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationMillerGreen.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateExcitationMillerGreen.cc,v 1.2 2007/11/09 20:11:04 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateExcitationMillerGreen.cc,v 1.3 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateExcitationMillerGreen.hh"
-#include "G4Track.hh"
-#include "G4Step.hh"
-#include "G4DynamicParticle.hh"
-#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationMillerGreen::G4FinalStateExcitationMillerGreen()
+{
-  name = "ExcitationMillerGreen";
   lowEnergyLimit = 10 * eV;
   highEnergyLimit = 10 * MeV;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateExcitationMillerGreen::~G4FinalStateExcitationMillerGreen()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateExcitationMillerGreen::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
   const G4DynamicParticle* particle = track.GetDynamicParticle();
-  // Kinetic energy of primary particle
   G4double k = particle->GetKineticEnergy();
-  // Select excitation level on the basis of partial excitation cross section
   G4int level = cross.RandomSelect(k,track.GetDefinition());
-  // Excitation energy corresponding to the selected level
   G4double excitationEnergy = waterStructure.ExcitationEnergy(level);
   G4double newEnergy = k - excitationEnergy;
-  // ---- SI ---- Test on newEnergy
   if (newEnergy > 0)
+    {
+      // Deposit excitation energy locally, modify primary energy accordingly
+      // Particle direction is unchanged
+      product.ModifyPrimaryParticle(particle->GetMomentumDirection(),newEnergy);
+      product.AddEnergyDeposit(excitationEnergy);
+    }
+  // ---- SI ---- Particle is not modified by default otherwise
+/*
+  else
+    {
+      // Primary particle is killed
+      product.KillPrimaryParticle();
+    }
+*/
+  {
+    product.ModifyPrimaryParticle(particle->GetMomentumDirection(),newEnergy);
+    product.AddEnergyDeposit(excitationEnergy);
+  }
   return product;

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationBorn.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateIonisationBorn.cc,v 1.9 2007/11/26 17:27:09 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Sebastien Incerti (incerti@cenbg.in2p3.fr)
+//                 Maria Grazia Pia  (Maria.Grazia.Pia@cern.ch)
+//
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//    Nov 2007  S. Incerti        Implementation
+// 26 Nov 2007  MGP               Cleaned up std::
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateIonisationBorn.cc,v 1.16 2008/12/06 13:47:12 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateIonisationBorn.hh"
+#include "G4Track.hh"
+#include "G4Step.hh"
+#include "G4DynamicParticle.hh"
+#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateIonisationBorn::G4FinalStateIonisationBorn()
+{
-  name = "IonisationBorn";
-  // NEW
-  // Factor to scale microscopic/macroscopic cross section data in water
   G4double scaleFactor = (1.e-22 / 3.343) * m*m;
-  // Energy limits
   G4ParticleDefinition* electronDef = G4Electron::ElectronDefinition();
   G4ParticleDefinition* protonDef = G4Proton::ProtonDefinition();
 …
   G4String proton;
+  // Default energy limits (defined for protection against anomalous behaviour only)
+  lowEnergyLimitDefault = 25 * eV;
+  lowEnergyLimitDefault = 12.61 * eV; // SI: i/o 25 eV
   highEnergyLimitDefault = 10 * MeV;
 …
     G4Exception("G4DNACrossSectionDataSet::FullFileName - G4LEDATA environment variable not set");
-  // Data members for electrons
   if (electronDef != 0)
+    {
+      electron = electronDef->GetParticleName();
+      lowEnergyLimit[electron] = 25. * eV;
+      highEnergyLimit[electron] = 30. * keV;
+      std::ostringstream eFullFileName;
+      eFullFileName << path << "/dna/sigmadiff_ionisation_e_born.dat";
+      std::ifstream eDiffCrossSection(eFullFileName.str().c_str());
+      // eDiffCrossSection(eFullFileName.str().c_str());
+      if (!eDiffCrossSection)
+        {
+          // G4cout << "ERROR OPENING DATA FILE IN ELECTRON BORN IONIZATION !!! " << G4endl;
+          G4Exception("G4FinalStateIonisationBorn::ERROR OPENING electron DATA FILE");
+          while(1); // ---- MGP ---- What is this?
+        }
+  {
+    electron = electronDef->GetParticleName();
+    lowEnergyLimit[electron] = 12.61 * eV; // SI: i/o 25 eV
+    highEnergyLimit[electron] = 30. * keV;
+    std::ostringstream eFullFileName;
+    eFullFileName << path << "/dna/sigmadiff_ionisation_e_born.dat";
+    std::ifstream eDiffCrossSection(eFullFileName.str().c_str());
+    if (!eDiffCrossSection)
+    {
+      G4Exception("G4FinalStateIonisationBorn::ERROR OPENING electron DATA FILE");
+    }
+      eTdummyVec.push_back(0.);
+      while(!eDiffCrossSection.eof())
+        {
+          double tDummy;
+          double eDummy;
+          eDiffCrossSection>>tDummy>>eDummy;
+          if (tDummy != eTdummyVec.back()) eTdummyVec.push_back(tDummy);
+          for (int j=0; j<5; j++)
+            {
+              eDiffCrossSection>>eDiffCrossSectionData[j][tDummy][eDummy];
+              eDiffCrossSectionData[j][tDummy][eDummy]*=scaleFactor;
+              eVecm[tDummy].push_back(eDummy);
+            }
+        }
+    }
+    eTdummyVec.push_back(0.);
+    while(!eDiffCrossSection.eof())
+    {
+      double tDummy;
+      double eDummy;
+      eDiffCrossSection>>tDummy>>eDummy;
+      if (tDummy != eTdummyVec.back()) eTdummyVec.push_back(tDummy);
+      for (int j=0; j<5; j++)
+      {
+        eDiffCrossSection>>eDiffCrossSectionData[j][tDummy][eDummy];
+        // SI - only if eof is not reached !
+        if (!eDiffCrossSection.eof()) eDiffCrossSectionData[j][tDummy][eDummy]*=scaleFactor;
+        eVecm[tDummy].push_back(eDummy);
+      }
+    }
+  }
   else
+    {
+      G4Exception("G4FinalStateIonisationBorn Constructor: electron is not defined");
+    }
+  // Data members for protons
+  {
+    G4Exception("G4FinalStateIonisationBorn Constructor: electron is not defined");
+  }
   if (protonDef != 0)
+    {
+      proton = protonDef->GetParticleName();
+      lowEnergyLimit[proton] = 500. * keV;
+      highEnergyLimit[proton] = 10. * MeV;
+      std::ostringstream pFullFileName;
+      pFullFileName << path << "/dna/sigmadiff_ionisation_p_born.dat";
+      std::ifstream pDiffCrossSection(pFullFileName.str().c_str());
+      //     pDiffCrossSection(pFullFileName.str().c_str());
+      if (!pDiffCrossSection)
+        {
+          // G4cout<<"ERROR OPENING DATA FILE IN PROTON BORN IONIZATION !!! "<<G4endl;
+          G4Exception("G4FinalStateIonisationBorn::ERROR OPENING proton DATA FILE");
+          while(1); // ---- MGP ---- What is this?
+        }
+  {
+    proton = protonDef->GetParticleName();
+    lowEnergyLimit[proton] = 500. * keV;
+    highEnergyLimit[proton] = 10. * MeV;
+    std::ostringstream pFullFileName;
+    pFullFileName << path << "/dna/sigmadiff_ionisation_p_born.dat";
+    std::ifstream pDiffCrossSection(pFullFileName.str().c_str());
+    if (!pDiffCrossSection)
+    {
+      G4Exception("G4FinalStateIonisationBorn::ERROR OPENING proton DATA FILE");
+    }
+      pTdummyVec.push_back(0.);
+      while(!pDiffCrossSection.eof())
+        {
+          double tDummy;
+          double eDummy;
+          pDiffCrossSection>>tDummy>>eDummy;
+          if (tDummy != pTdummyVec.back()) pTdummyVec.push_back(tDummy);
+          for (int j=0; j<5; j++)
+            {
+              pDiffCrossSection>>pDiffCrossSectionData[j][tDummy][eDummy];
+              pDiffCrossSectionData[j][tDummy][eDummy]*=scaleFactor;
+              //G4cout << "j=" << j << " Tdum=" << tDummy << " Edum=" << eDummy << " pDiff=" << pDiffCrossSectionData[j][tDummy][eDummy] << G4endl;
+              pVecm[tDummy].push_back(eDummy);
+            }
+        }
+    }
+    pTdummyVec.push_back(0.);
+    while(!pDiffCrossSection.eof())
+    {
+      double tDummy;
+      double eDummy;
+      pDiffCrossSection>>tDummy>>eDummy;
+      if (tDummy != pTdummyVec.back()) pTdummyVec.push_back(tDummy);
+      for (int j=0; j<5; j++)
+      {
+        pDiffCrossSection>>pDiffCrossSectionData[j][tDummy][eDummy];
+        // SI - only if eof is not reached !
+        if (!pDiffCrossSection.eof()) pDiffCrossSectionData[j][tDummy][eDummy]*=scaleFactor;
+        pVecm[tDummy].push_back(eDummy);
+      }
+    }
+  }
   else
+    {
+      G4Exception("G4FinalStateIonisationBorn Constructor: proton is not defined");
+    }
+}
+  {
+    G4Exception("G4FinalStateIonisationBorn Constructor: proton is not defined");
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateIonisationBorn::~G4FinalStateIonisationBorn()
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateIonisationBorn::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
+      lowLim = pos1->second;
+    }
+  // Upper limit
+  {
+    lowLim = pos1->second;
+  }
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
+      highLim = pos2->second;
+    }
+  // Verify that the current track is within the energy limits of validity of the cross section model
+  {
+    highLim = pos2->second;
+  }
   if (k >= lowLim && k <= highLim)
+    {
+      // Kinetic energy of primary particle
+      G4ParticleMomentum primaryDirection = particle->GetMomentumDirection();
+      G4double particleMass = particle->GetDefinition()->GetPDGMass();
+      G4double totalEnergy = k + particleMass;
+      G4double pSquare = k * (totalEnergy + particleMass);
+      G4double totalMomentum = std::sqrt(pSquare);
+      const G4String& particleName = particle->GetDefinition()->GetParticleName();
+      G4int ionizationShell = cross.RandomSelect(k,particleName);
+      G4double secondaryKinetic = RandomizeEjectedElectronEnergy(particle->GetDefinition(),k,ionizationShell);
+      G4double bindingEnergy = waterStructure.IonisationEnergy(ionizationShell);
+      G4double cosTheta = 0.;
+      G4double phi = 0.;
+      RandomizeEjectedElectronDirection(track.GetDefinition(), k,secondaryKinetic, cosTheta, phi);
+      G4double sinTheta = std::sqrt(1.-cosTheta*cosTheta);
+      G4double dirX = sinTheta*std::cos(phi);
+      G4double dirY = sinTheta*std::sin(phi);
+      G4double dirZ = cosTheta;
+      G4ThreeVector deltaDirection(dirX,dirY,dirZ);
+      deltaDirection.rotateUz(primaryDirection);
+      G4double deltaTotalMomentum = std::sqrt(secondaryKinetic*(secondaryKinetic + 2.*electron_mass_c2 ));
+      //Primary Particle Direction
+      G4double finalPx = totalMomentum*primaryDirection.x() - deltaTotalMomentum*deltaDirection.x();
+      G4double finalPy = totalMomentum*primaryDirection.y() - deltaTotalMomentum*deltaDirection.y();
+      G4double finalPz = totalMomentum*primaryDirection.z() - deltaTotalMomentum*deltaDirection.z();
+      G4double finalMomentum = std::sqrt(finalPx*finalPx + finalPy*finalPy + finalPz*finalPz);
+      finalPx /= finalMomentum;
+      finalPy /= finalMomentum;
+      finalPz /= finalMomentum;
+      product.ModifyPrimaryParticle(finalPx,finalPy,finalPz,k-bindingEnergy-secondaryKinetic);
+      product.AddEnergyDeposit(bindingEnergy);
+      G4DynamicParticle* aElectron = new G4DynamicParticle(G4Electron::Electron(),deltaDirection,secondaryKinetic);
+      product.AddSecondary(aElectron);
+    }
+  {
+    G4ParticleMomentum primaryDirection = particle->GetMomentumDirection();
+    G4double particleMass = particle->GetDefinition()->GetPDGMass();
+    G4double totalEnergy = k + particleMass;
+    G4double pSquare = k * (totalEnergy + particleMass);
+    G4double totalMomentum = std::sqrt(pSquare);
+    const G4String& particleName = particle->GetDefinition()->GetParticleName();
+    G4int ionizationShell = cross.RandomSelect(k,particleName);
+    G4double secondaryKinetic = RandomizeEjectedElectronEnergy(particle->GetDefinition(),k,ionizationShell);
+    G4double bindingEnergy = waterStructure.IonisationEnergy(ionizationShell);
+    G4double cosTheta = 0.;
+    G4double phi = 0.;
+    RandomizeEjectedElectronDirection(track.GetDefinition(), k,secondaryKinetic, cosTheta, phi);
+    G4double sinTheta = std::sqrt(1.-cosTheta*cosTheta);
+    G4double dirX = sinTheta*std::cos(phi);
+    G4double dirY = sinTheta*std::sin(phi);
+    G4double dirZ = cosTheta;
+    G4ThreeVector deltaDirection(dirX,dirY,dirZ);
+    deltaDirection.rotateUz(primaryDirection);
+    G4double deltaTotalMomentum = std::sqrt(secondaryKinetic*(secondaryKinetic + 2.*electron_mass_c2 ));
+    G4double finalPx = totalMomentum*primaryDirection.x() - deltaTotalMomentum*deltaDirection.x();
+    G4double finalPy = totalMomentum*primaryDirection.y() - deltaTotalMomentum*deltaDirection.y();
+    G4double finalPz = totalMomentum*primaryDirection.z() - deltaTotalMomentum*deltaDirection.z();
+    G4double finalMomentum = std::sqrt(finalPx*finalPx + finalPy*finalPy + finalPz*finalPz);
+    finalPx /= finalMomentum;
+    finalPy /= finalMomentum;
+    finalPz /= finalMomentum;
+    product.ModifyPrimaryParticle(finalPx,finalPy,finalPz,k-bindingEnergy-secondaryKinetic);
+    product.AddEnergyDeposit(bindingEnergy);
+    G4DynamicParticle* aElectron = new G4DynamicParticle(G4Electron::Electron(),deltaDirection,secondaryKinetic);
+    product.AddSecondary(aElectron);
+  }
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationBorn::RandomizeEjectedElectronEnergy(G4ParticleDefinition* particleDefinition,
+                                                                    G4double k,
+                                                                    G4int shell)
+{
+G4double k, G4int shell)
+{
   if (particleDefinition == G4Electron::ElectronDefinition())
+    {
+      G4double maximumEnergyTransfer=0.;
+      if ((k+waterStructure.IonisationEnergy(shell))/2. > k) maximumEnergyTransfer=k;
+      else maximumEnergyTransfer = (k+waterStructure.IonisationEnergy(shell))/2.;
+  {
+    G4double maximumEnergyTransfer=0.;
+    if ((k+waterStructure.IonisationEnergy(shell))/2. > k) maximumEnergyTransfer=k;
+    else maximumEnergyTransfer = (k+waterStructure.IonisationEnergy(shell))/2.;
       G4double crossSectionMaximum = 0.;
       for(G4double value=waterStructure.IonisationEnergy(shell); value<=maximumEnergyTransfer; value+=0.1*eV)
+        {
           G4double differentialCrossSection = DifferentialCrossSection(particleDefinition, k/eV, value/eV, shell);
           if(differentialCrossSection >= crossSectionMaximum) crossSectionMaximum = differentialCrossSection;
+        }
+    G4double crossSectionMaximum = 0.;
+    for(G4double value=waterStructure.IonisationEnergy(shell); value<=maximumEnergyTransfer; value+=0.1*eV)
+    {
+      G4double differentialCrossSection = DifferentialCrossSection(particleDefinition, k/eV, value/eV, shell);
+      if(differentialCrossSection >= crossSectionMaximum) crossSectionMaximum = differentialCrossSection;
+    }
+      G4double secondaryElectronKineticEnergy=0.;
+      do
+        {
+          secondaryElectronKineticEnergy = G4UniformRand() * (maximumEnergyTransfer-waterStructure.IonisationEnergy(shell));
+        } while(G4UniformRand()*crossSectionMaximum >
+    G4double secondaryElectronKineticEnergy=0.;
+    do
+    {
+      secondaryElectronKineticEnergy = G4UniformRand() * (maximumEnergyTransfer-waterStructure.IonisationEnergy(shell));
+    } while(G4UniformRand()*crossSectionMaximum >
+      DifferentialCrossSection(particleDefinition, k/eV,(secondaryElectronKineticEnergy+waterStructure.IonisationEnergy(shell))/eV,shell));
+    return secondaryElectronKineticEnergy;
+  }
+  if (particleDefinition == G4Proton::ProtonDefinition())
+  {
+    G4double maximumKineticEnergyTransfer = 4.* (electron_mass_c2 / proton_mass_c2) * k - (waterStructure.IonisationEnergy(shell));
+    G4double crossSectionMaximum = 0.;
+    for (G4double value = waterStructure.IonisationEnergy(shell);
+         value<=4.*waterStructure.IonisationEnergy(shell) ;
+         value+=0.1*eV)
+    {
+      G4double differentialCrossSection = DifferentialCrossSection(particleDefinition, k/eV, value/eV, shell);
+      if (differentialCrossSection >= crossSectionMaximum) crossSectionMaximum = differentialCrossSection;
+    }
+    G4double secondaryElectronKineticEnergy = 0.;
+    do
+    {
+      secondaryElectronKineticEnergy = G4UniformRand() * maximumKineticEnergyTransfer;
+    } while(G4UniformRand()*crossSectionMaximum >=
               DifferentialCrossSection(particleDefinition, k/eV,(secondaryElectronKineticEnergy+waterStructure.IonisationEnergy(shell))/eV,shell));
+      return secondaryElectronKineticEnergy;
+    }
+  if (particleDefinition == G4Proton::ProtonDefinition())
+    {
+      G4double maximumKineticEnergyTransfer = 4.* (electron_mass_c2 / proton_mass_c2) * k - (waterStructure.IonisationEnergy(shell));
+      G4double crossSectionMaximum = 0.;
+      for (G4double value = waterStructure.IonisationEnergy(shell);
+           value<=4.*waterStructure.IonisationEnergy(shell) ;
+           value+=0.1*eV)
+        {
+          G4double differentialCrossSection = DifferentialCrossSection(particleDefinition, k/eV, value/eV, shell);
+          if (differentialCrossSection >= crossSectionMaximum) crossSectionMaximum = differentialCrossSection;
+        }
+      G4double secondaryElectronKineticEnergy = 0.;
+      do
+        {
+          secondaryElectronKineticEnergy = G4UniformRand() * maximumKineticEnergyTransfer;
+        } while(G4UniformRand()*crossSectionMaximum >=
+              DifferentialCrossSection(particleDefinition, k/eV,(secondaryElectronKineticEnergy+waterStructure.IonisationEnergy(shell))/eV,shell));
+      return secondaryElectronKineticEnergy;
+    }
+    return secondaryElectronKineticEnergy;
+  }
   return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4FinalStateIonisationBorn::RandomizeEjectedElectronDirection(G4ParticleDefinition* particleDefinition,
 …
+{
   if (particleDefinition == G4Electron::ElectronDefinition())
+    {
+      phi = twopi * G4UniformRand();
+      if (secKinetic < 50.*eV) cosTheta = (2.*G4UniformRand())-1.;
+      else if (secKinetic <= 200.*eV)
+        {
+          if (G4UniformRand() <= 0.1) cosTheta = (2.*G4UniformRand())-1.;
+          else cosTheta = G4UniformRand()*(std::sqrt(2.)/2);
+        }
+      else
+        {
+          G4double sin2O = (1.-secKinetic/k) / (1.+secKinetic/(2.*electron_mass_c2));
+          cosTheta = std::sqrt(1.-sin2O);
+        }
+    }
+  {
+    phi = twopi * G4UniformRand();
+    if (secKinetic < 50.*eV) cosTheta = (2.*G4UniformRand())-1.;
+    else if (secKinetic <= 200.*eV)
+    {
+      if (G4UniformRand() <= 0.1) cosTheta = (2.*G4UniformRand())-1.;
+      else cosTheta = G4UniformRand()*(std::sqrt(2.)/2);
+    }
+    else
+    {
+      G4double sin2O = (1.-secKinetic/k) / (1.+secKinetic/(2.*electron_mass_c2));
+      cosTheta = std::sqrt(1.-sin2O);
+    }
+  }
   if (particleDefinition == G4Proton::ProtonDefinition())
+    {
+      G4double maxSecKinetic = 4.* (electron_mass_c2 / proton_mass_c2) * k;
+      phi = twopi * G4UniformRand();
+      cosTheta = std::sqrt(secKinetic / maxSecKinetic);
+    }
+}
+  {
+    G4double maxSecKinetic = 4.* (electron_mass_c2 / proton_mass_c2) * k;
+    phi = twopi * G4UniformRand();
+    cosTheta = std::sqrt(secKinetic / maxSecKinetic);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 double G4FinalStateIonisationBorn::DifferentialCrossSection(G4ParticleDefinition * particleDefinition,
 …
   if (energyTransfer >= waterStructure.IonisationEnergy(ionizationLevelIndex))
+    {
+      G4double valueT1 = 0;
+      G4double valueT2 = 0;
+      G4double valueE21 = 0;
+      G4double valueE22 = 0;
+      G4double valueE12 = 0;
+      G4double valueE11 = 0;
+      G4double xs11  =  0;
+      G4double xs12 = 0;
+      G4double xs21 = 0;
+      G4double xs22 = 0;
+  {
+    G4double valueT1 = 0;
+    G4double valueT2 = 0;
+    G4double valueE21 = 0;
+    G4double valueE22 = 0;
+    G4double valueE12 = 0;
+    G4double valueE11 = 0;
+    G4double xs11 = 0;
+    G4double xs12 = 0;
+    G4double xs21 = 0;
+    G4double xs22 = 0;
+    if (particleDefinition == G4Electron::ElectronDefinition())
+    {
+      // k should be in eV and energy transfer eV also
+      std::vector<double>::iterator t2 = std::upper_bound(eTdummyVec.begin(),eTdummyVec.end(), k);
+      std::vector<double>::iterator t1 = t2-1;
+      // SI : the following condition avoids situations where energyTransfer >last vector element
+      if (energyTransfer <= eVecm[(*t1)].back())
+      {
+        std::vector<double>::iterator e12 = std::upper_bound(eVecm[(*t1)].begin(),eVecm[(*t1)].end(), energyTransfer);
+        std::vector<double>::iterator e11 = e12-1;
+        std::vector<double>::iterator e22 = std::upper_bound(eVecm[(*t2)].begin(),eVecm[(*t2)].end(), energyTransfer);
+        std::vector<double>::iterator e21 = e22-1;
+        valueT1  =*t1;
+        valueT2  =*t2;
+        valueE21 =*e21;
+        valueE22 =*e22;
+        valueE12 =*e12;
+        valueE11 =*e11;
+        xs11 = eDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE11];
+        xs12 = eDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE12];
+        xs21 = eDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE21];
+        xs22 = eDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE22];
+      }
+    }
+   if (particleDefinition == G4Proton::ProtonDefinition())
+   {
+      // k should be in eV and energy transfer eV also
+      std::vector<double>::iterator t2 = std::upper_bound(pTdummyVec.begin(),pTdummyVec.end(), k);
+      std::vector<double>::iterator t1 = t2-1;
+        std::vector<double>::iterator e12 = std::upper_bound(pVecm[(*t1)].begin(),pVecm[(*t1)].end(), energyTransfer);
+        std::vector<double>::iterator e11 = e12-1;
+        std::vector<double>::iterator e22 = std::upper_bound(pVecm[(*t2)].begin(),pVecm[(*t2)].end(), energyTransfer);
+        std::vector<double>::iterator e21 = e22-1;
+      if (particleDefinition == G4Electron::ElectronDefinition())
+        {
+          // k should be in eV and energy transfer eV also
+          std::vector<double>::iterator t2 = std::upper_bound(eTdummyVec.begin(),eTdummyVec.end(), k);
+          std::vector<double>::iterator t1 = t2-1;
+          std::vector<double>::iterator e12 = std::upper_bound(eVecm[(*t1)].begin(),eVecm[(*t1)].end(), energyTransfer);
+          std::vector<double>::iterator e11 = e12-1;
+          std::vector<double>::iterator e22 = std::upper_bound(eVecm[(*t2)].begin(),eVecm[(*t2)].end(), energyTransfer);
+          std::vector<double>::iterator e21 = e22-1;
+          valueT1  =*t1;
+          valueT2  =*t2;
+          valueE21 =*e21;
+          valueE22 =*e22;
+          valueE12 =*e12;
+          valueE11 =*e11;
+          xs11 = eDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE11];
+          xs12 = eDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE12];
+          xs21 = eDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE21];
+          xs22 = eDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE22];
+        }
+      if (particleDefinition == G4Proton::ProtonDefinition())
+        {
+          // k should be in eV and energy transfer eV also
+          std::vector<double>::iterator t2 = std::upper_bound(pTdummyVec.begin(),pTdummyVec.end(), k);
+          std::vector<double>::iterator t1 = t2-1;
+          std::vector<double>::iterator e12 = std::upper_bound(pVecm[(*t1)].begin(),pVecm[(*t1)].end(), energyTransfer);
+          std::vector<double>::iterator e11 = e12-1;
+          std::vector<double>::iterator e22 = std::upper_bound(pVecm[(*t2)].begin(),pVecm[(*t2)].end(), energyTransfer);
+          std::vector<double>::iterator e21 = e22-1;
+          valueT1  =*t1;
+          valueT2  =*t2;
+          valueE21 =*e21;
+          valueE22 =*e22;
+          valueE12 =*e12;
+          valueE11 =*e11;
+          xs11 = pDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE11];
+          xs12 = pDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE12];
+          xs21 = pDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE21];
+          xs22 = pDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE22];
+        }
+      G4double xsProduct = xs11 * xs12 * xs21 * xs22;
+      // if (xs11==0 || xs12==0 ||xs21==0 ||xs22==0) return (0.);
+      if (xsProduct != 0.)
+        {
+          sigma = QuadInterpolator(valueE11, valueE12,
+        valueT1  =*t1;
+        valueT2  =*t2;
+        valueE21 =*e21;
+        valueE22 =*e22;
+        valueE12 =*e12;
+        valueE11 =*e11;
+        xs11 = pDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE11];
+        xs12 = pDiffCrossSectionData[ionizationLevelIndex][valueT1][valueE12];
+        xs21 = pDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE21];
+        xs22 = pDiffCrossSectionData[ionizationLevelIndex][valueT2][valueE22];
+   }
+   G4double xsProduct = xs11 * xs12 * xs21 * xs22;
+   if (xsProduct != 0.)
+   {
+     sigma = QuadInterpolator(     valueE11, valueE12,
                                    valueE21, valueE22,
                                    xs11, xs12,
 …
                                    valueT1, valueT2,
                                    k, energyTransfer);
+        }
+    }
+   }
+ }
   return sigma;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationBorn::LogLogInterpolate(G4double e1,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationBorn::QuadInterpolator(G4double e11, G4double e12,

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationRudd.cc

-              r819
+              r961
 // ********************************************************************
 //
+//
+// $Id: G4FinalStateIonisationRudd.cc,v 1.5 2007/11/26 17:27:09 pia Exp $
+// GEANT4 tag $Name:  $
+//
+// Contact Author: Sebastien Incerti (incerti@cenbg.in2p3.fr)
+//                 Maria Grazia Pia  (Maria.Grazia.Pia@cern.ch)
+//
+///
+// Reference: TNS Geant4-DNA paper
+// Reference for implementation model: NIM. 155, pp. 145-156, 1978
+//
+// History:
+// -----------
+// Date         Name              Modification
+// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
+//    Nov 2007  S. Incerti        Implementation
+// 26 Nov 2007  MGP               Cleaned up std::
+//
+// -------------------------------------------------------------------
+// Class description:
+// Reference: TNS Geant4-DNA paper
+// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
+// design foundation and implementation of the first set of models,
+// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
+// Further documentation available from http://www.ge.infn.it/geant4/dna
+// -------------------------------------------------------------------
+// $Id: G4FinalStateIonisationRudd.cc,v 1.8 2008/08/20 14:51:48 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "G4FinalStateIonisationRudd.hh"
+#include "G4Track.hh"
+#include "G4Step.hh"
+#include "G4DynamicParticle.hh"
+#include "Randomize.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Electron.hh"
+#include "G4Proton.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ParticleMomentum.hh"
+#include "G4DNAGenericIonsManager.hh"
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateIonisationRudd::G4FinalStateIonisationRudd()
+{
-  name = "IonisationBorn";
-  // Default energy limits (defined for protection against anomalous behaviour only)
   lowEnergyLimitDefault = 100 * eV;
   highEnergyLimitDefault = 100 * MeV;
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4FinalStateIonisationRudd::~G4FinalStateIonisationRudd()
 { }
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 const G4FinalStateProduct& G4FinalStateIonisationRudd::GenerateFinalState(const G4Track& track, const G4Step& /* step */)
+{
-  // Clear previous secondaries, energy deposit and particle kill status
   product.Clear();
 …
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
-  // Retrieve energy limits for the current particle type
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
+    {
+      lowLim = pos1->second;
+    }
+  // Upper limit
+  {
+    lowLim = pos1->second;
+  }
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
   if (pos2 != highEnergyLimit.end())
+    {
+      highLim = pos2->second;
+    }
+  // Verify that the current track is within the energy limits of validity of the cross section model
+  {
+    highLim = pos2->second;
+  }
   if (k >= lowLim && k <= highLim)
+    {
+      // Kinetic energy of primary particle
+  {
       G4ParticleDefinition* definition = particle->GetDefinition();
       G4ParticleMomentum primaryDirection = particle->GetMomentumDirection();
 …
       G4double deltaTotalMomentum = std::sqrt(secondaryKinetic*(secondaryKinetic + 2.*electron_mass_c2 ));
-      // Primary Particle Direction
       G4double finalPx = totalMomentum*primaryDirection.x() - deltaTotalMomentum*deltaDirection.x();
       G4double finalPy = totalMomentum*primaryDirection.y() - deltaTotalMomentum*deltaDirection.y();
 …
       G4DynamicParticle* aElectron = new G4DynamicParticle(G4Electron::Electron(),deltaDirection,secondaryKinetic);
       product.AddSecondary(aElectron);
+    }
+  if (k < lowLim) {product.KillPrimaryParticle();product.AddEnergyDeposit(k);}
+  }
+  if (k < lowLim)
+  {
+    product.KillPrimaryParticle();
+  }
   return product;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::RandomizeEjectedElectronEnergy(G4ParticleDefinition* particleDefinition,
 …
   if (particleDefinition == G4Proton::ProtonDefinition()
       || particleDefinition == instance->GetIon("hydrogen"))
+    {
+  {
       maximumKineticEnergyTransfer= 4.* (electron_mass_c2 / proton_mass_c2) * k;
+    }
+  }
   if (particleDefinition == instance->GetIon("helium")
       || particleDefinition == instance->GetIon("alpha+")
       || particleDefinition == instance->GetIon("alpha++"))
+    {
+  {
       maximumKineticEnergyTransfer= 4.* (0.511 / 3728) * k;
+    }
+  }
   G4double crossSectionMaximum = 0.;
   for(G4double value=waterStructure.IonisationEnergy(shell); value<=4.*waterStructure.IonisationEnergy(shell) ; value+=0.1*eV)
+    {
+  {
       G4double differentialCrossSection = DifferentialCrossSection(particleDefinition, k, value, shell);
       if(differentialCrossSection >= crossSectionMaximum) crossSectionMaximum = differentialCrossSection;
+    }
+  }
   G4double secElecKinetic = 0.;
+  do{
+  do
+  {
     secElecKinetic = G4UniformRand() * maximumKineticEnergyTransfer;
   } while(G4UniformRand()*crossSectionMaximum > DifferentialCrossSection(particleDefinition,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4FinalStateIonisationRudd::RandomizeEjectedElectronDirection(G4ParticleDefinition* particleDefinition,
                                                                    G4double k,
                                                                    G4double secKinetic,
                                                                    G4double cosTheta,
                                                                    G4double phi )
+                                                                   G4double & cosTheta,
+                                                                   G4double & phi )
+{
   G4DNAGenericIonsManager *instance;
 …
   if (particleDefinition == G4Proton::ProtonDefinition()
       || particleDefinition == instance->GetIon("hydrogen"))
+    {
+  {
       maxSecKinetic = 4.* (electron_mass_c2 / proton_mass_c2) * k;
+    }
+  }
   if (particleDefinition == instance->GetIon("helium")
       || particleDefinition == instance->GetIon("alpha+")
       || particleDefinition == instance->GetIon("alpha++"))
+    {
+  {
       maxSecKinetic = 4.* (0.511 / 3728) * k;
+    }
+  }
   phi = twopi * G4UniformRand();
   cosTheta = std::sqrt(secKinetic / maxSecKinetic);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   if (j == 4)
+    {
+  {
       //Data For Liquid Water K SHELL from Dingfelder (Protons in Water)
       A1 = 1.25;
 …
       D2 = 0.00;
       alphaConst = 0.66;
+    }
+  }
   else
+    {
+  {
       //Data For Liquid Water from Dingfelder (Protons in Water)
       A1 = 1.02;
 …
       D2 = 0.04;
       alphaConst = 0.64;
+    }
+  }
   const G4double n = 2.;
   const G4double Gj[5] = {0.99, 1.11, 1.11, 0.52, 1.};
-  //const G4double I[5]={12.61*eV, 14.73*eV, 18.55*eV, 32.2*eV, 539.7*eV}; // for water Vapor
-  //const G4double energyConstant[]={10.79*eV, 13.39*eV, 16.05*eV, 32.30*eV, 539.*eV};
   G4DNAGenericIonsManager* instance;
 …
   if (particleDefinition == G4Proton::ProtonDefinition()
       || particleDefinition == instance->GetIon("hydrogen"))
+    {
+  {
       tau = (electron_mass_c2/proton_mass_c2) * k ;
+    }
+  }
   if ( particleDefinition == instance->GetIon("helium")
        || particleDefinition == instance->GetIon("alpha+")
        || particleDefinition == instance->GetIon("alpha++"))
+    {
+  {
       tau = (0.511/3728.) * k ;
+    }
+  }
   G4double S = 4.*pi * Bohr_radius*Bohr_radius * n * std::pow((Ry/waterStructure.IonisationEnergy(ionizationLevelIndex)),2);
 …
           || particleDefinition == instance->GetIon("hydrogen")
+          )
+    {
+  {
       return(sigma);
+    }
+  // ------------
+  }
   if (particleDefinition == instance->GetIon("alpha++") )
+    {
+  {
       slaterEffectiveCharge[0]=0.;
       slaterEffectiveCharge[1]=0.;
 …
       sCoefficient[1]=0.;
       sCoefficient[2]=0.;
+    }
+  }
   if (particleDefinition == instance->GetIon("alpha+") )
+    {
+  {
       slaterEffectiveCharge[0]=2.0;
       slaterEffectiveCharge[1]=1.15;
 …
       sCoefficient[1]=0.15;
       sCoefficient[2]=0.15;
+    }
+  }
   if (particleDefinition == instance->GetIon("helium") )
+    {
+  {
       slaterEffectiveCharge[0]=1.7;
       slaterEffectiveCharge[1]=1.15;
 …
       sCoefficient[1]=0.25;
       sCoefficient[2]=0.25;
+    }
+  }
   if (    particleDefinition == instance->GetIon("helium")
 …
           || particleDefinition == instance->GetIon("alpha++")
+          )
+    {
+  {
       sigma = Gj[j] * (S/waterStructure.IonisationEnergy(ionizationLevelIndex)) * ( (F1+w*F2) / ( std::pow((1.+w),3) * ( 1.+std::exp(alphaConst*(w-wc)/v))) );
 …
       return zEff * zEff * sigma ;
+    }
+  }
   return 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::S_1s(G4double t,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::S_2s(G4double t,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::S_2p(G4double t,
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::R(G4double t,
 …
+{
   // tElectron = m_electron / m_alpha * t
-  // Hardcoded in Riccardo's implementation; to be corrected
   // Dingfelder, in Chattanooga 2005 proceedings, p 4
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4FinalStateIonisationRudd::CorrectionFactor(G4ParticleDefinition* particleDefinition, G4double k)
 …
   if (particleDefinition == G4Proton::Proton())
+    {
+  {
       return(1.);
+    }
+  }
   else
     if (particleDefinition == instance->GetIon("hydrogen"))
+      {
+    {
         G4double value = (std::log(k/eV)-4.2)/0.5;
         return((0.8/(1+std::exp(value))) + 0.9);
+      }
+    }
     else
+      {
+    {
         return(1.);
+      }
+}
+    }
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateKill.cc

r819	r961
26	26	//
27	27	// $Id: G4FinalStateKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateProduct.cc

-              r819
+              r961
 //
 //
 // $Id: G4FinalStateProduct.cc,v 1.5 2007/11/09 20:11:04 pia Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4FinalStateProduct.cc,v 1.6 2009/01/20 07:50:28 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 #include "G4ThreeVector.hh"
 G4FinalStateProduct::G4FinalStateProduct() : killStatus(false), isModified(false), localEnergyDeposit(0.), modifiedEnergy(0)
+G4FinalStateProduct::G4FinalStateProduct() : killStatus(false), doNotDepositStatus(false), isModified(false), localEnergyDeposit(0.), modifiedEnergy(0)
+{
   // empty
 …
   // Reset object status
   killStatus = false;
+  doNotDepositStatus = false;
   isModified = false;
   localEnergyDeposit = 0.;
 …
+}
+void G4FinalStateProduct::DoNotDepositEnergy()
+{
+  doNotDepositStatus = true;
+}
 void G4FinalStateProduct::KillPrimaryParticle()
+{
   // ---- MGP ---- To be added: Handle local energy deposit here
   killStatus = true;

trunk/source/processes/electromagnetic/lowenergy/src/G4FluoTransition.cc

r819	r961
26	26	//
27	27	// $Id: G4FluoTransition.cc,v 1.2 ????
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc

r819	r961
26	26	//
27	27	// $Id: G4LinInterpolation.cc,v 1.3 2006/06/29 19:40:03 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc

-              r819
+              r961
 //
 //
 // $Id: G4LogLogInterpolation.cc,v 1.7 2006/06/29 19:40:09 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LogLogInterpolation.cc,v 1.14 2008/12/12 08:50:59 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
+//
+//         Sebastian Incerti (incerti@cenbg.in2p3.fr)
+//         Nicolas A. Karakatsanis (knicolas@mail.ntua.gr)
 // History:
 // -----------
 // 31 Jul 2001   MGP        Created
+//
+// 27 Jun 2008   SI         Add check to avoid FPE errors
+// 08 Dec 2008   NAK        Log-Log interpolation math formula streamlined, self-test function
 // -------------------------------------------------------------------
 …
+{
   G4int nBins = data.size() - 1;
+//G4double oldresult = 0.;
   G4double value = 0.;
   if (x < points[0])
 …
       G4double d1 = data[bin];
       G4double d2 = data[bin+1];
+      value = (std::log10(d1)*std::log10(e2/x) + std::log10(d2)*std::log10(x/e1)) / std::log10(e2/e1);
+      value = std::pow(10.,value);
+// Check of e1, e2, d1 and d2 values to avoid floating-point errors when estimating the interpolated value below -- S.I., Jun. 2008
+      if ((d1 > 0.) && (d2 > 0.) && (e1 > 0.) && (e2 > 0.))
+        {
+// Streamline the Log-Log Interpolation formula in order to reduce the required number of log10() function calls
+// Variable oldresult contains the result of old implementation of Log-Log interpolation -- M.G.P. Jun. 2001
+//       oldresult = (std::log10(d1)*std::log10(e2/x) + std::log10(d2)*std::log10(x/e1)) / std::log10(e2/e1);
+//       oldresult = std::pow(10.,oldresult);
+// Variable value contains the result of new implementation, after streamlining the math operation -- N.A.K. Oct. 2008
+         value = std::log10(d1)+(std::log10(d2/d1)/std::log10(e2/e1)*std::log10(x/e1));
+         value = std::pow(10.,value);
+// Test of the new implementation result (value variable) against the old one (oldresult) -- N.A.K. Dec. 2008
+//       G4double diffResult = value - oldresult;
+//       G4double relativeDiff = 1e-11;
+// Comparison of the two values based on a max allowable relative difference
+//       if ( std::fabs(diffResult) > relativeDiff*std::fabs(oldresult) )
+//        {
+// Abort comparison when at least one of two results is infinite
+//           if ((!std::isinf(oldresult)) && (!std::isinf(value)))
+//            {
+//              G4cout << "G4LogLogInterpolation> Old Interpolated Value is:" << oldresult << G4endl;
+//              G4cout << "G4LogLogInterpolation> New Interpolated Value is:" << value << G4endl << G4endl;
+//              G4cerr << "G4LogLogInterpolation> Error in Interpolation:" << G4endl;
+//              G4cerr << "The difference between new and old interpolated value is:" << diffResult << G4endl << G4endl;
+//            }
+//        }
+        }
+      else value = 0.;
+    }
   else
 …
       value = data[nBins];
+    }
   return value;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc

r819	r961
25	25	//
26	26	// $Id: G4LowEnergyBremsstrahlung.cc,v 1.71 2006/06/29 19:40:13 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LowEnergyCompton.cc,v 1.41 2006/06/29 19:40:15 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4LowEnergyCompton.cc,v 1.47 2008/12/18 13:01:28 gunter Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: A. Forti
 …
 #include "G4VRangeTest.hh"
 #include "G4RangeTest.hh"
+#include "G4RangeNoTest.hh"
 #include "G4MaterialCutsCouple.hh"
 …
   meanFreePathTable = 0;
+  rangeTest = new G4RangeTest;
+  rangeTest = new G4RangeNoTest;
+  // For Doppler broadening
+  shellData.SetOccupancyData();
    if (verboseLevel > 0)
 …
   delete meanFreePathTable;
   meanFreePathTable = crossSectionHandler->BuildMeanFreePathForMaterials();
+  // For Doppler broadening
+  G4String file = "/doppler/shell-doppler";
+  shellData.LoadData(file);
+}
 …
   G4double e0m = photonEnergy0 / electron_mass_c2 ;
   G4ParticleMomentum photonDirection0 = incidentPhoton->GetMomentumDirection();
-  // Select randomly one element in the current material
-  const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple();
-  G4int Z = crossSectionHandler->SelectRandomAtom(couple,photonEnergy0);
   G4double epsilon0 = 1. / (1. + 2. * e0m);
   G4double epsilon0Sq = epsilon0 * epsilon0;
   G4double alpha1 = -std::log(epsilon0);
   G4double alpha2 = 0.5 * (1. - epsilon0Sq);
   G4double wlPhoton = h_Planck*c_light/photonEnergy0;
+  // Select randomly one element in the current material
+  const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple();
+  G4int Z = crossSectionHandler->SelectRandomAtom(couple,photonEnergy0);
   // Sample the energy of the scattered photon
 …
   G4double sinTheta = std::sqrt (sinT2);
   G4double phi = twopi * G4UniformRand() ;
+  G4double dirx = sinTheta * std::cos(phi);
+  G4double diry = sinTheta * std::sin(phi);
+  G4double dirz = cosTheta ;
+  G4double dirX = sinTheta * std::cos(phi);
+  G4double dirY = sinTheta * std::sin(phi);
+  G4double dirZ = cosTheta ;
+  // Doppler broadening -  Method based on:
+  // Y. Namito, S. Ban and H. Hirayama,
+  // "Implementation of the Doppler Broadening of a Compton-Scattered Photon Into the EGS4 Code"
+  // NIM A 349, pp. 489-494, 1994
+  // Maximum number of sampling iterations
+  G4int maxDopplerIterations = 1000;
+  G4double bindingE = 0.;
+  G4double photonEoriginal = epsilon * photonEnergy0;
+  G4double photonE = -1.;
+  G4int iteration = 0;
+  G4double eMax = photonEnergy0;
+  do
+    {
+      iteration++;
+      // Select shell based on shell occupancy
+      G4int shell = shellData.SelectRandomShell(Z);
+      bindingE = shellData.BindingEnergy(Z,shell);
+      eMax = photonEnergy0 - bindingE;
+      // Randomly sample bound electron momentum (memento: the data set is in Atomic Units)
+      G4double pSample = profileData.RandomSelectMomentum(Z,shell);
+      // Rescale from atomic units
+      G4double pDoppler = pSample * fine_structure_const;
+      G4double pDoppler2 = pDoppler * pDoppler;
+      G4double var2 = 1. + oneCosT * e0m;
+      G4double var3 = var2*var2 - pDoppler2;
+      G4double var4 = var2 - pDoppler2 * cosTheta;
+      G4double var = var4*var4 - var3 + pDoppler2 * var3;
+      if (var > 0.)
+        {
+          G4double varSqrt = std::sqrt(var);
+          G4double scale = photonEnergy0 / var3;
+          // Random select either root
+          if (G4UniformRand() < 0.5) photonE = (var4 - varSqrt) * scale;
+          else photonE = (var4 + varSqrt) * scale;
+        }
+      else
+        {
+          photonE = -1.;
+        }
+   } while ( iteration <= maxDopplerIterations &&
+             (photonE < 0. || photonE > eMax || photonE < eMax*G4UniformRand()) );
+  // End of recalculation of photon energy with Doppler broadening
+  // Revert to original if maximum number of iterations threshold has been reached
+  if (iteration >= maxDopplerIterations)
+    {
+      photonE = photonEoriginal;
+      bindingE = 0.;
+    }
   // Update G4VParticleChange for the scattered photon
   G4ThreeVector photonDirection1(dirx,diry,dirz);
+  G4ThreeVector photonDirection1(dirX,dirY,dirZ);
   photonDirection1.rotateUz(photonDirection0);
+  aParticleChange.ProposeMomentumDirection(photonDirection1) ;
+  G4double photonEnergy1 = epsilon * photonEnergy0;
+  aParticleChange.ProposeMomentumDirection(photonDirection1);
+  G4double photonEnergy1 = photonE;
+  //G4cout << "--> PHOTONENERGY1 = " << photonE/keV << G4endl;
   if (photonEnergy1 > 0.)
 …
   // Kinematics of the scattered electron
+  G4double eKineticEnergy = photonEnergy0 - photonEnergy1;
+  G4double eKineticEnergy = photonEnergy0 - photonEnergy1 - bindingE;
+  G4double eTotalEnergy = eKineticEnergy + electron_mass_c2;
+  G4double electronE = photonEnergy0 * (1. - epsilon) + electron_mass_c2;
+  G4double electronP2 = electronE*electronE - electron_mass_c2*electron_mass_c2;
+  G4double sinThetaE = -1.;
+  G4double cosThetaE = 0.;
+  if (electronP2 > 0.)
+    {
+      cosThetaE = (eTotalEnergy + photonEnergy1 )* (1. - epsilon) / std::sqrt(electronP2);
+      sinThetaE = -1. * std::sqrt(1. - cosThetaE * cosThetaE);
+    }
+  G4double eDirX = sinThetaE * std::cos(phi);
+  G4double eDirY = sinThetaE * std::sin(phi);
+  G4double eDirZ = cosThetaE;
   // Generate the electron only if with large enough range w.r.t. cuts and safety
 …
   if (rangeTest->Escape(G4Electron::Electron(),couple,eKineticEnergy,safety))
+    {
+      G4double eMomentum = std::sqrt(eKineticEnergy*(eKineticEnergy+2.*electron_mass_c2));
+      G4ThreeVector eDirection((photonEnergy0 * photonDirection0 -
+                                photonEnergy1 * photonDirection1) * (1./eMomentum));
+      G4DynamicParticle* electron = new G4DynamicParticle (G4Electron::Electron(),
+                                                           eDirection,eKineticEnergy) ;
+      G4ThreeVector eDirection(eDirX,eDirY,eDirZ);
+      eDirection.rotateUz(photonDirection0);
+      G4DynamicParticle* electron = new G4DynamicParticle (G4Electron::Electron(),eDirection,eKineticEnergy) ;
       aParticleChange.SetNumberOfSecondaries(1);
       aParticleChange.AddSecondary(electron);
+      aParticleChange.ProposeLocalEnergyDeposit(0.);
+      // Binding energy deposited locally
+      aParticleChange.ProposeLocalEnergyDeposit(bindingE);
+    }
   else
+    {
       aParticleChange.SetNumberOfSecondaries(0);
       aParticleChange.ProposeLocalEnergyDeposit(eKineticEnergy);
+      aParticleChange.ProposeLocalEnergyDeposit(eKineticEnergy + bindingE);
+    }

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc

r819	r961
27	27	///
28	28	// $Id: G4LowEnergyGammaConversion.cc,v 1.36 2006/06/29 19:40:17 gunter Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	//

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LowEnergyIonisation.cc,v 1.102 2006/06/29 19:40:19 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LowEnergyIonisation.cc,v 1.103 2008/05/02 19:23:38 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // --------------------------------------------------------------
 …
                   type = aSecondary->GetDefinition();
                   if ( eTot + e <= eLoss &&
                      (type == G4Gamma::Gamma() && e>cutForPhotons ) ||
                      (type == G4Electron::Electron() && e>cutForElectrons)) {
+                     ((type == G4Gamma::Gamma() && e>cutForPhotons ) ||
+                     (type == G4Electron::Electron() && e>cutForElectrons))) {
                           eTot += e;

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc

r819	r961
26	26	//
27	27	// $Id: G4LowEnergyPhotoElectric.cc,v 1.56 2006/06/29 19:40:23 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc

-              r819
+              r961
 //
 //
 // $Id: G4LowEnergyPolarizedCompton.cc,v 1.22 2006/06/29 19:40:25 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LowEnergyPolarizedCompton.cc,v 1.25 2008/05/02 19:23:38 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
 …
   rangeTest = new G4RangeTest;
+  // For Doppler broadening
+  shellData.SetOccupancyData();
    if (verboseLevel > 0)
+     {
 …
   delete meanFreePathTable;
   meanFreePathTable = crossSectionHandler->BuildMeanFreePathForMaterials();
+  // For Doppler broadening
+  G4String file = "/doppler/shell-doppler";
+  shellData.LoadData(file);
+}
 …
   G4double dirz = cosTheta ;
+  // oneCosT , eom
+  // Doppler broadening -  Method based on:
+  // Y. Namito, S. Ban and H. Hirayama,
+  // "Implementation of the Doppler Broadening of a Compton-Scattered Photon Into the EGS4 Code"
+  // NIM A 349, pp. 489-494, 1994
+  // Maximum number of sampling iterations
+  G4int maxDopplerIterations = 1000;
+  G4double bindingE = 0.;
+  G4double photonEoriginal = epsilon * gammaEnergy0;
+  G4double photonE = -1.;
+  G4int iteration = 0;
+  G4double eMax = gammaEnergy0;
+  do
+    {
+      iteration++;
+      // Select shell based on shell occupancy
+      G4int shell = shellData.SelectRandomShell(Z);
+      bindingE = shellData.BindingEnergy(Z,shell);
+      eMax = gammaEnergy0 - bindingE;
+      // Randomly sample bound electron momentum (memento: the data set is in Atomic Units)
+      G4double pSample = profileData.RandomSelectMomentum(Z,shell);
+      // Rescale from atomic units
+      G4double pDoppler = pSample * fine_structure_const;
+      G4double pDoppler2 = pDoppler * pDoppler;
+      G4double var2 = 1. + onecost * E0_m;
+      G4double var3 = var2*var2 - pDoppler2;
+      G4double var4 = var2 - pDoppler2 * cosTheta;
+      G4double var = var4*var4 - var3 + pDoppler2 * var3;
+      if (var > 0.)
+        {
+          G4double varSqrt = std::sqrt(var);
+          G4double scale = gammaEnergy0 / var3;
+          // Random select either root
+          if (G4UniformRand() < 0.5) photonE = (var4 - varSqrt) * scale;
+          else photonE = (var4 + varSqrt) * scale;
+        }
+      else
+        {
+          photonE = -1.;
+        }
+   } while ( iteration <= maxDopplerIterations &&
+             (photonE < 0. || photonE > eMax || photonE < eMax*G4UniformRand()) );
+  // End of recalculation of photon energy with Doppler broadening
+  // Revert to original if maximum number of iterations threshold has been reached
+  if (iteration >= maxDopplerIterations)
+    {
+      photonE = photonEoriginal;
+      bindingE = 0.;
+    }
+  gammaEnergy1 = photonE;
+  // G4cout << "--> PHOTONENERGY1 = " << photonE/keV << G4endl;
+  /// Doppler Broadeing
   //
   // update G4VParticleChange for the scattered photon
   //
+  gammaEnergy1 = epsilon*gammaEnergy0;
+  //  gammaEnergy1 = epsilon*gammaEnergy0;
   // New polarization
 …
   //
+  G4double ElecKineEnergy = gammaEnergy0 - gammaEnergy1 ;
+  G4double ElecKineEnergy = gammaEnergy0 - gammaEnergy1 -bindingE;
   // Generate the electron only if with large enough range w.r.t. cuts and safety
   G4double safety = aStep.GetPostStepPoint()->GetSafety();
   if (rangeTest->Escape(G4Electron::Electron(),couple,ElecKineEnergy,safety))
 …
       aParticleChange.SetNumberOfSecondaries(1);
       aParticleChange.AddSecondary(electron);
+      aParticleChange.ProposeLocalEnergyDeposit(0.);
+      //      aParticleChange.ProposeLocalEnergyDeposit(0.);
+      aParticleChange.ProposeLocalEnergyDeposit(bindingE);
+    }
   else
+    {
       aParticleChange.SetNumberOfSecondaries(0);
       aParticleChange.ProposeLocalEnergyDeposit(ElecKineEnergy);
+      aParticleChange.ProposeLocalEnergyDeposit(ElecKineEnergy+bindingE);
+    }
 …
   //  G4double sinsqrphi = sinPhi*sinPhi;
   G4double normalisation = std::sqrt(1. - cosSqrPhi*sinSqrTh);
   // Determination of Theta
+  G4double thetaProbability;
+  // ---- MGP ---- Commented out the following 3 lines to avoid compilation
+  // warnings (unused variables)
+  // G4double thetaProbability;
   G4double theta;
+  G4double a, b;
+  G4double cosTheta;
+  // G4double a, b;
+  // G4double cosTheta;
+  /*
+  depaola method
   do
+    {
+  {
       rand1 = G4UniformRand();
       rand2 = G4UniformRand();
 …
   G4double cosBeta = cosTheta;
+  */
+  // Dan Xu method (IEEE TNS, 52, 1160 (2005))
+  rand1 = G4UniformRand();
+  rand2 = G4UniformRand();
+  if (rand1<(epsilon+1.0/epsilon-2)/(2.0*(epsilon+1.0/epsilon)-4.0*sinSqrTh*cosSqrPhi))
+    {
+      if (rand2<0.5)
+        theta = pi/2.0;
+      else
+        theta = 3.0*pi/2.0;
+    }
+  else
+    {
+      if (rand2<0.5)
+        theta = 0;
+      else
+        theta = pi;
+    }
+  G4double cosBeta = std::cos(theta);
   G4double sinBeta = std::sqrt(1-cosBeta*cosBeta);

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedRayleigh.cc

r819	r961
25	25	//
26	26	// $Id: G4LowEnergyPolarizedRayleigh.cc,v 1.7 2006/06/29 19:40:27 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc

r819	r961
27	27	//
28	28	// $Id: G4LowEnergyRayleigh.cc,v 1.37 2006/06/29 19:40:29 gunter Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: A. Forti

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlung.cc

r819	r961
25	25	//
26	26	// $Id: G4PenelopeBremsstrahlung.cc,v 1.18 2006/06/29 19:40:35 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc

r819	r961
25	25	//
26	26	// $Id: G4PenelopeBremsstrahlungAngular.cc,v 1.7 2006/06/29 19:40:37 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungContinuous.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PenelopeBremsstrahlungContinuous.cc,v 1.9 2006/06/29 19:40:39 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PenelopeBremsstrahlungContinuous.cc,v 1.11 2008/12/15 09:23:06 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // --------------------------------------------------------------
 …
 // 19 Mar 2003  L. Pandola       Bugs fixed
 // 17 Mar 2004  L. Pandola       Removed unnecessary calls to std::pow(a,b)
+// 09 Dec 2008  L. Pandola       Update ReadFile() in a way to make explicit use of the units of
+//                               measurement. Also some cosmetics to improve readibility.
 //----------------------------------------------------------------
 …
 #include <sstream>
+G4PenelopeBremsstrahlungContinuous::G4PenelopeBremsstrahlungContinuous (G4int Zed,G4double taglio,G4double e1,
+G4PenelopeBremsstrahlungContinuous::G4PenelopeBremsstrahlungContinuous (G4int Zed,G4double cut,
+                                                                        G4double e1,
                                                                         G4double e2,
                                                                         const G4String name)  :
   Zmat(Zed),tCut(taglio),MinE(e1),MaxE(e2),partName(name)
+  Zmat(Zed),tCut(cut),MinE(e1),MaxE(e2),partName(name)
+{
   //Construct extended energy table
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4PenelopeBremsstrahlungContinuous::~G4PenelopeBremsstrahlungContinuous()
+{
+}
+{;}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4PenelopeBremsstrahlungContinuous::LoadFromFile()
 …
  G4String dirFile = pathString + "/penelope/" + name;
  std::ifstream file(dirFile);
+ std::filebuf* lsdp = file.rdbuf();
+ if (!(lsdp->is_open()))
+ if (!file.is_open())
+     {
       G4String excep = "G4PenelopeBremsstrahlungContinuous - data file " + name + " not found!";
       G4Exception(excep);
+     }
+ G4double a1;
+ for (size_t i=0;i<NumberofEPoints;i++){
+   file >> a1;
+   Energies[i]=a1;
+   for (size_t j=0;j<NumberofKPoints;j++){
+ G4double a1 = -1.;
+ for (size_t i=0;i<NumberofEPoints;i++)
+   {
      file >> a1;
+     ReducedCS[i][j]=a1/millibarn; //coversion present in Penelope source
+     //1) reads energy in MeV
+     Energies[i]=a1*MeV;
+     //2) read 32 cross sections in cm2
+     for (size_t j=0;j<NumberofKPoints;j++){
+       file >> a1;
+       ReducedCS[i][j]=a1*cm2;
+     }
+     //3) read the total cross section, in cm2
+     file >> a1;
+     TotalCS[i]=a1*cm2;
+     // Check closing item
+     file >> a1;
+     if (a1 != ((G4double) -1))
+       {
+         G4String excep = "G4PenelopeBremsstrahlungContinuous - Check the bremms data file "
+           + name;
+         G4Exception(excep);
+       }
+   }
-   file >> a1;
-   TotalCS[i]=a1/millibarn; //conversion present in Penelope source
-   file >> a1;
-   if (a1 != ((G4double) -1)){
-     G4String excep = "G4PenelopeBremsstrahlungContinuous - Check the bremms data file "+ name;
-     G4Exception(excep);
+   }
+ }
  file.close();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4PenelopeBremsstrahlungContinuous::PrepareInterpolationTable()
 …
     delete interpolator;
     G4double Fact = (millibarn/cm2)*(Energies[i]+electron_mass_c2)*(1.0/fine_structure_const)/
+    G4double Fact = (Energies[i]+electron_mass_c2)*(1.0/fine_structure_const)*millibarn/
       (classic_electr_radius*classic_electr_radius*(Energies[i]+2.0*electron_mass_c2));
     G4double Normalization = TotalCS[i]/(Rsum*Fact);
     G4double TST = std::abs(Normalization-100.0);
+    G4double TST = std::abs(Normalization-1.0);
     if (TST > 1.0) {
       G4String excep = "G4PenelopeBremsstrahlungContinuous - Check the bremms data file";
 …
+  }
+  //Forse questa roba (e Pbcut come membro privato) non serve
+ //  G4double PDF[NumberofKPoints];
+//   for (i=0;i<NumberofExtendedEGrid;i++){
+//     for (j=0;j<NumberofKPoints;j++){
+//       PDF[j]=p0[i][j];
+//     }
+//     G4double Xc=0;
+//     if (i<(NumberofExtendedEGrid-1)){
+//       Xc=tCut/std::exp(ExtendedLogEnergy[i+1]);
+//     }
+//     else
+//       {
+//      Xc=tCut/std::exp(ExtendedLogEnergy[NumberofExtendedEGrid-1]);
+//       }
+  //All this stuff might be useful later on
+  /*
+  G4double PDF[NumberofKPoints];
+  for (i=0;i<NumberofExtendedEGrid;i++){
+    for (j=0;j<NumberofKPoints;j++){
+      PDF[j]=p0[i][j];
+    }
+    G4double Xc=0;
+    if (i<(NumberofExtendedEGrid-1)){
+      Xc=tCut/std::exp(ExtendedLogEnergy[i+1]);
+    }
+    else
+      {
+        Xc=tCut/std::exp(ExtendedLogEnergy[NumberofExtendedEGrid-1]);
+      }
+//     G4PenelopeInterpolator* interpolator3 = new G4PenelopeInterpolator(pK,PDF,NumberofKPoints);
+//     Pbcut[i]=interpolator3->CalculateMomentum(Xc,-1);
+//     delete interpolator3;
+//   }
+}
+    G4PenelopeInterpolator* interpolator3 = new G4PenelopeInterpolator(pK,PDF,NumberofKPoints);
+    Pbcut[i]=interpolator3->CalculateMomentum(Xc,-1);
+    delete interpolator3;
+  }
+  */
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4double G4PenelopeBremsstrahlungContinuous::CalculateStopping(G4double e1)
+G4double G4PenelopeBremsstrahlungContinuous::CalculateStopping(G4double energy)
   //Stopping power expressed in MeV/mm*2
+{
   G4double Xel=std::max(std::log(e1),ExtendedLogEnergy[0]);
+  G4double Xel=std::max(std::log(energy),ExtendedLogEnergy[0]);
   G4double Xe=1.0+(Xel-ExtendedLogEnergy[0])*DLFC;
   G4int Ke = (G4int) Xe;
 …
   //Global x-section factor
   G4double Fact=Zmat*Zmat*(e1+electron_mass_c2)*(e1+electron_mass_c2)/(e1*(e1+2.0*electron_mass_c2))
   *(millibarn/cm2);
   Fact=Fact*PositronCorrection(e1);
+  G4double Fact=Zmat*Zmat*(energy+electron_mass_c2)*(energy+electron_mass_c2)/
+    (energy*(energy+2.0*electron_mass_c2));
+  Fact *= PositronCorrection(energy);
   //Moments of the scaled bremss x-section
   G4double wcre = tCut/e1;
+  G4double wcre = tCut/energy;
   G4double pY[NumberofKPoints];
   G4double pK[NumberofKPoints] = {1.0e-12,0.05,0.075,0.1,0.125,0.15,0.2,0.25,
 …
   G4PenelopeInterpolator* interpolator1 = new G4PenelopeInterpolator(pK,pY,NumberofKPoints);
   G4double XS1A = interpolator1->CalculateMomentum(wcre,0);
-  G4double XS2A = interpolator1->CalculateMomentum(wcre,1);
-  delete interpolator1;
   for (size_t k=0;k<NumberofKPoints;k++){
     pY[k] = p0[std::min(Ke+1,(G4int) NumberofExtendedEGrid-1)][k];
 …
   G4PenelopeInterpolator* interpolator2 = new G4PenelopeInterpolator (pK,pY,NumberofKPoints);
   G4double XS1B = interpolator2->CalculateMomentum(wcre,0);
+  G4double XS2B = interpolator2->CalculateMomentum(wcre,1);
+  G4double XS1 = ((1.0-Xek)*XS1A+Xek*XS1B)*Fact*energy; //weighted mean between the energy bin of the grid
+  //This is the 2nd momentum (straggling cross section). It might be useful later on
+  /*
+    G4double XS2A = interpolator1->CalculateMomentum(wcre,1);
+    G4double XS2 = ((1.0-Xek)*XS2A+Xek*XS2B)*Fact*energy*energy;
+    G4double XS2B = interpolator2->CalculateMomentum(wcre,1);
+  */
+  delete interpolator1;
   delete interpolator2;
+  G4double XS1 = ((1.0-Xek)*XS1A+Xek*XS1B)*Fact*e1; //weighted mean between the energy bin of the grid
+  G4double XS2 = ((1.0-Xek)*XS2A+Xek*XS2B)*Fact*e1*e1; //straggling cross section (2nd momentum);
+  //Il secondo momento XS2 potrebbe tornare utile in seguito
+  //XS1 is given in MeV*cm2, as in Penelope, but it must be converted in MeV*mm2
+  XS1=XS1*cm2/mm2;
+  //XS2 is given in MeV2*cm2, as in Penelope, but it must be converted in MeV2*mm2
+  XS2=XS2*cm2/mm2;
+  //Deve includere anche le famose correzioni per tenere conto
+  //che la sezione d'urto varia sullo step!
+  //Il valore che tira fuori va nella tabella e non viene piu' modificato
   return XS1;
+}
+G4double G4PenelopeBremsstrahlungContinuous::PositronCorrection(G4double en)
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4PenelopeBremsstrahlungContinuous::PositronCorrection(G4double energy)
+{
   const G4double Coeff[7]={-1.2359e-01,6.1274e-2,-3.1516e-2,7.7446e-3,-1.0595e-3,
 .0568e-5,-1.8080e-6};
-  G4double T=0;
   G4double correct=0;
   if (partName == "e-") {
 …
+  }
   else if (partName == "e+"){
     T=std::log(1+((1e6*en)/(Zmat*Zmat*electron_mass_c2)));
+    G4double T=std::log(1+((1e6*energy)/(Zmat*Zmat*electron_mass_c2)));
     for (G4int i=0;i<7;i++){
       correct += Coeff[i]*std::pow(T,i+1);
 …
     return correct;
+  }
   else //ne' elettroni ne' positroni...exception
+  else //neither electrons nor positrons...exception
+    {
       G4String excep = "G4PenelopeBremmstrahlungContinuous: the particle is not e- nor e+!";

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCompton.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PenelopeCompton.cc,v 1.26 2006/06/29 19:40:41 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PenelopeCompton.cc,v 1.33 2008/06/03 15:44:25 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Luciano Pandola
 …
 // 17 Mar 2004 L.Pandola      Removed unnecessary calls to std::pow(a,b)
 // 18 Mar 2004 L.Pandola      Use of std::map (code review)
+// 26 Mar 2008 L.Pandola      Add boolean flag to control atomic de-excitation
+// 27 Mar 2008 L.Pandola      Re-named some variables to improve readability,
+//                            and check for strict energy conservation
+// 03 Jun 2008 L.Pandola      Added further protection against non-conservation
+//                            of energy: it may happen because ionization energy
+//                            from de-excitation manager and from Penelope internal
+//                            database do not match (difference is <10 eV, but may
+//                            give a e- with negative kinetic energy).
 //
 // -------------------------------------------------------------------
 …
     ZForIntegration(1),
     nBins(200),
+    cutForLowEnergySecondaryPhotons(250.0*eV)
+    cutForLowEnergySecondaryPhotons(250.0*eV),
+    fUseAtomicDeexcitation(true)
+{
   if (lowEnergyLimit < intrinsicLowEnergyLimit ||
 …
   delete rangeTest;
   for (size_t i1=0;i1<matCrossSections->size();i1++)
+    {
       delete (*matCrossSections)[i1];
+  for (size_t i=0;i<matCrossSections->size();i++)
+    {
+      delete (*matCrossSections)[i];
+    }
 …
   G4DataVector energyVector;
   G4double dBin = std::log10(highEnergyLimit/lowEnergyLimit)/nBins;
+  G4int i;
+  for (i=0;i<nBins;i++)
+  for (G4int i=0;i<nBins;i++)
+    {
       energyVector.push_back(std::pow(10.,std::log10(lowEnergyLimit)+i*dBin));
 …
   G4VDataSetAlgorithm* algo = new G4LogLogInterpolation();
   size_t nOfBins = energyVector.size();
   size_t bin=0;
+  //size_t nOfBins = energyVector.size();
+  //size_t bin=0;
   G4DataVector* energies;
 …
   matCrossSections = new std::vector<G4VEMDataSet*>;
+  G4int m;
+  for (m=0; m<nMaterials; m++)
+  for (G4int m=0; m<nMaterials; m++)
+    {
       const G4Material* material= (*materialTable)[m];
 …
       G4VEMDataSet* setForMat = new G4CompositeEMDataSet(algo,1.,1.);
       for (i=0; i<nElements; i++) {
+      for (G4int i=0; i<nElements; i++) {
         G4int Z = (G4int) (*elementVector)[i]->GetZ();
 …
         for (bin=0; bin<nOfBins; bin++)
+        for (size_t bin=0; bin<energyVector.size(); bin++)
+          {
             G4double e = energyVector[bin];
 …
   for (m=0; m<nMaterials; m++)
+  for (G4int m=0; m<nMaterials; m++)
+    {
       energies = new G4DataVector;
 …
       const G4Material* material= (*materialTable)[m];
       material= (*materialTable)[m];
       for (bin=0; bin<nOfBins; bin++)
+      for (size_t bin=0; bin<energyVector.size(); bin++)
+        {
           G4double energy = energyVector[bin];
 …
   const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple();
   const G4Material* material = couple->GetMaterial();
   G4int Z = SelectRandomAtomForCompton(material,photonEnergy0);
   const G4int nmax = 64;
 …
   a1 = std::log(ki2);
   a2 = a1+2.0*ki*(1.0+ki)/(ki2*ki2);
+  //If the incoming photon is above 5 MeV, the quicker approach based on the
+  //pure Klein-Nishina formula is used
   if (photonEnergy0 > 5*MeV)
+    {
 …
       }while((epsilon*photonEnergy0-photonEnergy0+ionEnergy) >0);
+    }
   else //photonEnergy0<5 MeV
+    {
 …
                 if (pzomc > 0)
+                  {
+                    rn[i] = 1.0-0.5*std::exp(0.5-(std::sqrt(0.5)+std::sqrt(2.0)*pzomc)*(std::sqrt(0.5)+std::sqrt(2.0)*pzomc));
+                    rn[i] = 1.0-0.5*std::exp(0.5-(std::sqrt(0.5)+std::sqrt(2.0)*pzomc)*
+                                             (std::sqrt(0.5)+std::sqrt(2.0)*pzomc));
+                  }
                 else
+                  {
+                    rn[i] = 0.5*std::exp(0.5-(std::sqrt(0.5)-std::sqrt(2.0)*pzomc)*(std::sqrt(0.5)-std::sqrt(2.0)*pzomc));
+                    rn[i] = 0.5*std::exp(0.5-(std::sqrt(0.5)-std::sqrt(2.0)*pzomc)*
+                                         (std::sqrt(0.5)-std::sqrt(2.0)*pzomc));
+                  }
                 S = S + occupNb*rn[i];
 …
+    }
   G4double sinTheta = std::sqrt(1-cosTheta*cosTheta);
   G4double phi = twopi * G4UniformRand() ;
 …
+  // Kinematics of the scattered electron
+  // Kinematics of the scattered electron
   G4double diffEnergy = photonEnergy0*(1-epsilon);
   ionEnergy = (*(ionizationEnergy->find(Z)->second))[iosc];
-  //G4double eKineticEnergy = diffEnergy - ionEnergy;
   G4double Q2 = photonEnergy0*photonEnergy0+photonEnergy1*(photonEnergy1-2.0*photonEnergy0*cosTheta);
   G4double cosThetaE; //scattering angle for the electron
 …
+    }
   G4double sinThetaE = std::sqrt(1-cosThetaE*cosThetaE);
+  //initialize here, then check photons created by Atomic-Deexcitation, and the final state e-
+  G4int nbOfSecondaries = 0;
+  std::vector<G4DynamicParticle*>* photonVector=0;
   const G4AtomicTransitionManager* transitionManager = G4AtomicTransitionManager::Instance();
   const G4AtomicShell* shell = transitionManager->Shell(Z,iosc);
   G4double bindingEnergy = shell->BindingEnergy();
   G4int shellId = shell->ShellId();
+  //G4cout << bindingEnergy/keV << " " << ionEnergy/keV << " keV" << G4endl;
+  ionEnergy = std::max(bindingEnergy,ionEnergy); //protection against energy non-conservation
+  G4double eKineticEnergy = diffEnergy - ionEnergy;
+  size_t nTotPhotons=0;
+  G4int nPhotons=0;
+  const G4ProductionCutsTable* theCoupleTable=
+    G4ProductionCutsTable::GetProductionCutsTable();
+  size_t indx = couple->GetIndex();
+  G4double cutg = (*(theCoupleTable->GetEnergyCutsVector(0)))[indx];
+  cutg = std::min(cutForLowEnergySecondaryPhotons,cutg);
+  G4double cute = (*(theCoupleTable->GetEnergyCutsVector(1)))[indx];
+  cute = std::min(cutForLowEnergySecondaryPhotons,cute);
+  std::vector<G4DynamicParticle*>* photonVector=0;
+  G4DynamicParticle* aPhoton;
+  G4AtomicDeexcitation deexcitationManager;
+  if (Z>5 && (ionEnergy > cutg || ionEnergy > cute))
+    {
+      photonVector = deexcitationManager.GenerateParticles(Z,shellId);
+      nTotPhotons = photonVector->size();
+      for (size_t k=0;k<nTotPhotons;k++){
+        aPhoton = (*photonVector)[k];
+        if (aPhoton)
+          {
+            G4double itsCut = cutg;
+            if (aPhoton->GetDefinition() == G4Electron::Electron()) itsCut = cute;
+            G4double itsEnergy = aPhoton->GetKineticEnergy();
+            if (itsEnergy > itsCut && itsEnergy <= ionEnergy)
+  G4double ionEnergyInPenelopeDatabase = ionEnergy;
+  ionEnergy = std::max(bindingEnergy,ionEnergyInPenelopeDatabase); //protection against energy non-conservation
+  G4double eKineticEnergy = diffEnergy - ionEnergy; //subtract the excitation energy. If not emitted by fluorescence,
+  //the ionization energy is deposited as local energy deposition
+  G4double localEnergyDeposit = ionEnergy;
+  G4double energyInFluorescence = 0.; //testing purposes only
+  if (eKineticEnergy < 0)
+    {
+      //It means that there was some problem/mismatch between the two databases. Try to make it work
+      //In this case available Energy (diffEnergy) < ionEnergy
+      //Full residual energy is deposited locally
+      localEnergyDeposit = diffEnergy;
+      eKineticEnergy = 0.0;
+    }
+  //the local energy deposit is what remains: part of this may be spent for fluorescence.
+  if (fUseAtomicDeexcitation)
+    {
+      G4int nPhotons=0;
+      const G4ProductionCutsTable* theCoupleTable=
+        G4ProductionCutsTable::GetProductionCutsTable();
+      size_t indx = couple->GetIndex();
+      G4double cutg = (*(theCoupleTable->GetEnergyCutsVector(0)))[indx];
+      cutg = std::max(cutForLowEnergySecondaryPhotons,cutg);
+      G4double cute = (*(theCoupleTable->GetEnergyCutsVector(1)))[indx];
+      cute = std::max(cutForLowEnergySecondaryPhotons,cute);
+      G4DynamicParticle* aPhoton;
+      G4AtomicDeexcitation deexcitationManager;
+      if (Z>5 && (localEnergyDeposit > cutg || localEnergyDeposit > cute))
+        {
+          photonVector = deexcitationManager.GenerateParticles(Z,shellId);
+          for (size_t k=0;k<photonVector->size();k++){
+            aPhoton = (*photonVector)[k];
+            if (aPhoton)
+              {
+                nPhotons++;
+                ionEnergy -= itsEnergy;
+              }
+            else
+              {
+                delete aPhoton;
+                (*photonVector)[k]=0;
+                G4double itsCut = cutg;
+                if (aPhoton->GetDefinition() == G4Electron::Electron()) itsCut = cute;
+                G4double itsEnergy = aPhoton->GetKineticEnergy();
+                if (itsEnergy > itsCut && itsEnergy <= localEnergyDeposit)
+                  {
+                    nPhotons++;
+                    localEnergyDeposit -= itsEnergy;
+                    energyInFluorescence += itsEnergy;
+                  }
+                else
+                  {
+                    delete aPhoton;
+                    (*photonVector)[k]=0;
+                  }
+              }
+          }
+      }
+    }
   G4double energyDeposit =ionEnergy; //il deposito locale e' quello che rimane
+  G4int nbOfSecondaries=nPhotons;
+        }
+      nbOfSecondaries=nPhotons;
+    }
   // Generate the electron only if with large enough range w.r.t. cuts and safety
   G4double safety = aStep.GetPostStepPoint()->GetSafety();
   G4DynamicParticle* electron = 0;
+  if (rangeTest->Escape(G4Electron::Electron(),couple,eKineticEnergy,safety))
+  if (rangeTest->Escape(G4Electron::Electron(),couple,eKineticEnergy,safety) &&
+      eKineticEnergy>cutForLowEnergySecondaryPhotons)
+    {
       G4double xEl = sinThetaE * std::cos(phi+pi);
 …
   else
+    {
+      energyDeposit += eKineticEnergy;
+      localEnergyDeposit += eKineticEnergy;
+    }
   aParticleChange.SetNumberOfSecondaries(nbOfSecondaries);
   if (electron) aParticleChange.AddSecondary(electron);
+  for (size_t ll=0;ll<nTotPhotons;ll++)
+    {
+      aPhoton = (*photonVector)[ll];
+      if (aPhoton) aParticleChange.AddSecondary(aPhoton);
+  //This block below is executed only if there is at least one secondary photon produced by
+  //AtomicDeexcitation
+  if (photonVector)
+    {
+      for (size_t ll=0;ll<photonVector->size();ll++)
+        {
+          if ((*photonVector)[ll]) aParticleChange.AddSecondary((*photonVector)[ll]);
+        }
+    }
   delete photonVector;
   if (energyDeposit < 0)
+  if (localEnergyDeposit < 0)
+    {
       G4cout << "WARNING-"
              << "G4PenelopeCompton::PostStepDoIt - Negative energy deposit"
              << G4endl;
+      energyDeposit=0;
+    }
+  aParticleChange.ProposeLocalEnergyDeposit(energyDeposit);
+      localEnergyDeposit=0.;
+    }
+  aParticleChange.ProposeLocalEnergyDeposit(localEnergyDeposit);
+  if (verboseLevel > 1)
+    {
+      G4cout << "-----------------------------------------------------------" << G4endl;
+      G4cout << "Energy balance from G4PenelopeCompton" << G4endl;
+      G4cout << "Incoming photon energy: " << photonEnergy0/keV << " keV" << G4endl;
+      G4cout << "-----------------------------------------------------------" << G4endl;
+      G4cout << "Scattered photon: " << photonEnergy1/keV << " keV" << G4endl;
+      G4double electronEnergy = 0.;
+      if (electron)
+        electronEnergy = eKineticEnergy;
+      G4cout << "Scattered electron " << electronEnergy/keV << " keV" << G4endl;
+      G4cout << "Fluorescence: " << energyInFluorescence/keV << " keV" << G4endl;
+      G4cout << "Local energy deposit " << localEnergyDeposit/keV << " keV" << G4endl;
+      G4cout << "Total final state: " << (photonEnergy1+electronEnergy+energyInFluorescence+localEnergyDeposit)/keV <<
+        " keV" << G4endl;
+      G4cout << "-----------------------------------------------------------" << G4endl;
+    }
   return G4VDiscreteProcess::PostStepDoIt( aTrack, aStep);

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisation.cc

r819	r961
25	25	//
26	26	// $Id: G4PenelopeIonisation.cc,v 1.19 2006/06/29 19:40:49 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectric.cc

-              r819
+              r961
 //
 //
 // $Id: G4PenelopePhotoElectric.cc,v 1.12 2006/06/29 19:40:51 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PenelopePhotoElectric.cc,v 1.13 2009/01/08 09:42:54 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: L. Pandola
 …
 // 31 May 2005  L. Pandola  Added Sauter formula for the sampling of
 //                          the electron direction
+// 08 Jan 2009  L. Pandola  Check shell index to avoid mismatch between
+//                          the Penelope cross section database and the
+//                          G4AtomicTransitionManager database. It suppresses
+//                          a warning from G4AtomicTransitionManager only.
+//                          Results are unchanged.
 // --------------------------------------------------------------
 …
   // Retrieve the corresponding identifier and binding energy of the selected shell
   const G4AtomicTransitionManager* transitionManager = G4AtomicTransitionManager::Instance();
+  //The number of shell cross section possibly reported in the Penelope database
+  //might be different from the number of shells in the G4AtomicTransitionManager
+  //(namely, Penelope may contain more shell, especially for very light elements).
+  //In order to avoid a warning message from the G4AtomicTransitionManager, I
+  //add this protection. Results are anyway changed, because when G4AtomicTransitionManager
+  //has a shellID>maxID, it sets the shellID to the last valid shell.
+  size_t numberOfShells = (size_t) transitionManager->NumberOfShells(Z);
+  if (shellIndex >= numberOfShells)
+    shellIndex = numberOfShells-1;
   const G4AtomicShell* shell = transitionManager->Shell(Z,shellIndex);
   G4double bindingEnergy = shell->BindingEnergy();

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleigh.cc

r819	r961
27	27	//
28	28	// $Id: G4PenelopeRayleigh.cc,v 1.15 2007/09/03 09:43:14 pandola Exp $
29		// GEANT4 tag $Name: $
	29	// GEANT4 tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// Author: L. Pandola (luciano.pandola@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4RangeTest.cc

r819	r961
26	26	//
27	27	// $Id: G4RangeTest.cc,v 1.8 2006/06/29 19:41:03 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4SemiLogInterpolation.cc

r819	r961
26	26	//
27	27	// $Id: G4SemiLogInterpolation.cc,v 1.6 2006/06/29 19:41:18 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4ShellData.cc

-              r819
+              r961
 //
 //
 // $Id: G4ShellData.cc,v 1.8 2006/06/29 19:41:21 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ShellData.cc,v 1.10 2008/03/17 13:40:53 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 #include "G4ShellData.hh"
 #include "G4DataVector.hh"
+#include "G4SystemOfUnits.hh"
 #include <fstream>
 #include <sstream>
+#include <numeric>
+#include <algorithm>
+#include <valarray>
+#include <functional>
+#include "Randomize.hh"
+// The following deprecated header is included because <functional> seems not to be found on MGP's laptop
+//#include "function.h"
 // Constructor
 G4ShellData::G4ShellData(G4int minZ, G4int maxZ)
   : zMin(minZ), zMax(maxZ)
 { }
+G4ShellData::G4ShellData(G4int minZ, G4int maxZ, G4bool isOccupancy)
+  : zMin(minZ), zMax(maxZ), occupancyData(isOccupancy)
+{  }
 // Destructor
 G4ShellData::~G4ShellData()
+{
+  std::map<G4int,G4DataVector*,std::less<G4int> >::iterator pos;
+  std::map<G4int,std::vector<G4double>*,std::less<G4int> >::iterator pos;
   for (pos = idMap.begin(); pos != idMap.end(); ++pos)
+    {
       G4DataVector* dataSet = (*pos).second;
+      std::vector<G4double>* dataSet = (*pos).second;
       delete dataSet;
+    }
+  for (pos = bindingMap.begin(); pos != bindingMap.end(); ++pos)
+    {
+      G4DataVector* dataSet = (*pos).second;
+  std::map<G4int,G4DataVector*,std::less<G4int> >::iterator pos2;
+  for (pos2 = bindingMap.begin(); pos2 != bindingMap.end(); ++pos2)
+    {
+      G4DataVector* dataSet = (*pos2).second;
       delete dataSet;
+    }
+  if (occupancyData)
+    {
+      std::map<G4int,std::vector<G4double>*,std::less<G4int> >::iterator pos3;
+      for (pos3 = occupancyPdfMap.begin(); pos3 != occupancyPdfMap.end(); ++pos3)
+        {
+          std::vector<G4double>* dataSet = (*pos3).second;
+          delete dataSet;
+        }
+    }
+}
 …
+const G4DataVector& G4ShellData::ShellIdVector(G4int Z) const
+{
+  std::map<G4int,G4DataVector*,std::less<G4int> >::const_iterator pos;
+  if (Z < zMin || Z > zMax)
+    G4Exception("G4ShellData::ShellIdVector - Z outside boundaries");
+const std::vector<G4double>& G4ShellData::ShellIdVector(G4int Z) const
+{
+  std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator pos;
+  if (Z < zMin || Z > zMax) G4Exception("G4ShellData::ShellIdVector - Z outside boundaries");
   pos = idMap.find(Z);
   G4DataVector* dataSet = (*pos).second;
+  std::vector<G4double>* dataSet = (*pos).second;
   return *dataSet;
+}
+const std::vector<G4double>& G4ShellData::ShellVector(G4int Z) const
+{
+  std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator pos;
+  if (Z < zMin || Z > zMax) G4Exception("G4ShellData::ShellVector - Z outside boundaries");
+  pos = occupancyPdfMap.find(Z);
+  std::vector<G4double>* dataSet = (*pos).second;
+  return *dataSet;
+}
 G4int G4ShellData::ShellId(G4int Z, G4int shellIndex) const
+{
 …
   if (Z >= zMin && Z <= zMax)
+    {
       std::map<G4int,G4DataVector*,std::less<G4int> >::const_iterator pos;
+      std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator pos;
       pos = idMap.find(Z);
       if (pos!= idMap.end())
+        {
           G4DataVector dataSet = *((*pos).second);
+          std::vector<G4double> dataSet = *((*pos).second);
           G4int nData = dataSet.size();
           if (shellIndex >= 0 && shellIndex < nData)
 …
   return n;
+}
+G4double G4ShellData::ShellOccupancyProbability(G4int Z, G4int shellIndex) const
+{
+  G4double prob = -1.;
+  if (Z >= zMin && Z <= zMax)
+    {
+      std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator pos;
+      pos = idMap.find(Z);
+      if (pos!= idMap.end())
+        {
+          std::vector<G4double> dataSet = *((*pos).second);
+          G4int nData = dataSet.size();
+          if (shellIndex >= 0 && shellIndex < nData)
+            {
+              prob = dataSet[shellIndex];
+            }
+        }
+    }
+  return prob;
+}
 …
              << G4endl;
       G4int nSh = nShells[Z-1];
       std::map<G4int,G4DataVector*,std::less<G4int> >::const_iterator posId;
+      std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator posId;
       posId = idMap.find(Z);
       G4DataVector* ids = (*posId).second;
+      std::vector<G4double>* ids = (*posId).second;
       std::map<G4int,G4DataVector*,std::less<G4int> >::const_iterator posE;
       posE = bindingMap.find(Z);
 …
+        {
           G4int id = (G4int) (*ids)[i];
+          G4double e = (*energies)[i] / MeV;
+          G4cout << i <<") Shell id: " << id
+                 << " - Binding energy = "
+                 << e << " MeV " << G4endl;
+          G4double e = (*energies)[i] / keV;
+          G4cout << i << ") ";
+          if (occupancyData)
+            {
+              G4cout << " Occupancy: ";
+            }
+          else
+            {
+              G4cout << " Shell id: ";
+            }
+          G4cout << id << " - Binding energy = "
+                 << e << " keV ";
+            if (occupancyData)
+              {
+                std::map<G4int,std::vector<G4double>*,std::less<G4int> >::const_iterator posOcc;
+                posOcc = occupancyPdfMap.find(Z);
+                std::vector<G4double> probs = *((*posOcc).second);
+                G4double prob = probs[i];
+                G4cout << "- Probability = " << prob;
+              }
+            G4cout << G4endl;
+        }
       G4cout << "-------------------------------------------------"
 …
   G4int Z = 1;
   G4DataVector* energies = new G4DataVector;
   G4DataVector* ids = new G4DataVector;
+  std::vector<G4double>* ids = new std::vector<G4double>;
   do {
 …
             nShells.push_back(n);
             // Start of new shell data set
             ids = new G4DataVector;
+            ids = new std::vector<G4double>;
             energies = new G4DataVector;
             Z++;
 …
   } while (a != -2); // end of file
   file.close();
+}
+  // For Doppler broadening: the data set contains shell occupancy and binding energy for each shell
+  // Build additional map with probability for each shell based on its occupancy
+  if (occupancyData)
+    {
+      // Build cumulative from raw shell occupancy
+      for (G4int Z=zMin; Z <= zMax; Z++)
+        {
+          std::vector<G4double> occupancy = ShellIdVector(Z);
+          std::vector<G4double>* prob = new std::vector<G4double>;
+          G4double scale = 1. / G4double(Z);
+          prob->push_back(occupancy[0] * scale);
+          for (size_t i=1; i<occupancy.size(); i++)
+            {
+              prob->push_back(occupancy[i]*scale + (*prob)[i-1]);
+            }
+          occupancyPdfMap[Z] = prob;
+          /*
+            G4double scale = 1. / G4double(Z);
+            //      transform((*prob).begin(),(*prob).end(),(*prob).begin(),bind2nd(multiplies<G4double>(),scale));
+            for (size_t i=0; i<occupancy.size(); i++)
+            {
+            (*prob)[i] *= scale;
+            }
+          */
+        }
+    }
+}
+G4int G4ShellData::SelectRandomShell(G4int Z) const
+{
+  if (Z < zMin || Z > zMax) G4Exception("G4ShellData::RandomSelect - Z outside boundaries");
+  G4int shellIndex = 0;
+  std::vector<G4double> prob = ShellVector(Z);
+  G4double random = G4UniformRand();
+  // std::vector<G4double>::const_iterator pos;
+  // pos = lower_bound(prob.begin(),prob.end(),random);
+  // Binary search the shell with probability less or equal random
+  G4int nShells = NumberOfShells(Z);
+  G4int upperBound = nShells;
+  while (shellIndex <= upperBound)
+    {
+      G4int midShell = (shellIndex + upperBound) / 2;
+      if ( random < prob[midShell] )
+        upperBound = midShell - 1;
+      else
+        shellIndex = midShell + 1;
+    }
+  if (shellIndex >= nShells) shellIndex = nShells - 1;
+  return shellIndex;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc

-              r819
+              r961
 //
 //
 // $Id: G4ShellEMDataSet.cc,v 1.15 2007/10/15 08:36:35 pia Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ShellEMDataSet.cc,v 1.16 2008/03/10 15:07:41 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 …
 // History:
 // -----------
 // 1 Aug 2001   MGP        Created
+//  1 Aug 2001   MGP        Created
 // 09.10.01   V.Ivanchenko Add case z=0
+//  9 Mar 2008   MGP        Cleaned up unreadable code modified by former developer
+//                          (Further clean-up needed)
 //
 // -------------------------------------------------------------------
 …
 G4ShellEMDataSet::G4ShellEMDataSet(G4int argZ, G4VDataSetAlgorithm* argAlgorithm,
                                    G4double argUnitEnergies,
                                    G4double argUnitData)
+G4ShellEMDataSet::G4ShellEMDataSet(G4int zeta, G4VDataSetAlgorithm* algo,
+                                   G4double eUnit,
+                                   G4double dataUnit)
+  :
+  z(argZ),
+  algorithm(argAlgorithm),
+  unitEnergies(argUnitEnergies),
+  unitData(argUnitData)
+{
+  if (algorithm == 0)
+    G4Exception("G4ShellEMDataSet::G4ShellEMDataSet - interpolation == 0");
+  z(zeta),
+  algorithm(algo),
+  unitEnergies(eUnit),
+  unitData(dataUnit)
+{
+  if (algorithm == 0) G4Exception("G4ShellEMDataSet::G4ShellEMDataSet - interpolation == 0");
+}
 …
+{
   CleanUpComponents();
+  if (algorithm)
+    delete algorithm;
+}
+G4double G4ShellEMDataSet::FindValue(G4double argEnergy, G4int /* argComponentId */) const
+  if (algorithm) delete algorithm;
+}
+G4double G4ShellEMDataSet::FindValue(G4double energy, G4int /* componentId */) const
+{
   // Returns the sum over the shells corresponding to e
 …
   std::vector<G4VEMDataSet *>::const_iterator end(components.end());
   while (i!=end)
+    {
       value+=(*i)->FindValue(argEnergy);
+  while (i != end)
+    {
+      value += (*i)->FindValue(energy);
       i++;
+    }
 …
 void G4ShellEMDataSet::PrintData(void) const
+{
   const size_t n(NumberOfComponents());
+  const size_t n = NumberOfComponents();
   G4cout << "The data set has " << n << " components" << G4endl;
   G4cout << G4endl;
   size_t i(0);
   while (i<n)
+  size_t i = 0;
+  while (i < n)
+    {
       G4cout << "--- Component " << i << " ---" << G4endl;
 …
 void G4ShellEMDataSet :: SetEnergiesData(G4DataVector* argEnergies,
                                          G4DataVector* argData,
                                          G4int argComponentId)
+{
   G4VEMDataSet * component(components[argComponentId]);
+void G4ShellEMDataSet::SetEnergiesData(G4DataVector* energies,
+                                       G4DataVector* data,
+                                       G4int componentId)
+{
+  G4VEMDataSet* component = components[componentId];
   if (component)
+    {
       component->SetEnergiesData(argEnergies, argData, 0);
+      component->SetEnergiesData(energies, data, 0);
       return;
+    }
   std::ostringstream message;
   message << "G4ShellEMDataSet::SetEnergiesData - component " << argComponentId << " not found";
+  message << "G4ShellEMDataSet::SetEnergiesData - component " << componentId << " not found";
   G4Exception(message.str().c_str());
 …
 G4bool G4ShellEMDataSet::LoadData(const G4String& argFileName)
+G4bool G4ShellEMDataSet::LoadData(const G4String& file)
+{
   CleanUpComponents();
   G4String fullFileName(FullFileName(argFileName));
+  G4String fullFileName = FullFileName(file);
   std::ifstream in(fullFileName);
 …
+    {
       G4String message("G4ShellEMDataSet::LoadData - data file \"");
       message+=fullFileName;
       message+="\" not found";
+      message += fullFileName;
+      message += "\" not found";
       G4Exception(message);
+    }
   G4DataVector* argEnergies(0);
   G4DataVector* argData(0);
   G4double a;
   G4int shellIndex(0);
   bool energyColumn(true);
+  G4DataVector* energies = 0;
+  G4DataVector* data = 0;
+  G4double a = 0.;
+  G4int shellIndex = 0;
+  bool energyColumn = true;
   do
 …
       if (a == -1)
+        {
           if (energyColumn && argEnergies!=0)
+          if (energyColumn && energies!=0)
+            {
               AddComponent(new G4EMDataSet(shellIndex, argEnergies, argData, algorithm->Clone(), unitEnergies, unitData));
               argEnergies=0;
               argData=0;
+              AddComponent(new G4EMDataSet(shellIndex, energies, data, algorithm->Clone(), unitEnergies, unitData));
+              energies = 0;
+              data = 0;
+            }
           energyColumn=(!energyColumn);
+          energyColumn = (!energyColumn);
+        }
       else if (a!=-2)
+      else if (a != -2)
+        {
           if (argEnergies==0)
+          if (energies == 0)
+            {
               argEnergies=new G4DataVector;
               argData=new G4DataVector;
+              energies = new G4DataVector;
+              data = new G4DataVector;
+            }
           if (energyColumn)
             argEnergies->push_back(a*unitEnergies);
+            energies->push_back(a * unitEnergies);
           else
             argData->push_back(a*unitData);
           energyColumn=(!energyColumn);
+            data->push_back(a * unitData);
+          energyColumn = (!energyColumn);
+        }
+    }
 …
 G4bool G4ShellEMDataSet::SaveData(const G4String& argFileName) const
+{
   G4String fullFileName(FullFileName(argFileName));
+G4bool G4ShellEMDataSet::SaveData(const G4String& file) const
+{
+  G4String fullFileName = FullFileName(file);
   std::ofstream out(fullFileName);
 …
+    {
       G4String message("G4EMDataSet::SaveData - cannot open \"");
       message+=fullFileName;
       message+="\"";
+      message += fullFileName;
+      message += "\"";
       G4Exception(message);
+    }
   const size_t n(NumberOfComponents());
   size_t k(0);
   while (k<n)
+    {
       const G4VEMDataSet * component=GetComponent(k);
+  const size_t n = NumberOfComponents();
+  size_t k = 0;
+  while (k < n)
+    {
+      const G4VEMDataSet* component = GetComponent(k);
       if (component)
+        {
           const G4DataVector & energies(component->GetEnergies(0));
           const G4DataVector & data(component->GetData(0));
           G4DataVector::const_iterator i(energies.begin());
           G4DataVector::const_iterator endI(energies.end());
           G4DataVector::const_iterator j(data.begin());
           while (i!=endI)
+          const G4DataVector& energies = component->GetEnergies(0);
+          const G4DataVector& data = component->GetData(0);
+          G4DataVector::const_iterator i = energies.begin();
+          G4DataVector::const_iterator endI = energies.end();
+          G4DataVector::const_iterator j = data.begin();
+          while (i != endI)
+            {
               out.precision(10);
 …
 void G4ShellEMDataSet::CleanUpComponents(void)
+{
   while (!components.empty())
+    {
+      if (components.back())
+        delete components.back();
+      if (components.back()) delete components.back();
       components.pop_back();
+    }
 …
+G4String G4ShellEMDataSet::FullFileName(const G4String & argFileName) const
+G4String G4ShellEMDataSet::FullFileName(const G4String& fileName) const
+{
   char* path = getenv("G4LEDATA");
 …
   std::ostringstream fullFileName;
   fullFileName << path << '/' << argFileName << z << ".dat";
+  fullFileName << path << '/' << fileName << z << ".dat";
   return G4String(fullFileName.str().c_str());

trunk/source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc

r819	r961
26	26	//
27	27	// $Id: G4VCrossSectionHandler.cc,v 1.17 2006/06/29 19:41:42 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyDiscretePhotonProcess.cc

r819	r961
25	25	//
26	26	// $Id: G4VLowEnergyDiscretePhotonProcess.cc,v 1.5 2006/06/29 19:41:44 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc

r819	r961
26	26	//
27	27	// $Id: G4VeLowEnergyLoss.cc,v 1.25 2006/06/29 19:41:50 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/lowenergy/src/G4WaterExcitationStructure.cc

r819	r961
26	26	//
27	27	// $Id: G4WaterExcitationStructure.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4WaterIonisationStructure.cc

r819	r961
26	26	//
27	27	// $Id: G4WaterIonisationStructure.cc,v 1.1 2007/11/08 20:39:35 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4eBremsstrahlungSpectrum.cc

r819	r961
25	25	//
26	26	// $Id: G4eBremsstrahlungSpectrum.cc,v 1.15 2006/06/29 19:41:58 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionExcitationEmfietzoglou.cc

-              r819
+              r961
 //
 // $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
 // GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
 // GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionScreenedRutherford.cc

r819	r961
26	26	//
27	27	// $Id: G4eCrossSectionScreenedRutherford.cc,v 1.3 2007/10/12 12:27:19 pia Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationCrossSectionHandler.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eIonisationCrossSectionHandler.cc,v 1.11 2006/06/29 19:42:00 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eIonisationCrossSectionHandler.cc,v 1.12 2009/01/29 08:13:34 pandola Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 19 Jul 2002   VI          Create composite data set for material
 // 21 Jan 2003  V.Ivanchenko Cut per region
+// 28 Jan 2009  L.Pandola    Added public method to make a easier migration of
+//                           G4LowEnergyIonisation to G4LivermoreIonisationModel
 //
 // -------------------------------------------------------------------
 …
     G4int nElements = material->GetNumberOfElements();
+    if(verbose > 0) {
+      G4cout << "eIonisation CS for " << m << "th material "
+             << material->GetName()
+             << "  eEl= " << nElements << G4endl;
+    }
+    if(verbose > 0)
+      {
+        G4cout << "eIonisation CS for " << m << "th material "
+               << material->GetName()
+               << "  eEl= " << nElements << G4endl;
+      }
     G4double tcut  = (*energyCuts)[m];
 …
             value += cross * p * density;
+            if(verbose>0 && m == 0 && e>=1. && e<=0.) {
+            if(verbose>0 && m == 0 && e>=1. && e<=0.)
+            {
               G4cout << "G4eIonCrossSH: e(MeV)= " << e/MeV
                      << " n= " << n
 …
                      << " Z= " << Z
                      << G4endl;
+            }
+              }
+          }
 …
+}
+G4double G4eIonisationCrossSectionHandler::GetCrossSectionAboveThresholdForElement(G4double energy,
+                                                                                   G4double cutEnergy,
+                                                                                   G4int Z)
+{
+  G4int nShells = NumberOfComponents(Z);
+  G4double value = 0.;
+  if(energy > cutEnergy)
+    {
+      for (G4int n=0; n<nShells; n++) {
+        G4double cross = FindValue(Z, energy, n);
+        G4double p = theParam->Probability(Z, cutEnergy, energy, energy, n);
+        value += cross * p;
+      }
+    }
+  return value;
+}

trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc

r819	r961
26	26	//
27	27	// $Id: G4eIonisationParameters.cc,v 1.23 2006/06/29 19:42:02 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc

r819	r961
25	25	//
26	26	// $Id: G4eIonisationSpectrum.cc,v 1.25 2006/06/29 19:42:04 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc

r819	r961
26	26	//
27	27	// $Id: G4eLowEnergyLoss.cc,v 1.35 2006/06/29 19:42:06 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// -----------------------------------------------------------

trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc

-              r819
+              r961
               type = aSecondary->GetDefinition();
               if ( etot + e <= eLoss &&
                    (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
                    (type == G4Electron::Electron() && e > minElectronEnergy)) {
+                   ( (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
+                   (type == G4Electron::Electron() && e > minElectronEnergy) ) ) {
                      etot += e;

trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc

-              r819
+              r961
 //
 //
 // $Id: G4hLowEnergyLoss.cc,v 1.23 2006/06/29 19:42:23 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hLowEnergyLoss.cc,v 1.28 2009/02/20 10:49:54 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------
 …
 G4double G4hLowEnergyLoss::HighestKineticEnergy= 100.*GeV;
 G4int    G4hLowEnergyLoss::TotBin = 360;
+G4double G4hLowEnergyLoss::RTable,G4hLowEnergyLoss::LOGRTable;
+G4double G4hLowEnergyLoss::RTable =1.1;
+G4double G4hLowEnergyLoss::LOGRTable = 1.1;
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     theRangeTable = theRangepbarTable ;
+  }
   G4double R2 = RTable*RTable ;
   G4double R1 = RTable+1.;
 …
       else
+      {
+        Tim = Ti/RTable ;
+        // ---- MGP ---- Modified to avoid a floating point exception
+        // The correction is just a temporary patch, the whole class should be redesigned
+        // Original: Tim = Ti/RTable  results in 0./0.
+        if (RTable != 0.)
+          {
+            Tim = Ti/RTable ;
+          }
+        else
+          {
+            Tim = 0.;
+          }
         Rim = rangeVector->GetValue(Tim,isOut);
+      }
 …
         Rip = rangeVector->GetValue(Tip,isOut);
+      }
       Value = (w1*Rip + w2*Ri + w3*Rim)/(Ti*Ti) ;
+      if (Ti!=0) Value = (w1*Rip + w2*Ri + w3*Rim)/(Ti*Ti); else Value=0;
       aVector->PutValue(i,Value);
 …
       else
+      {
         Tim = Ti/RTable ;
+        if (RTable!=0) Tim = Ti/RTable ; else Tim =0;
         Rim = rangeVector->GetValue(Tim,isOut);
+      }
 …
         Rip = rangeVector->GetValue(Tip,isOut);
+      }
       Value = (w1*Rip + w2*Ri + w3*Rim)/Ti;
+      if (Ti!=0) Value = (w1*Rip + w2*Ri + w3*Rim)/Ti; else Value=0;
       aVector->PutValue(i,Value);
 …
       else
+      {
         Tim = Ti/RTable ;
+        if (RTable!=0) Tim = Ti/RTable ; else Tim=0;
         Rim = rangeVector->GetValue(Tim,isOut);
+      }
 …
+{
   G4double LowEdgeRange,A,B,C,discr,KineticEnergy ;
+  G4double Tbin = LowestKineticEnergy/RTable ;
+  G4double Tbin = 0;
+  if (RTable !=0.) Tbin = LowestKineticEnergy/RTable ;
   G4double rangebin = 0.0 ;
   G4int binnumber = -1 ;

trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExp.cc

-              r819
+              r961
 // Empiric Model for shell cross sections in proton ionisation
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionDoubleExp.cc,v 1.8 2006/06/29 19:42:35 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4hShellCrossSectionDoubleExp.cc,v 1.9 2008/06/26 18:19:10 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "globals.hh"
 …
   std::vector<G4double> kProbability;//(0);
+  kProbability.push_back(GetCrossSectionDoubleExp(Z,incidentEnergy)/atomTotalCrossSection);
+  // ---- MGP ---- Next line corrected to kProbability[0] instead of [1], which is not initialized!
+  kProbability.push_back(1 - kProbability[0]);
+  if (atomTotalCrossSection!=0.) // SI - 26 june 2008
+  {
+    kProbability.push_back(GetCrossSectionDoubleExp(Z,incidentEnergy)/atomTotalCrossSection);
+    // ---- MGP ---- Next line corrected to kProbability[0] instead of [1], which is not initialized!
+    kProbability.push_back(1 - kProbability[0]);
+  }
   return kProbability;

trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc

r819	r961
34	34	// -------------------------------------------------------------------
35	35	// $Id: G4hShellCrossSectionDoubleExpData.cc,v 1.4 2006/06/29 19:42:38 gunter Exp $
36		// GEANT4 tag $Name: $
	36	// GEANT4 tag $Name: geant4-09-02-ref-02 $
37	37
38	38	#include "G4hShellCrossSectionDoubleExpData.hh"

trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc

-              r819
+              r961
 // Empiric Model for shell cross sections in proton ionisation
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionExp.cc,v 1.5 2006/06/29 19:42:40 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4hShellCrossSectionExp.cc,v 1.6 2008/05/02 19:23:38 pia Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #include "globals.hh"
 …
       crossSectionsInBarn = a*(std::pow(b,(1./incidentEnergyInMeV)))*(std::pow(incidentEnergyInMeV,c));
+    }
   else if(Z<66 && Z>=26 || Z==17)
+  else if((Z<66 && Z>=26) || Z==17)
+    {
       crossSectionsInBarn = std::exp(a+(b/incidentEnergyInMeV)+(c*std::log(incidentEnergyInMeV)));

trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc

r819	r961
34	34	// -------------------------------------------------------------------
35	35	// $Id: G4hShellCrossSectionExpData.cc,v 1.3 2006/06/29 19:42:42 gunter Exp $
36		// GEANT4 tag $Name: $
	36	// GEANT4 tag $Name: geant4-09-02-ref-02 $
37	37
38	38	#include "G4hShellCrossSectionExpData.hh"

trunk/source/processes/electromagnetic/muons/History

-              r819
+              r961
 $Id: History,v 1.106 2007/11/12 10:34:23 vnivanch Exp $
+$Id: History,v 1.126 2009/02/26 11:04:20 vnivanch Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+February 09: V.Ivant (emmuons-V09-02-01)
+G4MuIonisation - fixed initialisation alowing to configure external model
+                 of fluctuations
+February 09: V.Ivant (emmuons-V09-02-00)
+- Cleanup: improved comments, move virtual methods from .hh to .cc
+November 08: V.Ivant (emmuons-V09-01-15)
+G4EnergyLossForExtrapolator - added method TrueStepLength; fixed initialisation
+                              before a step
+October 08: V.Ivant (emmuons-V09-01-14)
+G4EnergyLossForExtrapolator - make method ComputeTrueStep public and cleanup
+October 08: V.Ivant (emmuons-V09-01-13)
+G4MuMscModel - remove obsolete
+G4EnergyLossForExtrapolator - added spline option
+G4MuIonisation, G4MuBremsstrahlung, G4MuPairProduction,
+G4MuMultipleScattering - change SubType and improved cout
+August 08: V.Ivant (emmuons-V09-01-12)
+G4MuMscModel - added protection for ions
+July 08: V.Ivant (emmuons-V09-01-11)
+G4MuMscModel - do not define min and max energy in constructor but use Set
+               methods
+G4MuMultipleScattering - added cout of model names
+April 08:  V.Ivanchenko (emmuons-V09-01-10)
+G4MuBremsstrahlungModel, G4MuPairProductionModel - use CrossSectionPerVolume
+                    from the base class, do not use A in CrossSEctionPerAtom
+G4MuMscModel - do not use A in SetupTarget
+April 08:  V.Ivanchenko (emmuons-V09-01-09)
+G4MuMultipleScattering - use G4WentzelVIModel model
+                         build table for particles with mass < GeV
+April 08:  V.Ivanchenko (emmuons-V09-01-08)
+- G4MuBremsstrahlungModel - instead of static const use members of a class,
+                            this allows to reuse the model for different
+                            particle type
+March 08:  V.Ivanchenko (emmuons-V09-01-07)
+- G4MuPairProductionModel - fixed nan value at initialisation
+  of the sampling table
+March 08:  V.Ivanchenko (emmuons-V09-01-06)
+- G4MuMscModel - fixed outstanding bug in sampling of scattering
+March 08:  V.Ivanchenko (emmuons-V09-01-05)
+- G4MuMscModel - added shift along particle direction for displacement
+- G4MuBetheBlochModel - update computation of correction
+March 08:  V.Ivanchenko (emmuons-V09-01-04)
+- G4MuMscModel - fixed sampling
+March 08:  V.Ivanchenko (emmuons-V09-01-03)
+- G4MuMscModel - use G4VMscModel interface
+March 08:  V.Ivanchenko (emmuons-V09-01-02)
+- G4MuBremsstrahlungModel - remove ignoreCut flag, remove obsolete methods
+                            and members, set some members protected to
+                            be used by G4hBremsstrahlungModel
+- G4MuPairProductionModel - remove ignoreCut flag,  set some members protected
+                            to be used by G4hBremsstrahlungModel
+- SubType for all processes is initialized
+February 08:  V.Ivanchenko (emmuons-V09-01-01)
+G4MuMscModel - added sampling of tail distribution
+January 08:  V.Ivanchenko (emmuons-V09-01-00)
+G4MuMscModel - added computation of the second moment of the distribution;
+               fixed sampling
+G4MuMultipleScattering - modified default RangeFactor
 November 07:  V.Ivanchenko (emmuons-V09-00-04)

trunk/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EnergyLossForExtrapolator.hh,v 1.9 2007/07/28 13:44:25 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EnergyLossForExtrapolator.hh,v 1.12 2008/11/13 14:14:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------------------
 …
   G4double EnergyBeforeStep(G4double kinEnergy, G4double step,
+                            const G4Material*, const G4ParticleDefinition*);
+                            const G4Material*, const G4ParticleDefinition*);
+  G4double TrueStepLength(G4double kinEnergy, G4double step,
+                          const G4Material*, const G4ParticleDefinition* part);
   inline G4double EnergyAfterStep(G4double kinEnergy, G4double step,
                            const G4Material*, const G4String& particleName);
+                                  const G4Material*, const G4String& particleName);
   inline G4double EnergyBeforeStep(G4double kinEnergy, G4double step,
                             const G4Material*, const G4String& particleName);
+                                   const G4Material*, const G4String& particleName);
   inline G4double AverageScatteringAngle(G4double kinEnergy, G4double step,
+                                  const G4Material*, const G4ParticleDefinition* part);
+                                         const G4Material*,
+                                         const G4ParticleDefinition* part);
   inline G4double AverageScatteringAngle(G4double kinEnergy, G4double step,
+                                         const G4Material*, const G4String& particleName);
+                                         const G4Material*,
+                                         const G4String& particleName);
+  inline G4double ComputeTrueStep(const G4Material*, const G4ParticleDefinition* part,
+                                  G4double kinEnergy, G4double stepLength);
   inline G4double EnergyDispersion(G4double kinEnergy, G4double step,
                             const G4Material*, const G4ParticleDefinition*);
+                                   const G4Material*, const G4ParticleDefinition*);
   inline G4double EnergyDispersion(G4double kinEnergy, G4double step,
 …
   void Initialisation();
+  G4bool SetupKinematics(const G4ParticleDefinition*, const G4Material*,
+                         G4double kinEnergy);
   G4PhysicsTable* PrepareTable();
 …
   void ComputeProtonDEDX(const G4ParticleDefinition* part, G4PhysicsTable* table);
+  G4double ComputeTrueStep(const G4Material*, const G4ParticleDefinition* part,
+                           G4double kinEnergy, G4double stepLength);
+  void ComputeTrasportXS(const G4ParticleDefinition* part, G4PhysicsTable* table);
   inline G4double ComputeValue(G4double x, const G4PhysicsTable* table);
-  inline G4double ComputeScatteringAngle(G4double x);
   // hide assignment operator
 …
   G4PhysicsTable*          invRangeMuon;
   G4PhysicsTable*          invRangeProton;
+  G4PhysicsTable*          mscElectron;
   const G4Material* currentMaterial;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4EnergyLossForExtrapolator::EnergyDispersion(G4double kinEnergy,
+                                                              G4double step,
+                                                              const G4Material* mat,
+                                                              const G4String& name)
+inline G4double
+G4EnergyLossForExtrapolator::EnergyDispersion(G4double kinEnergy,
+                                              G4double step,
+                                              const G4Material* mat,
+                                              const G4String& name)
+{
   return EnergyDispersion(kinEnergy,step,mat,FindParticle(name));
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline G4double G4EnergyLossForExtrapolator::AverageScatteringAngle(G4double kinEnergy,
                                                              G4double stepLength,
                                                              const G4Material* mat,
                                                              const G4ParticleDefinition* part)
+{
+  if(!isInitialised) Initialisation();
+inline G4double
+G4EnergyLossForExtrapolator::AverageScatteringAngle(G4double kinEnergy,
+                                                    G4double stepLength,
+                                                    const G4Material* mat,
+                                                    const G4ParticleDefinition* part)
+{
   G4double theta = 0.0;
+  if(mat && part && kinEnergy > 0.0) {
+    G4double step = ComputeTrueStep(mat,part,kinEnergy,stepLength);
+    if(step > 0.001*radLength) theta = ComputeScatteringAngle(stepLength);
+  if(SetupKinematics(part, mat, kinEnergy)) {
+    G4double t = stepLength/radLength;
+    G4double y = std::max(0.001, t);
+    theta = 19.23*MeV*std::sqrt(charge2*t)*(1.0 + 0.038*std::log(y))/(beta2*gam*mass);
+  }
   return theta;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4EnergyLossForExtrapolator::ComputeScatteringAngle(G4double x)
+{
+  G4double t = x/radLength;
+  return 19.23*MeV*std::sqrt(charge2*t)*(1.0 + 0.038*std::log(t))/(beta2*gam*mass);
+}
+inline G4double
+G4EnergyLossForExtrapolator::ComputeTrueStep(const G4Material* mat,
+                                             const G4ParticleDefinition* part,
+                                             G4double kinEnergy,
+                                             G4double stepLength)
+{
+  G4double theta = AverageScatteringAngle(kinEnergy,stepLength,mat,part);
+  return stepLength*std::sqrt(1.0 + 0.625*theta*theta);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline G4double G4EnergyLossForExtrapolator::EnergyDispersion(
                                                        G4double kinEnergy,
+inline
+G4double G4EnergyLossForExtrapolator::EnergyDispersion(G4double kinEnergy,
                                                        G4double stepLength,
                                                        const G4Material* mat,
                                                        const G4ParticleDefinition* part)
+{
-  if(!isInitialised) Initialisation();
   G4double sig2 = 0.0;
   if(mat && part ) {
+  if(SetupKinematics(part, mat, kinEnergy)) {
     G4double step = ComputeTrueStep(mat,part,kinEnergy,stepLength);
     sig2 = (1.0/beta2 - 0.5)* twopi_mc2_rcl2 * tmax*step * electronDensity * charge2;
+    sig2 = (1.0/beta2 - 0.5)*twopi_mc2_rcl2*tmax*step*electronDensity*charge2;
+  }
   return sig2;
 …
+{
   G4double res = 0.0;
   bool b;
   res = ((*table)[index])->GetValue(x, b);
+  G4bool b;
+  if(table) res = ((*table)[index])->GetValue(x, b);
   return res;
+}

trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBetheBlochModel.hh,v 1.17 2007/05/22 17:35:58 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MuBetheBlochModel.hh,v 1.18 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4MuBetheBlochModel();
   void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerElectron(
 …
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                                     G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 private:
   void SetParticle(const G4ParticleDefinition* p);
+  inline void SetParticle(const G4ParticleDefinition* p);
   // hide assignment operator
 …
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4MuBetheBlochModel::MaxSecondaryEnergy(
+          const G4ParticleDefinition*,
+                G4double kinEnergy)
+inline void G4MuBetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+{
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return tmax;
+  if(!particle) {
+    particle = p;
+    mass = particle->GetPDGMass();
+    massSquare = mass*mass;
+    ratio = electron_mass_c2/mass;
+  }
+}

trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBremsstrahlung.hh,v 1.29 2007/05/23 08:49:32 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuBremsstrahlung.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4MuBremsstrahlung();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                             const G4Material*,
                             G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                    const G4Material*,
+                                    G4double cut);
   // Print out of the class parameters
   void PrintInfo();
+  virtual void PrintInfo();
 protected:
   void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
                                    const G4ParticleDefinition*);
+  virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
+                                           const G4ParticleDefinition*);
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4MuBremsstrahlung::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4MuBremsstrahlung::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                     const G4Material*,
-                                                           G4double)
+{
-  return lowestKinEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #endif

trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBremsstrahlungModel.hh,v 1.17 2007/10/11 09:25:31 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuBremsstrahlungModel.hh,v 1.22 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 10-02-04 Add lowestKinEnergy (V.Ivanchenko)
 // 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
 // 13-02-06 add ComputeCrossSectionPerAtom (mma)
+// 13-02-06 Add ComputeCrossSectionPerAtom (mma)
 // 11-10-07 Add ignoreCut flag (V.Ivanchenko)
+// 28-02-08 Reorganized protected methods and members (V.Ivanchenko)
+// 06-03-08 Remove obsolete methods and members (V.Ivanchenko)
 //
 …
 // Class Description:
 //
 // Implementation of energy loss for gamma emission by muons
+// Implementation of bremssrahlung by muons
 // -------------------------------------------------------------------
 …
 #include "G4VEmModel.hh"
+#include "G4NistManager.hh"
 class G4Element;
 …
   virtual ~G4MuBremsstrahlungModel();
   void SetParticle(const G4ParticleDefinition*);
+  virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void SetLowestKineticEnergy(G4double e) {lowestKinEnergy = e;};
+  G4double MinEnergyCut(const G4ParticleDefinition*,
+                        const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerAtom(
 …
                                  G4double cutEnergy,
                                  G4double maxEnergy);
+  virtual G4double CrossSectionPerVolume(const G4Material*,
+                         const G4ParticleDefinition*,
+                               G4double kineticEnergy,
+                               G4double cutEnergy,
+                               G4double maxEnergy);
   virtual G4double ComputeDEDXPerVolume(const G4Material*,
                                 const G4ParticleDefinition*,
 …
                                 G4double cutEnergy);
+  void SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                         const G4MaterialCutsCouple*,
+                         const G4DynamicParticle*,
+                         G4double tmin,
+                         G4double maxEnergy);
+  virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                                 const G4MaterialCutsCouple*,
+                                 const G4DynamicParticle*,
+                                 G4double tmin,
+                                 G4double maxEnergy);
+  inline void SetLowestKineticEnergy(G4double e);
 protected:
+  G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                              G4double kineticEnergy);
+  G4double ComputMuBremLoss(G4double Z, G4double tkin, G4double cut);
+  G4double ComputeMicroscopicCrossSection(G4double tkin,
+                                          G4double Z,
+                                          G4double cut);
+public:
+  virtual G4double ComputeDMicroscopicCrossSection(G4double tkin,
+                                                   G4double Z,
+                                                   G4double gammaEnergy);
+ G4double ComputMuBremLoss(G4double Z, G4double A, G4double tkin, G4double cut);
+ G4double ComputeMicroscopicCrossSection(G4double tkin,
+                                           G4double Z,
+                                           G4double A,
+                                           G4double cut);
+ G4double ComputeDMicroscopicCrossSection(G4double tkin,
+                                          G4double Z,
+                                          G4double A,
+                                          G4double gammaEnergy);
+  inline void SetIgnoreCutFlag(G4bool);
+  inline G4bool IgnoreCutFlag() const;
+  inline void SetParticle(const G4ParticleDefinition*);
 private:
  G4DataVector* ComputePartialSumSigma(const G4Material* material,
                                       G4double tkin, G4double cut);
+  G4DataVector* ComputePartialSumSigma(const G4Material* material,
+                                       G4double tkin, G4double cut);
+ const G4Element* SelectRandomAtom(const G4MaterialCutsCouple* couple) const;
+ void MakeSamplingTables();
+  const G4Element* SelectRandomAtom(const G4MaterialCutsCouple* couple) const;
   // hide assignment operator
 …
   G4MuBremsstrahlungModel(const  G4MuBremsstrahlungModel&);
+protected:
+  const G4ParticleDefinition* particle;
+  G4NistManager* nist;
+  G4double mass;
+  G4double rmass;
+  G4double cc;
+  G4double coeff;
+  G4double sqrte;
+  G4double bh;
+  G4double bh1;
+  G4double btf;
+  G4double btf1;
+private:
   G4ParticleDefinition*       theGamma;
-  const G4ParticleDefinition* particle;
   G4ParticleChangeForLoss*    fParticleChange;
 …
   G4double lowestKinEnergy;
   G4double minThreshold;
-  G4double mass;
-  // tables for sampling
-  G4int nzdat,ntdat,NBIN;
-  static G4double zdat[5],adat[5],tdat[8];
-  G4double ya[1001], proba[5][8][1001];
-  G4double cutFixed;
-  G4bool  ignoreCut;
   std::vector<G4DataVector*> partialSumSigma;
-  G4bool  samplingTablesAreFilled;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4MuBremsstrahlungModel::MaxSecondaryEnergy(
+                                 const G4ParticleDefinition*,
+                                 G4double kineticEnergy)
+inline void G4MuBremsstrahlungModel::SetLowestKineticEnergy(G4double e)
+{
   return kineticEnergy;
+  lowestKinEnergy = e;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4MuBremsstrahlungModel::SetIgnoreCutFlag(G4bool val)
+inline
+void G4MuBremsstrahlungModel::SetParticle(const G4ParticleDefinition* p)
+{
+  ignoreCut = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4bool G4MuBremsstrahlungModel::IgnoreCutFlag() const
+{
+  return ignoreCut;
+  if(!particle) {
+    particle = p;
+    mass = particle->GetPDGMass();
+    rmass=mass/electron_mass_c2 ;
+    cc=classic_electr_radius/rmass ;
+    coeff= 16.*fine_structure_const*cc*cc/3. ;
+  }
+}

trunk/source/processes/electromagnetic/muons/include/G4MuIonisation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuIonisation.hh,v 1.30 2007/05/23 08:49:32 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MuIonisation.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4MuIonisation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                             const G4Material*, G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                    const G4Material*, G4double cut);
   // Print out of the class parameters
   void PrintInfo();
+  virtual void PrintInfo();
 protected:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4MuIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4MuIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                 const G4Material*,
-                                                 G4double cut)
+{
-  G4double x = 0.5*cut/electron_mass_c2;
-  G4double g = x*ratio + std::sqrt((1. + x)*(1. + x*ratio*ratio));
-  return mass*(g - 1.0);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/muons/include/G4MuMultipleScattering.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuMultipleScattering.hh,v 1.1 2007/10/26 09:52:37 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuMultipleScattering.hh,v 1.2 2008/04/13 17:19:13 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 class G4MuMscModel;
+class G4VMscModel;
 class G4MuMultipleScattering : public G4VMultipleScattering
 …
 private:        // data members
   G4MuMscModel* mscModel;
+  G4VMscModel* mscModel;
   G4double thetaLimit;

trunk/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuPairProduction.hh,v 1.29 2007/05/23 08:49:32 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuPairProduction.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4MuPairProduction();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                             const G4Material*, G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                    const G4Material*, G4double cut);
   // Print out of the class parameters
   void PrintInfo();
+  virtual void PrintInfo();
 protected:
   void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
                                    const G4ParticleDefinition*);
+  virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
+                                           const G4ParticleDefinition*);
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4MuPairProduction::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4MuPairProduction::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                     const G4Material*,
-                                                           G4double)
+{
-  return lowestKinEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #endif

trunk/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuPairProductionModel.hh,v 1.24 2007/10/11 13:52:03 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuPairProductionModel.hh,v 1.28 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 12-05-06 Add parameter to SelectRandomAtom (A.Bogdanov)
 // 11-10-07 Add ignoreCut flag (V.Ivanchenko)
+// 28-02-08 Reorganized protected methods and members (V.Ivanchenko)
 //
 …
 #include "G4VEmModel.hh"
+#include "G4NistManager.hh"
 #include <vector>
 …
 class G4MuPairProductionModel : public G4VEmModel
+{
 public:
 …
   virtual ~G4MuPairProductionModel();
+  void SetParticle(const G4ParticleDefinition*);
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void SetLowestKineticEnergy(G4double e) {lowestKinEnergy = e;};
+  G4double MinEnergyCut(const G4ParticleDefinition*,
+                        const G4MaterialCutsCouple*);
+  virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   virtual G4double ComputeCrossSectionPerAtom(
 …
                                  G4double maxEnergy);
-  virtual G4double CrossSectionPerVolume(const G4Material*,
-                         const G4ParticleDefinition*,
-                               G4double kineticEnergy,
-                               G4double cutEnergy,
-                               G4double maxEnergy);
   virtual G4double ComputeDEDXPerVolume(const G4Material*,
                                 const G4ParticleDefinition*,
 …
                                 G4double cutEnergy);
+  void SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                         const G4MaterialCutsCouple*,
+                         const G4DynamicParticle*,
+                         G4double tmin,
+                         G4double maxEnergy);
+  virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
+                                 const G4MaterialCutsCouple*,
+                                 const G4DynamicParticle*,
+                                 G4double tmin,
+                                 G4double maxEnergy);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                               const G4MaterialCutsCouple*);
+  inline void SetLowestKineticEnergy(G4double e);
+  inline void SetParticle(const G4ParticleDefinition*);
 protected:
-  inline G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                     G4double kineticEnergy);
-public:
   G4double ComputMuPairLoss(G4double Z, G4double tkin, G4double cut,
 …
                                           G4double cut);
+  G4double ComputeDMicroscopicCrossSection(G4double tkin,
+                                           G4double Z,
+                                           G4double pairEnergy);
+  inline void SetIgnoreCutFlag(G4bool);
+  inline G4bool IgnoreCutFlag() const;
+  virtual G4double ComputeDMicroscopicCrossSection(G4double tkin,
+                                                   G4double Z,
+                                                   G4double pairEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kineticEnergy);
+  inline void SetCurrentElement(G4double Z);
 private:
 …
   void MakeSamplingTables();
-  void SetCurrentElement(G4double Z);
   inline G4double InterpolatedIntegralCrossSection(
                      G4double dt, G4double dz, G4int iz,
 …
   G4MuPairProductionModel(const  G4MuPairProductionModel&);
+  G4ParticleDefinition*       theElectron;
+  G4ParticleDefinition*       thePositron;
+  G4ParticleChangeForLoss*    fParticleChange;
+  G4ParticleChangeForGamma*   gParticleChange;
+  G4double minPairEnergy;
+  G4double lowestKinEnergy;
+protected:
+  const G4ParticleDefinition* particle;
+  G4NistManager*              nist;
   G4double factorForCross;
 …
   G4double lnZ;
+  const G4ParticleDefinition* particle;
+  static G4double xgi[8],wgi[8];
+private:
+  G4ParticleDefinition*       theElectron;
+  G4ParticleDefinition*       thePositron;
+  G4ParticleChangeForLoss*    fParticleChange;
+  G4double minPairEnergy;
+  G4double lowestKinEnergy;
   // tables for sampling
 …
   G4int nbiny;
   size_t nmaxElements;
   static G4double zdat[5],adat[5],tdat[8],xgi[8],wgi[8];
+  static G4double zdat[5],adat[5],tdat[8];
   G4double ya[1001],proba[5][8][1001];
 …
   G4double dy;
-  G4bool  ignoreCut;
   G4bool  samplingTablesAreFilled;
   std::vector<G4double>   partialSum;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4MuPairProductionModel::MaxSecondaryEnergy(
+                                 const G4ParticleDefinition*,
+                                       G4double kineticEnergy)
+{
+  G4double maxPairEnergy = kineticEnergy + particleMass*(1.0 - 0.75*sqrte*z13);
+  return maxPairEnergy;
+inline void G4MuPairProductionModel::SetLowestKineticEnergy(G4double e)
+{
+  lowestKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline
+void G4MuPairProductionModel::SetParticle(const G4ParticleDefinition* p)
+{
+  if(!particle) {
+    particle = p;
+    particleMass = particle->GetPDGMass();
+  }
+}
 …
   if(Z != currentZ) {
     currentZ = Z;
+    z13 = std::pow(Z,0.333333333);
+    G4int iz = G4int(Z);
+    z13 = nist->GetZ13(iz);
     z23 = z13*z13;
     lnZ = std::log(Z);
+    lnZ = nist->GetLOGZ(iz);
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4MuPairProductionModel::SetIgnoreCutFlag(G4bool val)
+{
-  ignoreCut = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4bool G4MuPairProductionModel::IgnoreCutFlag() const
+{
-  return ignoreCut;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #endif

trunk/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EnergyLossForExtrapolator.cc,v 1.13 2007/07/28 13:44:25 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EnergyLossForExtrapolator.cc,v 1.18 2008/11/13 14:14:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4MuBremsstrahlungModel.hh"
 #include "G4ProductionCuts.hh"
+#include "G4LossTableManager.hh"
+#include "G4WentzelVIModel.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   delete invRangePositron;
   delete invRangeProton;
+  delete mscElectron;
   delete cuts;
+}
 …
   if(!isInitialised) Initialisation();
   G4double kinEnergyFinal = kinEnergy;
   if(mat && part) {
     G4double step = ComputeTrueStep(mat,part,kinEnergy,stepLength);
+  if(SetupKinematics(part, mat, kinEnergy)) {
+    G4double step = TrueStepLength(kinEnergy,stepLength,mat,part);
     G4double r  = ComputeRange(kinEnergy,part);
     if(r <= step) {
 …
   G4double kinEnergyFinal = kinEnergy;
   if(mat && part) {
     G4double step = ComputeTrueStep(mat,part,kinEnergy,stepLength);
+  if(SetupKinematics(part, mat, kinEnergy)) {
+    G4double step = TrueStepLength(kinEnergy,stepLength,mat,part);
     G4double r  = ComputeRange(kinEnergy,part);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EnergyLossForExtrapolator::ComputeTrueStep(const G4Material* mat,
+                                                      const G4ParticleDefinition* part,
+                                                      G4double kinEnergy, G4double stepLength)
+{
+G4double G4EnergyLossForExtrapolator::TrueStepLength(G4double kinEnergy,
+                                                     G4double stepLength,
+                                                     const G4Material* mat,
+                                                     const G4ParticleDefinition* part)
+{
+  G4double res = stepLength;
+  if(!isInitialised) Initialisation();
+  if(SetupKinematics(part, mat, kinEnergy)) {
+    if(part == electron || part == positron) {
+      G4double x = stepLength*ComputeValue(kinEnergy, mscElectron);
+      if(x < 0.2) res *= (1.0 + 0.5*x + x*x/3.0);
+      else if(x < 0.9999) res = -std::log(1.0 - x)*stepLength/x;
+      else res = ComputeRange(kinEnergy,part);
+    } else {
+      res = ComputeTrueStep(mat,part,kinEnergy,stepLength);
+    }
+  }
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4EnergyLossForExtrapolator::SetupKinematics(const G4ParticleDefinition* part,
+                                                    const G4Material* mat,
+                                                    G4double kinEnergy)
+{
+  if(!part || !mat || kinEnergy < keV) return false;
   if(!isInitialised) Initialisation();
   G4bool flag = false;
 …
     if(tmax > maxEnergyTransfer) tmax = maxEnergyTransfer;
+  }
+  G4double theta = ComputeScatteringAngle(stepLength);
+  return stepLength*std::sqrt(1.0 + 0.625*theta*theta);
+  return true;
+}
 …
   invRangeMuon     = PrepareTable();
   invRangeProton   = PrepareTable();
+  mscElectron      = PrepareTable();
   G4LossTableBuilder builder;
 …
   builder.BuildInverseRangeTable(rangeProton, invRangeProton);
+  ComputeTrasportXS(electron, mscElectron);
+}
 …
     G4PhysicsVector* v = new G4PhysicsLogVector(emin, emax, nbins);
+    v->SetSpline(G4LossTableManager::Instance()->SplineFlag());
     table->push_back(v);
+  }
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EnergyLossForExtrapolator::ComputeTrasportXS(const G4ParticleDefinition* part,
+                                                    G4PhysicsTable* table)
+{
+  G4DataVector v;
+  G4WentzelVIModel* msc = new G4WentzelVIModel();
+  msc->SetPolarAngleLimit(CLHEP::pi);
+  msc->Initialise(part, v);
+  mass    = part->GetPDGMass();
+  charge2 = 1.0;
+  currentParticle = part;
+  const G4MaterialTable* mtable = G4Material::GetMaterialTable();
+  if(0<verbose) {
+    G4cout << "G4EnergyLossForExtrapolator::ComputeProtonDEDX for " << part->GetParticleName()
+           << G4endl;
+  }
+  for(G4int i=0; i<nmat; i++) {
+    const G4Material* mat = (*mtable)[i];
+    if(1<verbose)
+      G4cout << "i= " << i << "  mat= " << mat->GetName() << G4endl;
+    G4PhysicsVector* aVector = (*table)[i];
+    for(G4int j=0; j<nbins; j++) {
+       G4double e = aVector->GetLowEdgeEnergy(j);
+       G4double xs = msc->CrossSectionPerVolume(mat,part,e);
+       aVector->PutValue(j,xs);
+       if(1<verbose) {
+         G4cout << "j= " << j << "  e(MeV)= " << e/MeV
+                << " xs(1/mm)= " << xs*mm << G4endl;
+       }
+    }
+  }
+  delete msc;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBetheBlochModel.cc,v 1.23 2007/05/22 17:35:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuBetheBlochModel.cc,v 1.25 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   theElectron = G4Electron::Electron();
   corr = G4LossTableManager::Instance()->EmCorrections();
+  fParticleChange = 0;
   if(p) SetParticle(p);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void G4MuBetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+{
-  if(!particle) {
-    particle = p;
-    mass = particle->GetPDGMass();
-    massSquare = mass*mass;
-    ratio = electron_mass_c2/mass;
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4MuBetheBlochModel::MinEnergyCut(const G4ParticleDefinition*,
                                            const G4MaterialCutsCouple* couple)
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4double G4MuBetheBlochModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                                 G4double kinEnergy)
+{
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return tmax;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   if(p) SetParticle(p);
+  if(pParticleChange)
+    fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
+                                                             (pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForLoss();
+  if(!fParticleChange) {
+    if(pParticleChange) {
+      fParticleChange =
+        reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+    } else {
+      fParticleChange = new G4ParticleChangeForLoss();
+    }
+  }
+}
 …
   //High order corrections
   dedx += corr->HighOrderCorrections(p,material,kineticEnergy);
+  dedx += corr->HighOrderCorrections(p,material,kineticEnergy,cutEnergy);
   return dedx;

trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBremsstrahlung.cc,v 1.38 2007/05/22 17:35:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuBremsstrahlung.cc,v 1.42 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
     lowestKinEnergy(1.*GeV),
     isInitialised(false)
+{}
+{
+  SetProcessSubType(fBremsstrahlung);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4MuBremsstrahlung::InitialiseEnergyLossProcess(const G4ParticleDefinition* part,
+                                                     const G4ParticleDefinition*)
+G4bool G4MuBremsstrahlung::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4MuBremsstrahlung::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                              const G4Material*,
+                                              G4double)
+{
+  return lowestKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4MuBremsstrahlung::InitialiseEnergyLossProcess(
+                                 const G4ParticleDefinition* part,
+                                 const G4ParticleDefinition*)
+{
   if(!isInitialised) {
 …
     em->SetLowestKineticEnergy(lowestKinEnergy);
     G4VEmFluctuationModel* fm = new G4UniversalFluctuation();
     em->SetLowEnergyLimit(0.1*keV);
     em->SetHighEnergyLimit(100.0*TeV);
+    G4VEmFluctuationModel* fm = 0;
+    em->SetLowEnergyLimit(MinKinEnergy());
+    em->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(1, em, fm);
+  }
 …
 void G4MuBremsstrahlung::PrintInfo()
+{
+  G4cout << "      Parametrised model "
+         << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuBremsstrahlungModel.cc,v 1.24 2007/11/08 11:48:28 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuBremsstrahlungModel.cc,v 1.33 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 13-02-03 Add name (V.Ivanchenko)
 // 10-02-04 Add lowestKinEnergy (V.Ivanchenko)
 // 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
 // 03-08-05 Angular correlations according to PRM (V.Ivantchenko)
+// 08-04-05 Major optimisation of internal interfaces (V.Ivanchenko)
+// 03-08-05 Angular correlations according to PRM (V.Ivanchenko)
 // 13-02-06 add ComputeCrossSectionPerAtom (mma)
 // 21-03-06 Fix problem of initialisation in case when cuts are not defined (VI)
 // 07-11-07 Improve sampling of final state (A.Bogdanov)
+// 28-02-08 Use precomputed Z^1/3 and Log(A) (V.Ivanchenko)
 //
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-// static members
-//
-G4double G4MuBremsstrahlungModel::zdat[]={1., 4., 13., 29., 92.};
-G4double G4MuBremsstrahlungModel::adat[]={1.01, 9.01, 26.98, 63.55, 238.03};
-G4double G4MuBremsstrahlungModel::tdat[]={1.e3, 1.e4, 1.e5, 1.e6, 1.e7, 1.e8,
-.e9, 1.e10};
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   : G4VEmModel(nam),
     particle(0),
+    sqrte(sqrt(exp(1.))),
+    bh(202.4),
+    bh1(446.),
+    btf(183.),
+    btf1(1429.),
+    fParticleChange(0),
     lowestKinEnergy(1.0*GeV),
+    minThreshold(1.0*keV),
+    nzdat(5),
+    ntdat(8),
+    NBIN(1000),
+    cutFixed(0.98*keV),
+    ignoreCut(false),
+    samplingTablesAreFilled(false)
+    minThreshold(1.0*keV)
+{
   theGamma = G4Gamma::Gamma();
+  nist = G4NistManager::Instance();
   if(p) SetParticle(p);
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void G4MuBremsstrahlungModel::SetParticle(const G4ParticleDefinition* p)
+{
-  if(!particle) {
-    particle = p;
-    mass = particle->GetPDGMass();
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4MuBremsstrahlungModel::Initialise(const G4ParticleDefinition* p,
                                          const G4DataVector& cuts)
 …
   highKinEnergy = HighEnergyLimit();
+  // partial cross section is computed for fixed energy
   G4double fixedEnergy = 0.5*highKinEnergy;
 …
   if(theCoupleTable) {
     G4int numOfCouples = theCoupleTable->GetTableSize();
+    // clear old data
     G4int nn = partialSumSigma.size();
     G4int nc = cuts.size();
     if(nn > 0) {
       for (G4int ii=0; ii<nn; ii++){
         G4DataVector* a=partialSumSigma[ii];
+        G4DataVector* a = partialSumSigma[ii];
         if ( a )  delete a;
+      }
       partialSumSigma.clear();
+    }
+    // fill new data
     if (numOfCouples>0) {
       for (G4int i=0; i<numOfCouples; i++) {
         G4double cute = DBL_MAX;
+        // protection for usage with extrapolator
         if(i < nc) cute = cuts[i];
+        if(cute < cutFixed || ignoreCut) cute = cutFixed;
         const G4MaterialCutsCouple* couple =
           theCoupleTable->GetMaterialCutsCouple(i);
 …
+    }
+  }
+  if(!samplingTablesAreFilled) MakeSamplingTables();
+  if(pParticleChange)
+    fParticleChange =
+      reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForLoss();
+  // define pointer to G4ParticleChange
+  if(!fParticleChange) {
+    if(pParticleChange)
+      fParticleChange =
+        reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+    else
+      fParticleChange = new G4ParticleChangeForLoss();
+  }
+}
 …
+{
   G4double dedx = 0.0;
   if (kineticEnergy <= lowestKinEnergy || ignoreCut) return dedx;
+  if (kineticEnergy <= lowestKinEnergy) return dedx;
   G4double tmax = kineticEnergy;
   G4double cut  = min(cutEnergy,tmax);
   if(cut < cutFixed) cut = cutFixed;
+  G4double cut  = std::min(cutEnergy,tmax);
+  if(cut < minThreshold) cut = minThreshold;
   const G4ElementVector* theElementVector = material->GetElementVector();
   const G4double* theAtomicNumDensityVector =
                                           material->GetAtomicNumDensityVector();
+    material->GetAtomicNumDensityVector();
   //  loop for elements in the material
   for (size_t i=0; i<material->GetNumberOfElements(); i++) {
+    G4double Z = (*theElementVector)[i]->GetZ();
+    G4double A = (*theElementVector)[i]->GetA()/(g/mole) ;
+    G4double loss = ComputMuBremLoss(Z, A, kineticEnergy, cut);
+    G4double loss =
+      ComputMuBremLoss((*theElementVector)[i]->GetZ(), kineticEnergy, cut);
     dedx += loss*theAtomicNumDensityVector[i];
+  }
+  //  G4cout << "BR e= " << kineticEnergy << "  dedx= " << dedx << G4endl;
   if(dedx < 0.) dedx = 0.;
   return dedx;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4double G4MuBremsstrahlungModel::ComputMuBremLoss(G4double Z, G4double A,
+G4double G4MuBremsstrahlungModel::ComputMuBremLoss(G4double Z,
                                                    G4double tkin, G4double cut)
+{
 …
+    {
       G4double ep = (aa + xgi[i]*hhh)*totalEnergy;
       loss += ep*wgi[i]*ComputeDMicroscopicCrossSection(tkin, Z, A, ep);
+      loss += ep*wgi[i]*ComputeDMicroscopicCrossSection(tkin, Z, ep);
+    }
     aa += hhh;
 …
                                            G4double tkin,
                                            G4double Z,
-                                           G4double A,
                                            G4double cut)
+{
 …
   G4double bbb = log(vmax);
   G4int    kkk = (G4int)((bbb-aaa)/ak1)+k2 ;
   G4double hhh = (bbb-aaa)/float(kkk);
+  G4double hhh = (bbb-aaa)/G4double(kkk);
   G4double aa = aaa;
 …
+    {
       G4double ep = exp(aa + xgi[i]*hhh)*totalEnergy;
       cross += ep*wgi[i]*ComputeDMicroscopicCrossSection(tkin, Z, A, ep);
+      cross += ep*wgi[i]*ComputeDMicroscopicCrossSection(tkin, Z, ep);
+    }
     aa += hhh;
 …
   cross *=hhh;
+  //G4cout << "BR e= " << tkin<< "  cross= " << cross/barn << G4endl;
   return cross;
 …
                                            G4double tkin,
                                            G4double Z,
-                                           G4double A,
                                            G4double gammaEnergy)
 //  differential cross section
+{
-  static const G4double sqrte=sqrt(exp(1.)) ;
-  static const G4double bh=202.4,bh1=446.,btf=183.,btf1=1429. ;
-  static const G4double rmass=mass/electron_mass_c2 ;
-  static const G4double cc=classic_electr_radius/rmass ;
-  static const G4double coeff= 16.*fine_structure_const*cc*cc/3. ;
   G4double dxsection = 0.;
 …
   G4double rab0=delta*sqrte ;
+  G4double z13 = exp(-log(Z)/3.) ;
+  G4double dn  = 1.54*exp(0.27*log(A)) ;
+  G4int iz = G4int(Z);
+  if(iz < 1) iz = 1;
+  G4double z13 = 1.0/nist->GetZ13(iz);
+  G4double dn  = 1.54*nist->GetA27(iz);
   G4double b,b1,dnstar ;
   if(Z<1.5)
+  if(1 == iz)
+  {
     b=bh;
     b1=bh1;
     dnstar=dn ;
+    b  = bh;
+    b1 = bh1;
+    dnstar = dn;
+  }
   else
+  {
     b=btf;
     b1=btf1;
     dnstar = exp((1.-1./Z)*log(dn)) ;
+    b  = btf;
+    b1 = btf1;
+    dnstar = dn/std::pow(dn, 1./Z);
+  }
 …
                                            const G4ParticleDefinition*,
                                                  G4double kineticEnergy,
                                                  G4double Z, G4double A,
+                                                 G4double Z, G4double,
                                                  G4double cutEnergy,
+                                                 G4double)
+{
+  G4double cut  = min(cutEnergy, kineticEnergy);
+  if(cut < cutFixed || ignoreCut) cut = cutFixed;
+  G4double cross =
+    ComputeMicroscopicCrossSection (kineticEnergy, Z, A/(g/mole), cut);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4MuBremsstrahlungModel::CrossSectionPerVolume(
+                                               const G4Material* material,
+                                               const G4ParticleDefinition*,
+                                                     G4double kineticEnergy,
+                                                     G4double cutEnergy,
+                                                     G4double maxEnergy)
+                                                 G4double maxEnergy)
+{
   G4double cross = 0.0;
+  if (cutEnergy >= maxEnergy || kineticEnergy <= lowestKinEnergy) return cross;
+  G4double tmax = min(maxEnergy, kineticEnergy);
+  G4double cut  = min(cutEnergy, tmax);
+  if(cut < cutFixed || ignoreCut) cut = cutFixed;
+  const G4ElementVector* theElementVector = material->GetElementVector();
+  const G4double* theAtomNumDensityVector =
+                                          material->GetAtomicNumDensityVector();
+  for (size_t i=0; i<material->GetNumberOfElements(); i++) {
+    G4double Z = (*theElementVector)[i]->GetZ();
+    G4double A = (*theElementVector)[i]->GetA()/(g/mole);
+    G4double cr = ComputeMicroscopicCrossSection(kineticEnergy, Z, A, cut);
+    if(tmax < kineticEnergy) {
+      cr -= ComputeMicroscopicCrossSection(kineticEnergy, Z, A, tmax);
+    }
+    cross += theAtomNumDensityVector[i] * cr;
+  }
+  if (kineticEnergy <= lowestKinEnergy) return cross;
+  G4double tmax = std::min(maxEnergy, kineticEnergy);
+  G4double cut  = std::min(cutEnergy, kineticEnergy);
+  if(cut < minThreshold) cut = minThreshold;
+  if (cut >= tmax) return cross;
+  cross = ComputeMicroscopicCrossSection (kineticEnergy, Z, cut);
+  if(tmax < kineticEnergy) {
+    cross -= ComputeMicroscopicCrossSection(kineticEnergy, Z, tmax);
+  }
   return cross;
+}
 …
 G4DataVector* G4MuBremsstrahlungModel::ComputePartialSumSigma(
                                        const G4Material* material,
+                                             G4double kineticEnergy,
+                                             G4double cut)
+// Build the table of cross section per element. The table is built for MATERIAL
+// This table is used by DoIt to select randomly an element in the material.
+                                       G4double kineticEnergy,
+                                       G4double cut)
+// Build the table of cross section per element.
+// The table is built for material
+// This table is used to select randomly an element in the material.
+{
   G4int nElements = material->GetNumberOfElements();
   const G4ElementVector* theElementVector = material->GetElementVector();
   const G4double* theAtomNumDensityVector =
                                           material->GetAtomicNumDensityVector();
+    material->GetAtomicNumDensityVector();
   G4DataVector* dv = new G4DataVector();
 …
   for (G4int i=0; i<nElements; i++ ) {
-    G4double Z = (*theElementVector)[i]->GetZ();
-    G4double A = (*theElementVector)[i]->GetA()/(g/mole) ;
     cross += theAtomNumDensityVector[i]
+             * ComputeMicroscopicCrossSection(kineticEnergy, Z, A, cut);
+      * ComputeMicroscopicCrossSection(kineticEnergy,
+                                       (*theElementVector)[i]->GetZ(), cut);
     dv->push_back(cross);
+  }
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4MuBremsstrahlungModel::MakeSamplingTables()
+{
+  G4double AtomicNumber,AtomicWeight,KineticEnergy,
+           TotalEnergy,Maxep;
+  for (G4int iz=0; iz<nzdat; iz++)
+   {
+     AtomicNumber = zdat[iz];
+     AtomicWeight = adat[iz]*g/mole ;
+     for (G4int it=0; it<ntdat; it++)
+     {
+       KineticEnergy = tdat[it];
+       TotalEnergy = KineticEnergy + mass;
+       Maxep = KineticEnergy ;
+       G4double CrossSection = 0.0 ;
+       // calculate the differential cross section
+       // numerical integration in
+       //  log ...............
+       G4double c = log(Maxep/cutFixed) ;
+       G4double ymin = -5. ;
+       G4double ymax = 0. ;
+       G4double dy = (ymax-ymin)/NBIN ;
+       G4double y = ymin - 0.5*dy ;
+       G4double yy = ymin - dy ;
+       G4double x = exp(y);
+       G4double fac = exp(dy);
+       G4double dx = exp(yy)*(fac - 1.0);
+       for (G4int i=0 ; i<NBIN; i++)
+       {
+         y += dy ;
+         x *= fac;
+         dx*= fac;
+         G4double ep = cutFixed*exp(c*x) ;
+         CrossSection += ep*dx*ComputeDMicroscopicCrossSection(
+                                                 KineticEnergy,AtomicNumber,
+                                                 AtomicWeight,ep) ;
+         ya[i]=y ;
+         proba[iz][it][i] = CrossSection ;
+       }
+       proba[iz][it][NBIN] = CrossSection ;
+       ya[NBIN] = 0. ;   //   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       if(CrossSection > 0.)
+       {
+         for(G4int ib=0; ib<=NBIN; ib++)
+         {
+           proba[iz][it][ib] /= CrossSection ;
+         }
+       }
+     }
+   }
+  samplingTablesAreFilled = true;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4MuBremsstrahlungModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp,
+                                                const G4MaterialCutsCouple* couple,
+                                                const G4DynamicParticle* dp,
+                                                G4double minEnergy,
+                                                G4double maxEnergy)
+void G4MuBremsstrahlungModel::SampleSecondaries(
+                              std::vector<G4DynamicParticle*>* vdp,
+                              const G4MaterialCutsCouple* couple,
+                              const G4DynamicParticle* dp,
+                              G4double minEnergy,
+                              G4double maxEnergy)
+{
   G4double kineticEnergy = dp->GetKineticEnergy();
   // check against insufficient energy
   G4double tmax = min(kineticEnergy, maxEnergy);
   G4double tmin = min(kineticEnergy, minEnergy);
   if(tmin < cutFixed || ignoreCut) tmin = cutFixed;
+  G4double tmax = std::min(kineticEnergy, maxEnergy);
+  G4double tmin = std::min(kineticEnergy, minEnergy);
+  if(tmin < minThreshold) tmin = minThreshold;
   if(tmin >= tmax) return;
-  // ===== the begining of a new code  ======
   // ===== sampling of energy transfer ======
 …
   // select randomly one element constituing the material
   const G4Element* anElement = SelectRandomAtom(couple);
+  G4double Z = anElement->GetZ();
   G4double totalEnergy   = kineticEnergy + mass;
   G4double totalMomentum = sqrt(kineticEnergy*(kineticEnergy + 2.0*mass));
+  G4double AtomicNumber = anElement->GetZ();
+  G4double AtomicWeight = anElement->GetA()/(g/mole);
+  G4double func1 = tmin*ComputeDMicroscopicCrossSection(
+                                    kineticEnergy,AtomicNumber,
+                                    AtomicWeight,tmin);
+  G4double func1 = tmin*
+    ComputeDMicroscopicCrossSection(kineticEnergy,Z,tmin);
   G4double lnepksi, epksi;
   G4double func2;
-  G4double ksi2;
   do {
     lnepksi = log(tmin) + G4UniformRand()*log(kineticEnergy/tmin);
     epksi   = exp(lnepksi);
+    func2   = epksi*ComputeDMicroscopicCrossSection(
+                                kineticEnergy,AtomicNumber,
+                                AtomicWeight,epksi);
+    ksi2 = G4UniformRand();
+  } while(func2/func1 < ksi2);
+  // ===== the end of a new code =====
+  // create G4DynamicParticle object for the Gamma
+    func2   = epksi*ComputeDMicroscopicCrossSection(kineticEnergy,Z,epksi);
+  } while(func2 < func1*G4UniformRand());
   G4double gEnergy = epksi;
+  // sample angle
+  // ===== sample angle =====
   G4double gam  = totalEnergy/mass;
   G4double rmax = gam*min(1.0, totalEnergy/gEnergy - 1.0);
   rmax *= rmax;
   G4double x = G4UniformRand()*rmax/(1.0 + rmax);
+  G4double rmax = gam*std::min(1.0, totalEnergy/gEnergy - 1.0);
+  G4double rmax2= rmax*rmax;
+  G4double x = G4UniformRand()*rmax2/(1.0 + rmax2);
   G4double theta = sqrt(x/(1.0 - x))/gam;
 …
   // save secondary
+  G4DynamicParticle* aGamma = new G4DynamicParticle(theGamma,gDirection,gEnergy);
+  G4DynamicParticle* aGamma =
+    new G4DynamicParticle(theGamma,gDirection,gEnergy);
   vdp->push_back(aGamma);
+}

trunk/source/processes/electromagnetic/muons/src/G4MuIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuIonisation.cc,v 1.54 2007/05/22 17:35:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuIonisation.cc,v 1.59 2009/02/26 11:04:20 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4MuBetheBlochModel.hh"
 #include "G4UniversalFluctuation.hh"
+#include "G4IonFluctuations.hh"
 #include "G4BohrFluctuations.hh"
 #include "G4UnitsTable.hh"
 …
     isInitialised(false)
+{
+  SetStepFunction(0.2, 1*mm);
+  SetIntegral(true);
+  SetVerboseLevel(1);
+  //  SetStepFunction(0.2, 1*mm);
+  //SetIntegral(true);
+  //SetVerboseLevel(1);
+  SetProcessSubType(fIonisation);
+}
 …
 G4MuIonisation::~G4MuIonisation()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4MuIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4MuIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                          const G4Material*,
+                                          G4double cut)
+{
+  G4double x = 0.5*cut/electron_mass_c2;
+  G4double g = x*ratio + std::sqrt((1. + x)*(1. + x*ratio*ratio));
+  return mass*(g - 1.0);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     SetSecondaryParticle(G4Electron::Electron());
+    flucModel = new G4UniversalFluctuation();
+    // Bragg peak model
+    if (!EmModel(1)) SetEmModel(new G4BraggModel(),1);
+    EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
+    EmModel(1)->SetHighEnergyLimit(0.2*MeV);
+    AddEmModel(1, EmModel(1), new G4IonFluctuations());
+    G4VEmModel* em = new G4BraggModel();
+    em->SetLowEnergyLimit(0.1*keV);
+    em->SetHighEnergyLimit(0.2*MeV);
+    AddEmModel(1, em, flucModel);
+    G4VEmModel* em1 = new G4BetheBlochModel();
+    em1->SetLowEnergyLimit(0.2*MeV);
+    em1->SetHighEnergyLimit(1.0*GeV);
+    AddEmModel(2, em1, flucModel);
+    G4VEmModel* em2 = new G4MuBetheBlochModel();
+    em2->SetLowEnergyLimit(1.0*GeV);
+    em2->SetHighEnergyLimit(100.0*TeV);
+    AddEmModel(3, em2, flucModel);
+    // high energy fluctuation model
+    if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
+    // moderate energy model
+    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+    EmModel(2)->SetLowEnergyLimit(0.2*MeV);
+    EmModel(2)->SetHighEnergyLimit(1.0*GeV);
+    AddEmModel(2, EmModel(2), FluctModel());
+    // high energy model
+    if (!EmModel(3)) SetEmModel(new G4MuBetheBlochModel(),3);
+    EmModel(3)->SetLowEnergyLimit(1.0*GeV);
+    EmModel(3)->SetHighEnergyLimit(MaxKinEnergy());
+    AddEmModel(3, EmModel(3), FluctModel());
     ratio = electron_mass_c2/mass;
 …
 void G4MuIonisation::PrintInfo()
+{
+  G4cout << "      Bether-Bloch model for E > 0.2 MeV, "
+         << "parametrisation of Bragg peak below, "
+         << G4endl;
+  G4cout << "      radiative corrections for E > 1 GeV" << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuMultipleScattering.cc,v 1.3 2007/11/09 19:48:10 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuMultipleScattering.cc,v 1.12 2008/10/16 13:37:04 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 #include "G4MuMultipleScattering.hh"
 #include "G4MuMscModel.hh"
+#include "G4WentzelVIModel.hh"
 #include "G4MscStepLimitType.hh"
 …
   samplez           = false ;
   isInitialized     = false;
   SetRangeFactor(0.04);
+  SetRangeFactor(0.2);
   SetLateralDisplasmentFlag(true);
+}
 …
   if(isInitialized) {
     if (p->GetParticleType() != "nucleus") {
+    if (p->GetParticleType() != "nucleus" && p->GetPDGMass() < GeV) {
       mscModel->SetStepLimitType(StepLimitType());
       mscModel->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
-      //mscModel->SetThetaLimit(thetaLimit);
       mscModel->SetRangeFactor(RangeFactor());
+    }
+    mscModel->SetPolarAngleLimit(PolarAngleLimit());
     return;
+  }
   if (p->GetParticleType() == "nucleus") {
+  if (p->GetParticleType() == "nucleus" || p->GetPDGMass() > GeV) {
     SetLateralDisplasmentFlag(false);
     SetBuildLambdaTable(false);
-    //    SetRangeFactor(0.2);
+  }
+  // initialisation of parameters
+  //  G4String part_name = p->GetParticleName();
+  mscModel = new G4MuMscModel(RangeFactor(),thetaLimit);
+  // initialisation of the model
+  mscModel = new G4WentzelVIModel();
+  mscModel->SetStepLimitType(StepLimitType());
   mscModel->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
+  mscModel->SetRangeFactor(RangeFactor());
+  mscModel->SetPolarAngleLimit(PolarAngleLimit());
+  mscModel->SetLowEnergyLimit(MinKinEnergy());
+  mscModel->SetHighEnergyLimit(MaxKinEnergy());
   AddEmModel(1,mscModel);
 …
 void G4MuMultipleScattering::PrintInfo()
+{
   G4cout << "      Boundary/stepping algorithm is active with RangeFactor= "
          << RangeFactor()
          << "  Step limit type " << StepLimitType()
          << G4endl;
+  G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << G4endl;
+}

trunk/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuPairProduction.cc,v 1.48 2007/05/22 17:35:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuPairProduction.cc,v 1.52 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
     lowestKinEnergy(1.*GeV),
     isInitialised(false)
+{}
+{
+  SetProcessSubType(fPairProdByCharged);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4MuPairProduction::InitialiseEnergyLossProcess(const G4ParticleDefinition* part,
+                                                     const G4ParticleDefinition*)
+G4bool G4MuPairProduction::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4MuPairProduction::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                              const G4Material*,
+                                              G4double)
+{
+  return lowestKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4MuPairProduction::InitialiseEnergyLossProcess(
+                         const G4ParticleDefinition* part,
+                         const G4ParticleDefinition*)
+{
   if (!isInitialised) {
 …
     G4MuPairProductionModel* em = new G4MuPairProductionModel();
     em->SetLowestKineticEnergy(lowestKinEnergy);
     G4VEmFluctuationModel* fm = new G4UniversalFluctuation();
     em->SetLowEnergyLimit(0.1*keV);
     em->SetHighEnergyLimit(100.0*TeV);
+    G4VEmFluctuationModel* fm = 0;
+    em->SetLowEnergyLimit(MinKinEnergy());
+    em->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(1, em, fm);
+  }
 …
 void G4MuPairProduction::PrintInfo()
+{
+  G4cout << "      Parametrised model "
+         << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MuPairProductionModel.cc,v 1.35 2007/10/11 13:52:04 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuPairProductionModel.cc,v 1.40 2009/02/20 14:48:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
                                                  const G4String& nam)
   : G4VEmModel(nam),
+  minPairEnergy(4.*electron_mass_c2),
+  lowestKinEnergy(1.*GeV),
+  factorForCross(4.*fine_structure_const*fine_structure_const
+    particle(0),
+    factorForCross(4.*fine_structure_const*fine_structure_const
                    *classic_electr_radius*classic_electr_radius/(3.*pi)),
     sqrte(sqrt(exp(1.))),
     currentZ(0),
+    particle(0),
+    fParticleChange(0),
+    minPairEnergy(4.*electron_mass_c2),
+    lowestKinEnergy(1.*GeV),
     nzdat(5),
     ntdat(8),
 …
     ymax(0.),
     dy((ymax-ymin)/nbiny),
-    ignoreCut(false),
     samplingTablesAreFilled(false)
+{
   SetLowEnergyLimit(minPairEnergy);
+  nist = G4NistManager::Instance();
   theElectron = G4Electron::Electron();
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4MuPairProductionModel::SetParticle(const G4ParticleDefinition* p)
+{
+  if(!particle) {
+    particle = p;
+    particleMass = particle->GetPDGMass();
+  }
+G4double G4MuPairProductionModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                                     G4double kineticEnergy)
+{
+  G4double maxPairEnergy = kineticEnergy + particleMass*(1.0 - 0.75*sqrte*z13);
+  return maxPairEnergy;
+}
 …
     MakeSamplingTables();
+  }
+  if(pParticleChange) {
+    if(ignoreCut) {
+      gParticleChange =
+        reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
+      fParticleChange = 0;
+    } else {
+  if(!fParticleChange) {
+    if(pParticleChange)
       fParticleChange =
         reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+      gParticleChange = 0;
+    }
+  } else {
+    fParticleChange = new G4ParticleChangeForLoss();
+    gParticleChange = 0;
+    else
+      fParticleChange = new G4ParticleChangeForLoss();
+  }
+}
 …
+{
   G4double dedx = 0.0;
+  if (cutEnergy <= minPairEnergy || kineticEnergy <= lowestKinEnergy
+      || ignoreCut)
+  if (cutEnergy <= minPairEnergy || kineticEnergy <= lowestKinEnergy)
     return dedx;
 …
   G4double loss = 0.0;
   G4double cut  = min(cutEnergy,tmax);
+  G4double cut = std::min(cutEnergy,tmax);
   if(cut <= minPairEnergy) return loss;
 …
                                            G4double Z,
                                            G4double cut)
+{
+  G4double cross = 0. ;
+{
+  G4double cross = 0.;
   SetCurrentElement(Z);
   G4double tmax = MaxSecondaryEnergy(particle, tkin);
   if (tmax <= cut) return cross;
 …
                                                  G4double Z, G4double,
                                                  G4double cutEnergy,
+                                                 G4double)
+{
+  G4double cut  = max(minPairEnergy,cutEnergy);
+  if(ignoreCut) cut = minPairEnergy;
+  G4double cross = ComputeMicroscopicCrossSection (kineticEnergy, Z, cut);
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4MuPairProductionModel::CrossSectionPerVolume(
+                                               const G4Material* material,
+                                               const G4ParticleDefinition*,
+                                                     G4double kineticEnergy,
+                                                     G4double cutEnergy,
+                                                     G4double maxEnergy)
+                                                 G4double maxEnergy)
+{
   G4double cross = 0.0;
   if (kineticEnergy <= lowestKinEnergy) return cross;
+  maxEnergy += particleMass;
+  const G4ElementVector* theElementVector = material->GetElementVector();
+  const G4double* theAtomNumDensityVector = material->
+                                                    GetAtomicNumDensityVector();
+  for (size_t i=0; i<material->GetNumberOfElements(); i++) {
+    G4double Z = (*theElementVector)[i]->GetZ();
+    SetCurrentElement(Z);
+    G4double tmax = min(maxEnergy,MaxSecondaryEnergy(particle, kineticEnergy));
+    G4double cut  = max(minPairEnergy,cutEnergy);
+    if(ignoreCut) cut = minPairEnergy;
+    if(cut < tmax) {
+      G4double cr = ComputeMicroscopicCrossSection(kineticEnergy, Z, cut)
+                  - ComputeMicroscopicCrossSection(kineticEnergy, Z, tmax);
+      cross += theAtomNumDensityVector[i] * cr;
+    }
+  SetCurrentElement(Z);
+  G4double tmax = std::min(maxEnergy, kineticEnergy);
+  G4double cut  = std::min(cutEnergy, kineticEnergy);
+  if(cut < minPairEnergy) cut = minPairEnergy;
+  if (cut >= tmax) return cross;
+  cross = ComputeMicroscopicCrossSection (kineticEnergy, Z, cut);
+  if(tmax < kineticEnergy) {
+    cross -= ComputeMicroscopicCrossSection(kineticEnergy, Z, tmax);
+  }
   return cross;
 …
     SetCurrentElement(Z);
     for (G4int it=0; it<ntdat; it++)
+    {
+    for (G4int it=0; it<ntdat; it++) {
       G4double kineticEnergy = tdat[it];
       G4double maxPairEnergy = MaxSecondaryEnergy(particle,kineticEnergy);
+      // G4cout << "Z= " << currentZ << " z13= " << z13
+      //<< " mE= " << maxPairEnergy << G4endl;
       G4double CrossSection = 0.0 ;
+      G4double y = ymin - 0.5*dy ;
+      G4double yy = ymin - dy ;
+      G4double x = exp(y);
+      G4double fac = exp(dy);
+      G4double dx = exp(yy)*(fac - 1.0);
+      G4double c = log(maxPairEnergy/minPairEnergy);
+      for (G4int i=0 ; i<nbiny; i++)
+      {
+        y += dy ;
+        if(c > 0.0) {
+          x *= fac;
+          dx*= fac;
+          G4double ep = minPairEnergy*exp(c*x) ;
+          CrossSection += ep*dx*ComputeDMicroscopicCrossSection(
+                                      kineticEnergy, Z, ep);
+        }
+        ya[i] = y;
+        proba[iz][it][i] = CrossSection;
+      if(maxPairEnergy > minPairEnergy) {
+        G4double y = ymin - 0.5*dy ;
+        G4double yy = ymin - dy ;
+        G4double x = exp(y);
+        G4double fac = exp(dy);
+        G4double dx = exp(yy)*(fac - 1.0);
+        G4double c = log(maxPairEnergy/minPairEnergy);
+        for (G4int i=0 ; i<nbiny; i++) {
+          y += dy ;
+          if(c > 0.0) {
+            x *= fac;
+            dx*= fac;
+            G4double ep = minPairEnergy*exp(c*x) ;
+            CrossSection +=
+              ep*dx*ComputeDMicroscopicCrossSection(kineticEnergy, Z, ep);
+          }
+          ya[i] = y;
+          proba[iz][it][i] = CrossSection;
+        }
+      } else {
+        for (G4int i=0 ; i<nbiny; i++) {
+          proba[iz][it][i] = CrossSection;
+        }
+      }
       ya[nbiny]=ymax;
       proba[iz][it][nbiny] = CrossSection;
 …
   G4double maxEnergy     = std::min(tmax, maxPairEnergy);
   G4double minEnergy     = std::max(tmin, minPairEnergy);
+  if(ignoreCut)minEnergy = minPairEnergy;
   if(minEnergy >= maxEnergy) return;
   //G4cout << "emin= " << minEnergy << " emax= " << maxEnergy
 …
   // primary change
   kineticEnergy -= (ElectronEnergy + PositronEnergy);
+  if(fParticleChange)
+    fParticleChange->SetProposedKineticEnergy(kineticEnergy);
+  else
+    gParticleChange->SetProposedKineticEnergy(kineticEnergy);
+  fParticleChange->SetProposedKineticEnergy(kineticEnergy);
   vdp->push_back(aParticle1);
 …
     G4double maxPairEnergy = MaxSecondaryEnergy(particle,kinEnergy);
     G4double minEnergy     = std::max(tmin, minPairEnergy);
-    if(ignoreCut)minEnergy = minPairEnergy;
     G4int iz;

trunk/source/processes/electromagnetic/polarisation/History

-              r819
+              r961
 $Id: History,v 1.15 2007/11/05 10:53:13 schaelic Exp $
+$Id: History,v 1.16 2008/10/30 22:34:23 schaelic Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+October 08: A.Schaelicke (empolar-V09-01-01)
+   For all process classes set sub-types according to the enumeration
 November 07: A.Schaelicke (empolar-V09-00-02)
 November 07: A.Schaelicke

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizationHelper.hh,v 1.2 2007/11/01 17:30:25 schaelic Exp $
27		// tag $Name: $
	27	// tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class header file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizationManager.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $
27		// tag $Name: $
	27	// tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class header file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh

r819	r961
27	27	//
28	28	// $Id: G4PolarizationMessenger.hh,v 1.2 2006/12/13 15:44:33 gunter Exp $
29		// tag $Name: $
	29	// tag $Name: geant4-09-02-ref-02 $
30	30	//
31	31	// GEANT4 Class header file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh

r819	r961
26	26	// -------------------------------------------------------------------
27	27	// $Id: G4PolarizedAnnihilationCrossSection.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	// -------------------------------------------------------------------
30	30	//

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedAnnihilationModel.hh,v 1.3 2007/07/10 09:38:17 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedBhabhaCrossSection.hh,v 1.2 2006/11/17 14:14:17 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedBremsstrahlungCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedComptonCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedComptonModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh

r819	r961
26	26	//
27	27	// $Id: G4PolarizedGammaConversion.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedGammaConversionModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedMollerBhabhaModel.hh,v 1.3 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// -------------------------------------------------------------------
29	29	//

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedMollerCrossSection.hh,v 1.3 2006/12/13 15:44:36 gunter Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPEEffectCrossSection.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectModel.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPEEffectModel.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPairProductionCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPhotoElectricEffect.hh

r819	r961
26	26	//
27	27	// $Id: G4PolarizedPhotoElectricEffect.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh

r819	r961
25	25	//
26	26	// $Id: G4StokesVector.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class header file

trunk/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh

r819	r961
25	25	//
26	26	// $Id: G4VPolarizedCrossSection.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// File name: G4VPolarizedCrossSection

trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh

r819	r961
25	25	//
26	26	// $Id: G4ePolarizedBremsstrahlung.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh

r819	r961
25	25	//
26	26	// $Id: G4ePolarizedBremsstrahlungModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh

r819	r961
25	25	//
26	26	// $Id: G4ePolarizedIonisation.hh,v 1.3 2007/06/11 13:37:56 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// -------------------------------------------------------------------
29	29	//

trunk/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh

r819	r961
25	25	//
26	26	// $Id: G4eplusPolarizedAnnihilation.hh,v 1.3 2007/06/11 13:37:56 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizationHelper.cc,v 1.4 2007/11/01 17:30:25 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationManager.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizationManager.cc,v 1.1 2006/09/21 21:35:11 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationMessenger.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizationMessenger.cc,v 1.1 2006/09/21 21:35:11 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	//

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc

r819	r961
26	26	// -------------------------------------------------------------------
27	27	// $Id: G4PolarizedAnnihilationCrossSection.cc,v 1.6 2007/11/01 17:32:34 schaelic Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	// -------------------------------------------------------------------
30	30	//

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedAnnihilationModel.cc,v 1.6 2007/07/10 09:38:17 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedBhabhaCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// -------------------------------------------------------------------
29	29	//

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedBremsstrahlungCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedCompton.cc

-              r819
+              r961
 //
 //
 // $Id: G4PolarizedCompton.cc,v 1.7 2007/07/10 09:35:37 schaelic Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PolarizedCompton.cc,v 1.9 2008/10/30 22:34:23 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   SetMinKinEnergy(0.1*keV);
   SetMaxKinEnergy(100.0*GeV);
+  SetProcessSubType(fComptonScattering);
+}

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedComptonCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc

r819	r961
26	26	//
27	27	// $Id: G4PolarizedComptonModel.cc,v 1.4 2007/05/23 08:52:20 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversion.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PolarizedGammaConversion.cc,v 1.3 2007/05/23 08:52:20 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PolarizedGammaConversion.cc,v 1.5 2008/10/30 22:34:23 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   SetMinKinEnergy(2.0*electron_mass_c2);
   SetMaxKinEnergy(100.0*GeV);
+  SetProcessSubType(fGammaConversion);
+}

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedGammaConversionModel.cc,v 1.6 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedMollerBhabhaModel.cc,v 1.4 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// -------------------------------------------------------------------
29	29	//

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedMollerCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// -------------------------------------------------------------------
29	29	//

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPEEffectCrossSection.cc,v 1.1 2007/11/01 17:29:09 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectModel.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPEEffectModel.cc,v 1.1 2007/11/01 17:29:09 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4PolarizedPairProductionCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPhotoElectricEffect.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PolarizedPhotoElectricEffect.cc,v 1.1 2007/11/01 17:29:09 schaelic Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PolarizedPhotoElectricEffect.cc,v 1.3 2008/10/30 22:34:23 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   G4ProcessType type):G4VEmProcess (processName, type),
     isInitialised(false)
+{}
+{
+  SetProcessSubType(fPhotoElectricEffect);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/polarisation/src/G4StokesVector.cc

r819	r961
25	25	//
26	26	// $Id: G4StokesVector.cc,v 1.3 2006/11/17 11:59:03 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// GEANT4 Class file

trunk/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc

r819	r961
25	25	//
26	26	// $Id: G4VPolarizedCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	// File name: G4VPolarizedCrossSection
29	29	//

trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlung.cc

r819	r961
25	25	//
26	26	// $Id: G4ePolarizedBremsstrahlung.cc,v 1.3 2007/05/23 08:52:20 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc

r819	r961
25	25	//
26	26	// $Id: G4ePolarizedBremsstrahlungModel.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc

-              r819
+              r961
 //
 //
 // $Id: G4ePolarizedIonisation.cc,v 1.5 2007/07/10 09:35:37 schaelic Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ePolarizedIonisation.cc,v 1.7 2008/10/30 22:34:23 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // -------------------------------------------------------------------
 //
 …
   SetMaxKinEnergy(100.0*TeV);
   //  PrintInfoDefinition();
+  SetProcessSubType(fIonisation);
+}

trunk/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eplusPolarizedAnnihilation.cc,v 1.6 2007/10/02 11:36:44 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eplusPolarizedAnnihilation.cc,v 1.8 2008/10/30 22:34:23 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
+{
   enableAtRestDoIt = true;
+  SetProcessSubType(fAnnihilation);
+}

trunk/source/processes/electromagnetic/standard/History

-              r819
+              r961
 $Id: History,v 1.363.2.1 2008/04/25 00:22:53 vnivanch Exp $
+$Id: History,v 1.432 2009/02/20 12:11:37 vnivanch Exp $
 -------------------------------------------------------------------
 …
      ----------------------------------------------------------
+April 08: V.Ivant (emstand-V09-00-23)
+G4UrbanMscModel90, G4UrbanMscModel - fixed assymetry of lateral displacement
+G4ionIonisation - use linLossLimit 0.15 as it was in 9.1
+G4IonFluctuations - fixed discontinuity of width of the energy loss for small
+                    velocities (very long alpha events)
+February 09: V.Ivant (emstand-V09-02-00)
+- Move all virtual methods from inline to source
+G4PEEffectModel - substitute ComputeMeanFreePath by CrossSectionPerVolume
+                  (minor CPU speadup for compound materials)
+G4PAIModel, G4PAIPhotonModel - remove usage of random numbers at
+                   initialisation (potential non-reproducibility)
+G4WentzelVIModel - use generic methods of G4VMscModel to access safety
+                   and other geometry information
+November 08: V.Ivant (emstand-V09-01-45)
+G4PSTARStopping, G4ASTARStopping - fixed non-initialized variable
+   introduced in the previous tag
+November 08: V.Ivant (emstand-V09-01-44)
+G4WentzelVIModel - minor fix in lateral displacement
+November 08: A. Schaelicke (emstand-V09-01-43)
+G4eBremsstrahlung - activate LPM switch for high energy model
+G4eBremsstrahlungRelModel - revised LPMconstant
+G4eBremsstrahlungModel, G4eBremsstrahlungRelModel - (VI) use LPM flag
+                                from the base class
+November 08: V.Ivant (emstand-V09-01-42)
+G4PSTARStopping - fixed SiO2 and TEFLON data
+G4ASTARStopping - fixed GRAFITE data
+October 08: V.Ivant (emstand-V09-01-41)
+G4UrbanMscModel, G4UrbanMscModel2, G4UrbanMscModel90, G4WentzelVIModel
+  use StepStatus from preStepPoint to identify first step for a given track
+  instaed of step number in order to address ATLAS problem of small step
+  limits happen with suspended tracks
+October 08: V.Ivant (emstand-V09-01-40)
+G4UrbanMscModel2 - extra protection for "UseDistanceToBoundary" option
+G4WentzelVIModel - fixed cross section factor for single scattering
+October 08: V.Ivant (emstand-V09-01-39)
+G4eCoulombScatteringModel and G4WentzelVIModel - added protection against
+    precision loss in computation of cross section at high energy
+G4UrbanMscModel2 - fixed screening parameter of the single scattering part
+G4eMultipleScattering - set default RangeFactor = 0.04
+October 08: V.Ivant (emstand-V09-01-38)
+G4IonFluctuations - added G4UniversalFluctuation model, which are used for
+    high energy; added comments and cleanup
+G4BetheBlochModel, G4BraggIonModel - take into account effective change
+    change over the step
+G4hIonisation - switch off nuclear stopping for pi and K mesons
+October 08: V.Ivant (emstand-V09-01-37)
+G4UrbanMscModel2 - return back ref-08 version
+G4IronStopping, G4MaterialStopping, G4SimpleMaterialStopping moved to materials
+G4eBremsstrahlungHEModel - temporary model is removed
+October 08: V.Ivant (emstand-V09-01-36)
+G4UrbanMscModel2 - use logic of 9.1 version for step limitation
+                   option "UseSafety" to fix CPU penalty in sampling
+                   calorimeters (L.Urban)
+G4UrbanMscModel2, G4UrbanMscModel, G4UrbanMscModel90 added protection
+                   against sampling scattering angle with zero transport
+                   cross section
+October 08: V.Ivant (emstand-V09-01-35)
+For all process classes set sub-types according to the enumeration
+of G4EmProcessSubType.hh, improved cout
+G4UrbanMscModel2 - use screning function from G4eCoulombScatteringModel
+G4eBremsstrahlung - set relativistic model above 1 GeV by default
+G4eBremsstrahlungModel, G4eBremsstrahlungRelModel removed private member
+   highEnergyTh and use access method to this threshold in the base class
+September 08: V.Ivant (emstand-V09-01-34)
+G4BetheBlochModel, G4BraggModel, G4BraggIonModel - simplified new methods
+G4ionIonisation - use the same low-energy model for He ions and GenericIons
+                  (like it was in 9.2beta)
+September 08: V.Ivant (emstand-V09-01-33)
+G4UrbanMscModel, G4UrbanMscModel2, G4UrbanMscModel90 - do not use
+   string comparison when compute transport cross section, instead
+   compare masses (G.Cosmo)
+September 08: V.Ivant (emstand-V09-01-32)
+Improved verbose output for processes
+G4IonFluctuations - do not use Poisson sampling
+G4BetheBlochModel, G4BraggModel, G4BraggIonModel - added methods
+   GetParticleCharge, GetChargeSquareRatio, CorrectionsAlongStep
+   needed for ions; define low and high energy limits inside the model
+G4ionIonisation, G4hIonisation - remove InitialiseMassCharge and
+                                 CorrectionsAlongStep methods;
+                                 limits of kinetic energy for models
+                                 taken from the base class and from
+                                 models; separate trietment He ions
+September 08: V.Ivant (emstand-V09-01-31)
+G4WaterStopping, G4IronStopping, G4MaterialStopping,
+G4SimpleMaterialStopping - use mass number instead of atomic mass
+                           (A.Lechner proposal)
+G4eBremsstrahlungModel - Migdal constant set to the vavue of
+                         G4eBremsstrahlungRelModel (A.Schaelicke)
+August 08: V.Ivant (emstand-V09-01-30)
+G4WaterStopping, G4IronStopping - add method AddData to speeed up
+     compillation and cleanup
+G4WentzelVIModel - fixed bug in lateral displacement
+August 08: A.Schaelicke
+G4eBremsstrahlungRelModel
+   * define threshold energy for LPM effect
+   * fix LPM calculation
+   * define Thomas-fermi FF (ala Tsai)
+   * some speed improvements
+August 08: V.Ivant (emstand-V09-01-29)
+G4MaterialStopping, G4SimpleMaterialStopping - fixed compillation
+    problem at Windows by adding a new method AddData
+August 08: V.Ivant (emstand-V09-01-28)
+August 08: V.Ivant (emstand-V09-01-27)
+G4UrbanMscModel2 - fixed NaN in sampling of cosine theta for 50 GeV e-
+August 08: V.Ivant (emstand-V09-01-26)
+Added new classes with stopping data G4MaterialStopping,
+      G4SimpleMaterialStopping, G4IronStopping
+August 08: V.Ivant (emstand-V09-01-25)
+G4eCoulombScatteringModel - added extra protection for precision lost in
+                            computation of recoil energy
+G4eBremsstrahlungModel, G4eBremsstrahlungHEModel - define more precise names
+                          of models
+August 08: V.Ivant (emstand-V09-01-24)
+G4IonFluctuations - do not perform loop over elements of material but use
+                    effetive Z
+G4UrbanMscModel2 - bug fix in ComputeTruePathLengthLimit (L.Urban)
+August 08: V.Ivant (emstand-V09-01-23)
+G4eMultipleScattering - allowed to be applied for all changed particles
+G4UrbanMscModel2 - changed name to "UrbanMscUni2"
+G4eCoulombScatteringModel and G4WentzelVIModel - added protections for ions
+G4WaterStopping - added extra data
+July 08: V.Ivant (emstand-V09-01-22)
+G4WentzelVIModel, G4eCoulombScatteringModel, G4CoulombScatteringModel -
+           do not define min and max energy in constructor but use Set
+           methods
+G4MultipleScattering, G4eMultipleScattering, G4hMultipleScattering -
+           added cout of model names
+G4CoulombScattering - set angular limit of models by Set method
+July 08: V.Ivant (emstand-V09-01-21)
+G4UrbanMscModel2 - central part of scattering angle (theta0) and
+           tail of the scattering angle distribution have been tuned
+           using some e- and proton scattering data (L.Urban)
+July 08: V.Ivant (emstand-V09-01-20)
+G4eCoulombScatteringModel, G4CoulombScatteringModel  - added usage of
+         G4ElementSelector vector, do not use A in SetupTarget method
+G4WentzelVIModel - do not use A in SetupTarget method
+June 08: V.Ivant (emstand-V09-01-19)
+G4PAIPhotonModel - change model name
+G4MultipleScattering71 - move inline virtual method to source to avoid
+                         compillation warning
+June 08: V.Ivant (emstand-V09-01-18)
+- G4CoulombScattering - added SetHEModelLimit method to provide more easy
+                        initialisation
+June 08: V.Ivant (emstand-V09-01-17)
+- G4eCoulombScatteringModel - SelectIsotope method moved from the derived
+    class and sampling of the recoil ion is performed
+- G4CoulombScatteringModel - SelectIsotope method moved to the base class
+- G4PAIxSection - new functions for resonance and Rutherford collisions
+- G4IonFluctuations - fixed index
+- G4ionIonisation - use G4BraggModel for low-energy ions heavier than He
+- G4hIonisation - build separate tables for kaons to allow use hadron
+                  bremsstrahlung and pair production by kaons
+June 08: V.Ivant (emstand-V09-01-16)
+- G4IonFluctuations - added method SetParticleAndCharge
+- G4ionIonisation, G4ionGasIonisation - added pointer to G4IonFluctuations
+             and use of method SetParticleAndCharge; compute nuclear
+             stopping before adding corrections
+May 08: V.Ivant (emstand-V09-01-15)
+- G4IonFluctuations - summed fluctuation of components of a mixture instead
+                      of computation for average Z
+- G4BetheBlochModel - added projectile form-factor in computation of max
+                      energy transfer and in sampling of the energy of e-
+May 08: A.Schaelicke
+- G4eBremsstrahlungHEModel - new model, which is an extension of the standard
+                             bremsstrahlung model using a more sophisticated
+                             LPM approach
+May 08: V.Ivant (emstand-V09-01-14)
+- G4hMultipleScattering - added method AlongStepGetPhysicalInteractionLength
+    in which for ions scaled energy normalized to one nucleon is used
+- G4ionGasIonisation - fixed bug in update of the dynamic charge of
+                        an ion
+April 08: V.Ivant (emstand-V09-01-13)
+- G4WentzelVIModel - new model of multiple scattering
+- G4WaterStopping - use spline
+- G4hMultipleScattering - do not build tables for particles with mass > GeV
+- G4ionIonisation, G4ionGasIonisation - updated usage of high order
+                                        corrections
+- G4CoulombScattering, G4eCoulombScatteringModel - use new parameter
+                                                   polarAngleLimit
+April 08: V.Ivant (emstand-V09-01-12)
+- G4UrbanMscModel, G4UrbanMscModel90 - fixed assymetry in transverse
+    displacement
+- G4eCoulombScatteringModel - fixed bug for compounds
+March 08: V.Ivant (emstand-V09-01-11)
+- G4eCoulombScatteringModel - use SelectAtomRandomly method
+- G4UrbanMscModel2 (L.Urban):
+           - Simplification of step limitation in ComputeTruePathLengthLimit,
+             + tlimitmin is the same for UseDistancetoBoundary and UseSafety
+           - Reorganization of SampleCosineTheta + new method SimpleScattering
+             SimpleScattering is used if the relative energy loss is too big
+             or theta0 is too big (see data members rellossmax, theta0max)
+           - Tuning of the correction factor in ComputeTheta0
+           - exponent c of the 'tail' model function is not equal to 2 any more,
+             value of c has been extracted from some e- scattering data
+           - Step limitation in ComputeTruePathLengthLimit has been
+             simplified further + some data members have been removed
+March 08: V.Ivant (emstand-V09-01-10)
+- G4BetheBlochModel - use formfactor for sampling
+- G4eCoulombScatteringModel - remove unsued array
+March 08: V.Ivant (emstand-V09-01-09)
+- G4ionIonisation - use default linLossLimit of 9.1
+- G4hIonisation - use G4IonFluctuations at low energies
+- G4IonFluctuations - fixed computation of corrections
+- G4BetheBlochModel - finite size correction is taken into
+  account both for delta-electron cross section and DEDX
+- G4eCoulombScatteringModel - reorganize and cleanup computation
+  of cross section
+March 08: V.Ivant (emstand-V09-01-08)
+- G4UrbanMscModel2 - L.Urban fix assymetry in lateral displacement
+- G4UrbanMscModel90, G4MscModel71 - fixed warnings for gcc 4.3.0
+March 08: V.Ivant (emstand-V09-01-07)
+- G4MultipleScattering, G4hMultipleScattering, G4UrbanMscModel,
+  G4UrbanMscModel2, G4UrbanMscModel90 uses G4VMscModel interface
+- G4eMultipleScattering - new process specialized for e+,e-
+March 08: V.Ivant (emstand-V09-01-06)
+- G4UrbanMscModel2 is cloned from G4UrbanMscModel
+- SubType for all processes is initialized
+February 08: V.Ivant (emstand-V09-01-05)
+G4eCoulombScatteringModel - speedup run-time computations using
+  precomputed nuclear form-factors per element
+February 08: V.Ivant (emstand-V09-01-04)
+- G4ionIonisation, G4ionGasIonisation - use new method to compute
+  corrections: IonHighOrderCorrections
+- G4BetheBlochModel - when computing dedx for ions use new
+  method IonBarkasCorrection
+- G4IonFluctuations - added protection to the computation of
+  the correction factor to dispersion which provide smooth
+  transition to small velocities of an ion
+February 08: V.Ivant (emstand-V09-01-03)
+- G4hIonisation, G4ionIonisation, G4ionGasIonisation - add extra
+   protections in computation of non-ionizing energy loss
+February 08: V.Ivant (emstand-V09-01-02)
+G4IonFluctuations - added protection in computation of dispersion
+  on allowing have a corrected dispersion below Bohr value
 January 08: V.Ivant (emstand-V09-01-01)
 G4PAIModel, G4PAIPhotonModel - added an extra protection garanteed
  correct usage of the last bin of the table of nergy transfers
+G4PAIModel, G4PAIPhotonModel - added an extra protection guaranteed
+ correct usage of the last bin of the table of energy transfers
 January 08: V.Ivant (emstand-V09-01-00)
 - G4hIonisation, G4ionIonisation, G4ionGasIonisation - fixed
    computation of non-ionizing energy loss: at the last ioniztion step
+   computation of non-ionizing energy loss: at the last ionization step
    and at energies above 2 MeV for protons;
 - G4eCoulombScatteringModel - use more safe numerical espression
+- G4eCoulombScatteringModel - use more safe numerical expression
 December 07: V.Ivant (emstand-V09-00-22)
 …
            particle type (electron, muons, others)
          - tuning ComputeGeomPathLength in order to get better low
            energy behaviour for heavy particles (mu, hadrons)
+           energy behavior for heavy particles (mu, hadrons)
          - small modification of theta0 in ComputeTheta0 (based on data)
          - some old inconsistency/bug has been cured in SampleCosineTheta
 …
 - G4eCoulombScatteringModel and G4CoulombScatteringModel - fixed bug in
   computation of screening parameters in SampleSecondary method;
   reorganised initialisation of kinematics and screening parameters;
+  reorganized initialisation of kinematics and screening parameters;
   used Z(Z+1) factor to take into account scattering off e-
 …
 - G4ionIonisation - remove obsolete method DefineMassCharge
 - G4ionGasIonisation - new ion ionisation process with descrete ion charge and
                        no equilibrium btween ion and media
+                       no equilibrium between ion and media
 - G4BraggModel, G4BraggIonModel - more safe computation of scattering angle
 …
   void, extra parameter std::vector<G4DynamicParticle*>*, all
   classes using or inhereting this interface are modified.
   About 5% speadup of EM shower simulation
+  About 5% speedup of EM shower simulation
 May 07:  V.Ivanchenko (emstand-V08-03-05)
 …
 May 07:  V.Ivanchenko (emstand-V08-03-02)
 - G4MultipleScattering, G4hMultipleScattering - reorganise methods
+- G4MultipleScattering, G4hMultipleScattering - reorganized methods
                                                 for setting msc
                                                 parameters
 - G4UrbanMscModel - reorganise initialisation; use G4MscStepLimitType
+- G4UrbanMscModel - reorganized initialisation; use G4MscStepLimitType
                     enumerator to choose step limit algorithm

trunk/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ASTARStopping.hh,v 1.5 2006/06/29 19:49:58 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4ASTARStopping.hh,v 1.6 2008/11/13 12:04:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4ASTARStopping_h
 …
   G4double e[74][78], kinE[78];
   G4double effZ[74];
-  G4int Znum[74];
 };

trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BetheBlochModel.hh,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4BetheBlochModel.hh,v 1.17 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 12-11-03 Fix for GenericIons (V.Ivanchenko)
 // 24-03-05 Add G4EmCorrections (V.Ivanchenko)
 // 11-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
+// 11-04-05 Major optimisation of internal interfaces (V.Ivanchenko)
 // 11-04-04 Move MaxSecondaryEnergy to models (V.Ivanchenko)
 // 11-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 //
 …
 class G4EmCorrections;
 class G4ParticleChangeForLoss;
+class G4NistManager;
 class G4BetheBlochModel : public G4VEmModel
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerElectron(
 …
                                         G4double cutEnergy);
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                        const G4Material* mat,
+                                        G4double kineticEnergy);
+  virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
+                                     const G4Material* mat,
+                                     G4double kineticEnergy);
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
                                  const G4MaterialCutsCouple*,
 …
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                               G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 private:
 …
   const G4ParticleDefinition* particle;
+  const G4Material*           currentMaterial;
   G4ParticleDefinition*       theElectron;
   G4EmCorrections*            corr;
   G4ParticleChangeForLoss*    fParticleChange;
+  G4NistManager*              nist;
   G4double mass;
   G4double tlimit;
   G4double spin;
+  G4double magMoment2;
   G4double chargeSquare;
   G4double ratio;
+  G4double formfact;
   G4double twoln10;
   G4double bg2lim;
   G4double taulim;
+  G4double corrFactor;
   G4bool   isIon;
+  G4bool   isInitialised;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4BetheBlochModel::MaxSecondaryEnergy(
-          const G4ParticleDefinition* pd,
-                G4double kinEnergy)
+{
-  if(isIon) SetParticle(pd);
-  G4double tau  = kinEnergy/mass;
-  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
-                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
-  return std::min(tmax,tlimit);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4BetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+{
-  if(particle != p) {
-    particle = p;
-    mass = particle->GetPDGMass();
-    spin = particle->GetPDGSpin();
-    G4double q = particle->GetPDGCharge()/eplus;
-    chargeSquare = q*q;
-    ratio = electron_mass_c2/mass;
-    if(mass > 120.*MeV) tlimit = 51.2*GeV*std::pow(proton_mass_c2/mass,0.66667);
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh

r819	r961
25	25	//
26	26	// $Id: G4BetheHeitlerModel.hh,v 1.6 2007/05/22 17:34:36 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BohrFluctuations.hh,v 1.3 2007/09/27 13:53:11 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BohrFluctuations.hh,v 1.4 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   void InitialiseMe(const G4ParticleDefinition*);
-protected:
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4BohrFluctuations::Dispersion(
-                          const G4Material* material,
-                          const G4DynamicParticle* dp,
-                                G4double& tmax,
-                                G4double& length)
+{
-  if(!particle) InitialiseMe(dp->GetDefinition());
-  G4double electronDensity = material->GetElectronDensity();
-  kineticEnergy = dp->GetKineticEnergy();
-  G4double etot = kineticEnergy + particleMass;
-  beta2 = kineticEnergy*(kineticEnergy + 2.0*particleMass)/(etot*etot);
-  G4double siga  = (1.0/beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
-                 * electronDensity * chargeSquare;
-  return siga;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggIonModel.hh,v 1.8 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BraggIonModel.hh,v 1.12 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 15-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
 // 25-04-06 Add stopping data from ASTAR (V.Ivanchenko)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 //
 …
 //
 // Implementation of energy loss and delta-electron production
+// by heavy slow charged particles using eveluated data
+// by heavy slow charged particles using ICRU'49 and NIST evaluated data
+// for He4 ions
 // -------------------------------------------------------------------
 …
 class G4ParticleChangeForLoss;
+class G4EmCorrections;
 class G4BraggIonModel : public G4VEmModel
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerElectron(
 …
                                  G4double maxEnergy);
+  // Compute ion charge
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
+                                        const G4Material*,
+                                        G4double kineticEnergy);
+  virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
+                                     const G4Material* mat,
+                                     G4double kineticEnergy);
+  // add correction to energy loss and ompute non-ionizing energy loss
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                               G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 private:
 …
   G4double DEDX(const G4Material* material, G4double kineticEnergy);
+  G4EmCorrections*            corr;
   const G4ParticleDefinition* particle;
   G4ParticleDefinition*       theElectron;
 …
   G4double massRate;
   G4double ratio;
-  G4double highKinEnergy;
-  G4double lowKinEnergy;
   G4double lowestKinEnergy;
   G4double HeMass;
   G4double massFactor;
+  G4double corrFactor;
   G4double rateMassHe2p;
   G4double theZieglerFactor;
 …
   G4int    iMolecula;          // index in the molecula's table
   G4bool   isIon;
+  G4bool   isInitialised;
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4BraggIonModel::MaxSecondaryEnergy(
-          const G4ParticleDefinition* pd,
-                G4double kinEnergy)
+{
-  if(pd != particle) SetParticle(pd);
-  G4double tau  = kinEnergy/mass;
-  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
-                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
-  return tmax;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggModel.hh,v 1.10 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BraggModel.hh,v 1.13 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 11-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
 // 15-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
+// 25-04-06 Add stopping data from PSTAR (V.Ivanchenko)
+// 25-04-06 Added stopping data from PSTAR (V.Ivanchenko)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 //
 …
 //
 // Implementation of energy loss and delta-electron production
+// by heavy slow charged particles using eveluated data
+// by heavy slow charged particles using ICRU'49 and NIST evaluated data
+// for protons
 // -------------------------------------------------------------------
 …
 class G4ParticleChangeForLoss;
+class G4EmCorrections;
 class G4BraggModel : public G4VEmModel
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerElectron(
 …
                                  G4double maxEnergy);
+  // Compute ion charge
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
+                                        const G4Material*,
+                                        G4double kineticEnergy);
+  virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
+                                     const G4Material* mat,
+                                     G4double kineticEnergy);
+  // add correction to energy loss and compute non-ionizing energy loss
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                               G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 private:
   void SetParticle(const G4ParticleDefinition* p);
+  inline void SetParticle(const G4ParticleDefinition* p);
   G4bool HasMaterial(const G4Material* material);
 …
   G4BraggModel & operator=(const  G4BraggModel &right);
   G4BraggModel(const  G4BraggModel&);
+  G4EmCorrections*            corr;
   const G4ParticleDefinition* particle;
 …
   G4double massRate;
   G4double ratio;
-  G4double highKinEnergy;
-  G4double lowKinEnergy;
   G4double lowestKinEnergy;
   G4double protonMassAMU;
 …
   G4int    iMolecula;          // index in the molecula's table
   G4bool   isIon;
+  G4bool   isInitialised;
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4BraggModel::MaxSecondaryEnergy(
-                                            const G4ParticleDefinition* pd,
-                                                  G4double kinEnergy)
+{
-  if(pd != particle) SetParticle(pd);
-  G4double tau  = kinEnergy/mass;
-  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
-                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
-  return tmax;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh

-              r819
+              r961
 //
 //
 // $Id: G4ComptonScattering.hh,v 1.20 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4ComptonScattering.hh,v 1.21 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //------------------ G4ComptonScattering physics process -----------------------
 …
   // true for Gamma only.
   G4bool IsApplicable(const G4ParticleDefinition&);
+  virtual G4bool IsApplicable(const G4ParticleDefinition&);
   // Print few lines of informations about the process: validity range,
   virtual void PrintInfo();
 protected:
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4bool G4ComptonScattering::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Gamma::Gamma());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh

r819	r961
26	26	//
27	27	// $Id: G4ComptonScattering52.hh,v 1.4 2007/05/16 14:00:56 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//------------------ G4ComptonScattering52 physics process -----------------------

trunk/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4CoulombScattering.hh,v 1.8 2007/07/31 17:24:04 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4CoulombScattering.hh,v 1.12 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   void SetThetaMin(G4double);
+  inline void SetThetaMin(G4double);
   void SetThetaMax(G4double);
+  inline void SetThetaMax(G4double);
+  void SetQ2Max(G4double);
+  inline void SetQ2Max(G4double);
+  // Set energy above which high energy model will be used
+  inline void SetHEModelLimit(G4double);
   // obsolete method to be removed
   void SetBuildTableFlag(G4bool);
+  inline void SetBuildTableFlag(G4bool);
   // Print out of the class parameters
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4CoulombScattering::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && !p.IsShortLived());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline void G4CoulombScattering::SetThetaMin(G4double val)
+{
 …
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4CoulombScattering::SetHEModelLimit(G4double val)
+{
+  thEnergy = val;
+  thEnergyElec = val;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4CoulombScatteringModel.hh,v 1.11 2007/10/09 08:16:29 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4CoulombScatteringModel.hh,v 1.15 2008/07/31 13:11:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 19.10.06 V.Ivanchenko use inheritance from G4eCoulombScatteringModel
 // 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
+// 09.06.08 V.Ivanchenko SelectIsotope is moved to the base class
 //
 // Class Description:
 …
 #include "globals.hh"
-class G4ParticleTable;
-class G4NistManager;
 class G4CoulombScatteringModel : public G4eCoulombScatteringModel
+{
 …
 public:
+  G4CoulombScatteringModel(G4double thetaMin = 0.0, G4double thetaMax = pi,
+                           G4bool build = false, G4double tlim = TeV*TeV,
+                           const G4String& nam = "CoulombScattering");
+  G4CoulombScatteringModel(const G4String& nam = "CoulombScattering");
   virtual ~G4CoulombScatteringModel();
 …
 private:
-  G4double SelectIsotope(const G4Element*);
   // hide assignment operator
   G4CoulombScatteringModel & operator=(const G4CoulombScatteringModel &right);
   G4CoulombScatteringModel(const  G4CoulombScatteringModel&);
-  G4ParticleTable*            theParticleTable;
-  const G4NistManager*        theMatManager;
 };

trunk/source/processes/electromagnetic/standard/include/G4GammaConversion.hh

-              r819
+              r961
 //
 //
 // $Id: G4GammaConversion.hh,v 1.22 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4GammaConversion.hh,v 1.23 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   // true for Gamma only.
   G4bool IsApplicable(const G4ParticleDefinition&);
+  virtual G4bool IsApplicable(const G4ParticleDefinition&);
   // Print few lines of informations about the process: validity range,
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4GammaConversion::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Gamma::Gamma());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh

r819	r961
26	26	//
27	27	// $Id: G4InitXscPAI.hh,v 1.8 2006/06/29 19:50:22 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4IonFluctuations.hh,v 1.3 2007/09/27 13:53:11 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4IonFluctuations.hh,v 1.9 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //
 // 16-10-03 Changed interface to Initialisation (V.Ivanchenko)
+// 01-06-08 Added initialisation of effective charge prestep (V.Ivanchenko)
 //
 // Class Description:
 …
 #include "G4VEmFluctuationModel.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4UniversalFluctuation.hh"
 class G4IonFluctuations : public G4VEmFluctuationModel
 …
   virtual ~G4IonFluctuations();
+  // Sample fluctuations
   G4double SampleFluctuations(const G4Material*,
                               const G4DynamicParticle*,
                                     G4double&,
                                     G4double&,
                                     G4double&);
+                              G4double& tmax,
+                              G4double& length,
+                              G4double& meanLoss);
+  G4double Dispersion(    const G4Material*,
+                          const G4DynamicParticle*,
+                                G4double&,
+                                G4double&);
+  // Compute dispertion
+  G4double Dispersion(const G4Material*,
+                      const G4DynamicParticle*,
+                      G4double& tmax,
+                      G4double& length);
+  // Initialisation prerun
   void InitialiseMe(const G4ParticleDefinition*);
+  // Initialisation prestep
+  void SetParticleAndCharge(const G4ParticleDefinition*, G4double q2);
 private:
+  G4double CoeffitientA(G4double&);
+  G4double CoeffitientB(const G4Material*, G4double&);
+  G4double RelativisticFactor(const G4Material*, G4double&);
+  G4double Factor(const G4Material*, G4double Zeff);
+  G4double RelativisticFactor(const G4Material*, G4double Zeff);
   // hide assignment operator
 …
   G4IonFluctuations(const  G4IonFluctuations&);
+  G4UniversalFluctuation      uniFluct;
   const G4ParticleDefinition* particle;
 …
   G4double charge;
   G4double chargeSquare;
   G4double chargeSqRatio;
+  G4double effChargeSquare;
   // data members to speed up the fluctuation calculation
+  G4double parameter;
   G4double minNumberInteractionsBohr;
   G4double theBohrBeta2;

trunk/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh

r819	r961
25	25	//
26	26	// $Id: G4KleinNishinaCompton.hh,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MollerBhabhaModel.hh,v 1.19 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MollerBhabhaModel.hh,v 1.20 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeCrossSectionPerElectron(
 …
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                               G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
   void SetParticle(const G4ParticleDefinition* p);
+  inline void SetParticle(const G4ParticleDefinition* p);
   const G4ParticleDefinition* particle;
 …
   G4MollerBhabhaModel & operator=(const  G4MollerBhabhaModel &right);
   G4MollerBhabhaModel(const  G4MollerBhabhaModel&);
+  G4bool   isInitialised;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4MollerBhabhaModel::MaxSecondaryEnergy(
+                                                   const G4ParticleDefinition*,
+                                                         G4double kinEnergy)
+inline void G4MollerBhabhaModel::SetParticle(const G4ParticleDefinition* p)
+{
+  G4double tmax = kinEnergy;
+  if(isElectron) tmax *= 0.5;
+  return tmax;
+  particle = p;
+  if(p != theElectron) isElectron = false;
+}

trunk/source/processes/electromagnetic/standard/include/G4MscModel71.hh

r819	r961
25	25	//
26	26	// $Id: G4MscModel71.hh,v 1.5 2007/05/22 17:34:36 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MultipleScattering.hh,v 1.35 2007/05/18 18:43:32 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MultipleScattering.hh,v 1.36 2008/03/10 10:39:21 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 class G4UrbanMscModel;
+class G4VMscModel;
 class G4MultipleScattering : public G4VMultipleScattering
 …
 private:        // data members
   G4UrbanMscModel* mscUrban;
+  G4VMscModel* mscUrban;
   G4double lambdalimit;

trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MultipleScattering71.hh,v 1.5 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 //------------------------------------------------------------------------------
 //
 // $Id: G4MultipleScattering71.hh,v 1.5 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // class description
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4MultipleScattering71::GetContinuousStepLimit(
-                                          const G4Track& track,
-                                                G4double,
-                                                G4double currentMinimalStep,
-                                                G4double&)
+{
-  DefineMaterial(track.GetMaterialCutsCouple());
-  const G4MaterialCutsCouple* couple = CurrentMaterialCutsCouple();
-  G4double e = track.GetKineticEnergy();
-  model = dynamic_cast<G4MscModel71*>(SelectModel(e));
-  const G4ParticleDefinition* p = track.GetDefinition();
-  G4double lambda0 = GetLambda(p, e);
-  range =  G4LossTableManager::Instance()->GetRangeFromRestricteDEDX(p,e,couple);
-  if(range < currentMinimalStep) currentMinimalStep = range;
-  truePathLength = TruePathLengthLimit(track,lambda0,currentMinimalStep);
-  //  G4cout << "StepLimit: tpl= " << truePathLength << " lambda0= "
-  //       << lambda0 << " range= " << currentRange
-  //       << " currentMinStep= " << currentMinimalStep << G4endl;
-  if (truePathLength < currentMinimalStep) valueGPILSelectionMSC = CandidateForSelection;
-  geomPathLength = model->GeomPathLength(LambdaTable(),couple,
-           p,e,lambda0,range,truePathLength);
-  if(geomPathLength > lambda0) geomPathLength = lambda0;
-  return geomPathLength;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline G4VParticleChange* G4MultipleScattering71::AlongStepDoIt(
                                                         const G4Track&,

trunk/source/processes/electromagnetic/standard/include/G4PAIModel.hh

-              r819
+              r961
 // ********************************************************************
 //
+// $Id: G4PAIModel.hh,v 1.22 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   virtual void InitialiseMe(const G4ParticleDefinition*) {};
   virtual G4double ComputeDEDX(const G4MaterialCutsCouple*,
+  virtual void InitialiseMe(const G4ParticleDefinition*);
+  virtual G4double ComputeDEDXPerVolume(const G4Material*,
                                const G4ParticleDefinition*,
                                G4double kineticEnergy,
                                G4double cutEnergy);
   virtual G4double CrossSection(const G4MaterialCutsCouple*,
+  virtual G4double CrossSectionPerVolume(const G4Material*,
                                 const G4ParticleDefinition*,
                                 G4double kineticEnergy,
 …
   void SetVerboseLevel(G4int verbose){fVerbose=verbose;};
 protected:
 …
 };
-/////////////////////////////////////////////////////////////////////
-inline G4double G4PAIModel::MaxSecondaryEnergy( const G4ParticleDefinition* p,
-                                                      G4double kinEnergy)
+{
-  G4double tmax = kinEnergy;
-  if(p == fElectron) tmax *= 0.5;
-  else if(p != fPositron) {
-    G4double mass = p->GetPDGMass();
-    G4double ratio= electron_mass_c2/mass;
-    G4double gamma= kinEnergy/mass + 1.0;
-    tmax = 2.0*electron_mass_c2*(gamma*gamma - 1.) /
-                  (1. + 2.0*gamma*ratio + ratio*ratio);
+  }
-  return tmax;
+}
-///////////////////////////////////////////////////////////////
-inline  void G4PAIModel::DefineForRegion(const G4Region* r)
+{
-  fPAIRegionVector.push_back(r);
+}
 #endif

trunk/source/processes/electromagnetic/standard/include/G4PAIPhotonModel.hh

-              r819
+              r961
 // ********************************************************************
 //
+// $Id: G4PAIPhotonModel.hh,v 1.12 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 public:
   G4PAIPhotonModel(const G4ParticleDefinition* p = 0, const G4String& nam = "PAI");
+  G4PAIPhotonModel(const G4ParticleDefinition* p = 0, const G4String& nam = "PAIPhoton");
   virtual ~G4PAIPhotonModel();
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   virtual void InitialiseMe(const G4ParticleDefinition*) {};
   virtual G4double ComputeDEDX(const G4MaterialCutsCouple*,
                                const G4ParticleDefinition*,
                                G4double kineticEnergy,
                                G4double cutEnergy);
   virtual G4double CrossSection(const G4MaterialCutsCouple*,
                                 const G4ParticleDefinition*,
                                 G4double kineticEnergy,
                                 G4double cutEnergy,
                                 G4double maxEnergy);
+  virtual void InitialiseMe(const G4ParticleDefinition*);
+  virtual G4double ComputeDEDXPerVolume(const G4Material*,
+                                        const G4ParticleDefinition*,
+                                        G4double kineticEnergy,
+                                        G4double cutEnergy);
+  virtual G4double CrossSectionPerVolume(const G4Material*,
+                                         const G4ParticleDefinition*,
+                                         G4double kineticEnergy,
+                                         G4double cutEnergy,
+                                         G4double maxEnergy);
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
 …
                              G4double position, G4int iTransfer );
 protected:
   G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                                     G4double kinEnergy);
+                              G4double kinEnergy);
 private:
 …
   G4int                fVerbose;
   G4PhysicsLogVector*  fProtonEnergyVector ;
   // vectors
 …
 };
-/////////////////////////////////////////////////////////////////////
-inline G4double G4PAIPhotonModel::MaxSecondaryEnergy( const G4ParticleDefinition* p,
-                                                      G4double kinEnergy)
+{
-  G4double tmax = kinEnergy;
-  if(p == fElectron) tmax *= 0.5;
-  else if(p != fPositron) {
-    G4double mass = p->GetPDGMass();
-    G4double ratio= electron_mass_c2/mass;
-    G4double gamma= kinEnergy/mass + 1.0;
-    tmax = 2.0*electron_mass_c2*(gamma*gamma - 1.) /
-                  (1. + 2.0*gamma*ratio + ratio*ratio);
+  }
-  return tmax;
+}
-///////////////////////////////////////////////////////////////
-inline  void G4PAIPhotonModel::DefineForRegion(const G4Region* r)
+{
-  fPAIRegionVector.push_back(r);
+}
 #endif

trunk/source/processes/electromagnetic/standard/include/G4PAIxSection.hh

-              r819
+              r961
 //
 //
 // $Id: G4PAIxSection.hh,v 1.12 2006/06/29 19:50:44 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PAIxSection.hh,v 1.15 2008/05/30 16:04:40 grichine Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   G4PAIxSection( G4int materialIndex,
                          G4double maxEnergyTransfer   ) ;
+                         G4double maxEnergyTransfer   );
   G4PAIxSection( G4int materialIndex,           // for proton loss table
                          G4double maxEnergyTransfer,
                          G4double betaGammaSq ,
                          G4double** photoAbsCof, G4int intNumber         ) ;
+                         G4double** photoAbsCof, G4int intNumber         );
   G4PAIxSection( G4int materialIndex,           // test constructor
                          G4double maxEnergyTransfer,
                          G4double betaGammaSq          ) ;
           // G4PAIxSection(const G4PAIxSection& right) ;
+                         G4double betaGammaSq          );
+          // G4PAIxSection(const G4PAIxSection& right);
           // Destructor
           ~G4PAIxSection() ;
+          ~G4PAIxSection();
           // Operators
           // G4PAIxSection& operator=(const G4PAIxSection& right) ;
           // G4int operator==(const G4PAIxSection& right)const ;
           // G4int operator!=(const G4PAIxSection& right)const ;
+          // G4PAIxSection& operator=(const G4PAIxSection& right);
+          // G4int operator==(const G4PAIxSection& right)const;
+          // G4int operator!=(const G4PAIxSection& right)const;
           // Methods
 …
           // General control functions
           void InitPAI() ;
           void NormShift( G4double betaGammaSq ) ;
           void SplainPAI( G4double betaGammaSq ) ;
+          void InitPAI();
+          void NormShift( G4double betaGammaSq );
+          void SplainPAI( G4double betaGammaSq );
           // Physical methods
 …
           G4double RutherfordIntegral( G4int intervalNumber,
                                        G4double limitLow,
                                        G4double limitHigh     ) ;
+                                       G4double limitHigh     );
           G4double ImPartDielectricConst( G4int intervalNumber,
+                                          G4double energy        ) ;
+          G4double RePartDielectricConst(G4double energy) ;
+                                          G4double energy        );
+          G4double GetPhotonRange( G4double energy );
+          G4double GetElectronRange( G4double energy );
+          G4double RePartDielectricConst(G4double energy);
           G4double DifPAIxSection( G4int intervalNumber,
                                    G4double betaGammaSq    ) ;
+                                   G4double betaGammaSq    );
           G4double PAIdNdxCerenkov( G4int intervalNumber,
+                                   G4double betaGammaSq    ) ;
+                                   G4double betaGammaSq    );
+          G4double PAIdNdxMM( G4int intervalNumber,
+                                   G4double betaGammaSq    );
           G4double PAIdNdxPlasmon( G4int intervalNumber,
+                                   G4double betaGammaSq    ) ;
+          void     IntegralPAIxSection() ;
+          void     IntegralCerenkov() ;
+          void     IntegralPlasmon() ;
+          G4double SumOverInterval(G4int intervalNumber) ;
+          G4double SumOverIntervaldEdx(G4int intervalNumber) ;
+          G4double SumOverInterCerenkov(G4int intervalNumber) ;
+          G4double SumOverInterPlasmon(G4int intervalNumber) ;
+                                   G4double betaGammaSq    );
+          G4double PAIdNdxResonance( G4int intervalNumber,
+                                   G4double betaGammaSq    );
+          void     IntegralPAIxSection();
+          void     IntegralCerenkov();
+          void     IntegralMM();
+          void     IntegralPlasmon();
+          void     IntegralResonance();
+          G4double SumOverInterval(G4int intervalNumber);
+          G4double SumOverIntervaldEdx(G4int intervalNumber);
+          G4double SumOverInterCerenkov(G4int intervalNumber);
+          G4double SumOverInterMM(G4int intervalNumber);
+          G4double SumOverInterPlasmon(G4int intervalNumber);
+          G4double SumOverInterResonance(G4int intervalNumber);
           G4double SumOverBorder( G4int intervalNumber,
                                   G4double energy          ) ;
+                                  G4double energy          );
           G4double SumOverBorderdEdx( G4int intervalNumber,
                                   G4double energy          ) ;
+                                  G4double energy          );
           G4double SumOverBordCerenkov( G4int intervalNumber,
+                                        G4double energy          ) ;
+                                        G4double energy          );
+          G4double SumOverBordMM( G4int intervalNumber,
+                                        G4double energy          );
           G4double SumOverBordPlasmon( G4int intervalNumber,
+                                       G4double energy          ) ;
+          G4double GetStepEnergyLoss( G4double step ) ;
+          G4double GetStepCerenkovLoss( G4double step ) ;
+          G4double GetStepPlasmonLoss( G4double step ) ;
+                                       G4double energy          );
+          G4double SumOverBordResonance( G4int intervalNumber,
+                                       G4double energy          );
+          G4double GetStepEnergyLoss( G4double step );
+          G4double GetStepCerenkovLoss( G4double step );
+          G4double GetStepMMLoss( G4double step );
+          G4double GetStepPlasmonLoss( G4double step );
+          G4double GetStepResonanceLoss( G4double step );
+          G4double GetEnergyTransfer();
+          G4double GetCerenkovEnergyTransfer();
+          G4double GetMMEnergyTransfer();
+          G4double GetPlasmonEnergyTransfer();
+          G4double GetResonanceEnergyTransfer();
+          G4double GetRutherfordEnergyTransfer();
           // Inline access functions
+          G4int GetNumberOfGammas() const { return fNumberOfGammas ; }
+          G4int GetSplineSize() const { return fSplineNumber ; }
+          G4int GetIntervalNumber() const { return fIntervalNumber ; }
+          G4double GetEnergyInterval(G4int i){ return fEnergyInterval[i] ; }
+          G4double GetDifPAIxSection(G4int i){ return fDifPAIxSection[i] ; }
+          G4double GetPAIdNdxCrenkov(G4int i){ return fdNdxCerenkov[i] ; }
+          G4double GetPAIdNdxPlasmon(G4int i){ return fdNdxPlasmon[i] ; }
+          G4double GetMeanEnergyLoss() const {return fIntegralPAIxSection[0] ; }
+          G4double GetMeanCerenkovLoss() const {return fIntegralCerenkov[0] ; }
+          G4double GetMeanPlasmonLoss() const {return fIntegralPlasmon[0] ; }
+          G4double GetNormalizationCof() const { return fNormalizationCof ; }
+          G4int GetNumberOfGammas() const { return fNumberOfGammas; }
+          G4int GetSplineSize() const { return fSplineNumber; }
+          G4int GetIntervalNumber() const { return fIntervalNumber; }
+          G4double GetEnergyInterval(G4int i){ return fEnergyInterval[i]; }
+          G4double GetDifPAIxSection(G4int i){ return fDifPAIxSection[i]; }
+          G4double GetPAIdNdxCerenkov(G4int i){ return fdNdxCerenkov[i]; }
+          G4double GetPAIdNdxMM(G4int i){ return fdNdxMM[i]; }
+          G4double GetPAIdNdxPlasmon(G4int i){ return fdNdxPlasmon[i]; }
+          G4double GetPAIdNdxResonance(G4int i){ return fdNdxResonance[i]; }
+          G4double GetMeanEnergyLoss() const {return fIntegralPAIxSection[0]; }
+          G4double GetMeanCerenkovLoss() const {return fIntegralCerenkov[0]; }
+          G4double GetMeanMMLoss() const {return fIntegralMM[0]; }
+          G4double GetMeanPlasmonLoss() const {return fIntegralPlasmon[0]; }
+          G4double GetMeanResonanceLoss() const {return fIntegralResonance[0]; }
+          G4double GetNormalizationCof() const { return fNormalizationCof; }
           inline G4double GetPAItable(G4int i,G4int j) const ;
           inline G4double    GetLorentzFactor(G4int i) const ;
+          inline G4double GetPAItable(G4int i,G4int j) const;
+          inline G4double GetLorentzFactor(G4int i) const;
+          inline G4double GetSplineEnergy(G4int i) const ;
+          inline G4double GetIntegralPAIxSection(G4int i) const ;
+          inline G4double GetIntegralPAIdEdx(G4int i) const ;
+          inline G4double GetIntegralCerenkov(G4int i) const ;
+          inline G4double GetIntegralPlasmon(G4int i) const ;
+          inline G4double GetSplineEnergy(G4int i) const;
+          inline G4double GetIntegralPAIxSection(G4int i) const;
+          inline G4double GetIntegralPAIdEdx(G4int i) const;
+          inline G4double GetIntegralCerenkov(G4int i) const;
+          inline G4double GetIntegralMM(G4int i) const;
+          inline G4double GetIntegralPlasmon(G4int i) const;
+          inline G4double GetIntegralResonance(G4int i) const;
 protected :
 …
 // Local class constants
 static const G4double fDelta ; // energy shift from interval border = 0.001
 static const G4double fError ; // error in lin-log approximation = 0.005
 static       G4int fNumberOfGammas ;         // = 111 ;
 static const G4double fLorentzFactor[112] ;  //  static gamma array
+static const G4double fDelta; // energy shift from interval border = 0.001
+static const G4double fError; // error in lin-log approximation = 0.005
+static       G4int fNumberOfGammas;         // = 111;
+static const G4double fLorentzFactor[112];  //  static gamma array
 static
+const G4int fRefGammaNumber  ; // The number of gamma for creation of spline (15)
+G4int    fIntervalNumber  ;    //  The number of energy intervals
+G4double fNormalizationCof ;   // Normalization cof for PhotoAbsorptionXsection
+// G4double fBetaGammaSq ;        // (beta*gamma)^2
+G4double fDensity ;            // Current density
+G4double fElectronDensity ;    // Current electron (number) density
+G4int    fSplineNumber ;       // Current size of spline
+const G4int fRefGammaNumber ; // The number of gamma for creation of spline (15)
+G4int    fIntervalNumber ;    //  The number of energy intervals
+G4double fNormalizationCof;   // Normalization cof for PhotoAbsorptionXsection
+// G4double fBetaGammaSq;        // (beta*gamma)^2
+  G4int fMaterialIndex;  // current material index
+  G4double fDensity;            // Current density
+  G4double fElectronDensity;    // Current electron (number) density
+  G4int    fSplineNumber;       // Current size of spline
 // Arrays of Sandia coefficients
 …
   G4SandiaTable*  fSandia;
 G4double* fEnergyInterval ;
 G4double* fA1 ;
 G4double* fA2 ;
 G4double* fA3 ;
 G4double* fA4 ;
+G4double* fEnergyInterval;
+G4double* fA1;
+G4double* fA2;
+G4double* fA3;
+G4double* fA4;
 static
 const G4int   fMaxSplineSize  ;          // Max size of output splain arrays = 500
+const G4int   fMaxSplineSize ;          // Max size of output splain arrays = 500
 /* ******************
 G4double*          fSplineEnergy ;   // energy points of splain
 G4double* fRePartDielectricConst ;   // Real part of dielectric const
 G4double* fImPartDielectricConst ;   // Imaginary part of dielectric const
 G4double*          fIntegralTerm ;   // Integral term in PAI cross section
 G4double*        fDifPAIxSection ;   // Differential PAI cross section
 G4double*   fIntegralPAIxSection ;   // Integral PAI cross section  ?
+G4double*          fSplineEnergy;   // energy points of splain
+G4double* fRePartDielectricConst;   // Real part of dielectric const
+G4double* fImPartDielectricConst;   // Imaginary part of dielectric const
+G4double*          fIntegralTerm;   // Integral term in PAI cross section
+G4double*        fDifPAIxSection;   // Differential PAI cross section
+G4double*   fIntegralPAIxSection;   // Integral PAI cross section  ?
 */ ///////////////
+G4double          fSplineEnergy[500] ;   // energy points of splain
+G4double fRePartDielectricConst[500] ;   // Real part of dielectric const
+G4double fImPartDielectricConst[500] ;   // Imaginary part of dielectric const
+G4double          fIntegralTerm[500] ;   // Integral term in PAI cross section
+G4double        fDifPAIxSection[500] ;   // Differential PAI cross section
+G4double          fdNdxCerenkov[500] ;   // dNdx of Cerenkov collisions
+G4double          fdNdxPlasmon[500] ;   // dNdx of Plasmon collisions
+G4double   fIntegralPAIxSection[500] ;   // Integral PAI cross section  ?
+G4double   fIntegralPAIdEdx[500] ;   // Integral PAI dEdx  ?
+G4double   fIntegralCerenkov[500] ;   // Integral Cerenkov N>omega  ?
+G4double   fIntegralPlasmon[500] ;   // Integral Plasmon N>omega  ?
+G4double fPAItable[500][112] ; // Output array
+} ;
+G4double          fSplineEnergy[500];   // energy points of splain
+G4double fRePartDielectricConst[500];   // Real part of dielectric const
+G4double fImPartDielectricConst[500];   // Imaginary part of dielectric const
+G4double          fIntegralTerm[500];   // Integral term in PAI cross section
+G4double        fDifPAIxSection[500];   // Differential PAI cross section
+G4double          fdNdxCerenkov[500];   // dNdx of Cerenkov collisions
+G4double          fdNdxMM[500];   // dNdx of MM-Cerenkov collisions
+G4double          fdNdxPlasmon[500];   // dNdx of Plasmon collisions
+G4double          fdNdxResonance[500];   // dNdx of resonance collisions
+G4double   fIntegralPAIxSection[500];   // Integral PAI cross section  ?
+G4double   fIntegralPAIdEdx[500];   // Integral PAI dEdx  ?
+G4double   fIntegralCerenkov[500];   // Integral Cerenkov N>omega  ?
+G4double   fIntegralMM[500];   // Integral MM-Cerenkov N>omega  ?
+G4double   fIntegralPlasmon[500];   // Integral Plasmon N>omega  ?
+G4double   fIntegralResonance[500];   // Integral resonance N>omega  ?
+G4double fPAItable[500][112]; // Output array
+};
 ////////////////  Inline methods //////////////////////////////////
 …
 inline G4double G4PAIxSection::GetPAItable(G4int i, G4int j) const
+{
    return fPAItable[i][j] ;
+   return fPAItable[i][j];
+}
 inline G4double G4PAIxSection::GetLorentzFactor(G4int j) const
+{
    return fLorentzFactor[j] ;
+   return fLorentzFactor[j];
+}
 …
       G4Exception("Invalid argument in G4PAIxSection::GetSplineEnergy");
+   }
    return fSplineEnergy[i] ;
+   return fSplineEnergy[i];
+}
 …
     G4Exception("Invalid argument in G4PAIxSection::GetIntegralPAIxSection");
+   }
    return fIntegralPAIxSection[i] ;
+   return fIntegralPAIxSection[i];
+}
 …
     G4Exception("Invalid argument in G4PAIxSection::GetIntegralPAIxSection");
+   }
    return fIntegralPAIdEdx[i] ;
+   return fIntegralPAIdEdx[i];
+}
 …
     G4Exception("Invalid argument in G4PAIxSection::GetIntegralCerenkov");
+   }
+   return fIntegralCerenkov[i] ;
+   return fIntegralCerenkov[i];
+}
+inline G4double G4PAIxSection::GetIntegralMM(G4int i) const
+{
+   if(i < 1 || i > fSplineNumber)
+   {
+    G4Exception("Invalid argument in G4PAIxSection::GetIntegralMM");
+   }
+   return fIntegralMM[i];
+}
 …
     G4Exception("Invalid argument in G4PAIxSection::GetIntegralPlasmon");
+   }
+   return fIntegralPlasmon[i] ;
+   return fIntegralPlasmon[i];
+}
+inline G4double G4PAIxSection::GetIntegralResonance(G4int i) const
+{
+   if(i < 1 || i > fSplineNumber)
+   {
+    G4Exception("Invalid argument in G4PAIxSection::GetIntegralResonance");
+   }
+   return fIntegralResonance[i];
+}

trunk/source/processes/electromagnetic/standard/include/G4PAIySection.hh

r819	r961
26	26	//
27	27	// $Id: G4PAIySection.hh,v 1.1 2007/10/01 17:45:14 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PEEffectModel.hh,v 1.6 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PEEffectModel.hh,v 1.7 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //
 // 06.02.2006 : added ComputeMeanFreePath()  (mma)
+// 20.02.2009 : move virtual inline to .cc, substitute
+//              ComputeMeanFreePath() by CrossSectionPerVolume (VI)
 //
 // Class Description:
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
                                       G4double kinEnergy,
                                       G4double Z,
                                       G4double A,
                                       G4double, G4double);
+  virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                              G4double kinEnergy,
+                                              G4double Z,
+                                              G4double A,
+                                              G4double, G4double);
+  G4double ComputeMeanFreePath( const G4ParticleDefinition*,
+                                      G4double kinEnergy,
+                                const G4Material* material,
+                                      G4double, G4double);
+  virtual G4double CrossSectionPerVolume(const G4Material*,
+                                         const G4ParticleDefinition*,
+                                         G4double kineticEnergy,
+                                         G4double cutEnergy,
+                                         G4double maxEnergy);
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-inline G4double G4PEEffectModel::ComputeCrossSectionPerAtom(
-                                       const G4ParticleDefinition*,
-                                             G4double energy,
-                                             G4double Z, G4double,
-                                             G4double, G4double)
+{
- G4double* SandiaCof = G4SandiaTable::GetSandiaCofPerAtom((G4int)Z, energy);
- G4double energy2 = energy*energy, energy3 = energy*energy2,
-          energy4 = energy2*energy2;
- return SandiaCof[0]/energy  + SandiaCof[1]/energy2 +
-        SandiaCof[2]/energy3 + SandiaCof[3]/energy4;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4PEEffectModel::ComputeMeanFreePath(
-                                       const G4ParticleDefinition*,
-                                             G4double energy,
-                                       const G4Material* material,
-                                             G4double, G4double)
+{
- G4double* SandiaCof = material->GetSandiaTable()
-                                ->GetSandiaCofForMaterial(energy);
- G4double energy2 = energy*energy, energy3 = energy*energy2,
-          energy4 = energy2*energy2;
- G4double cross = SandiaCof[0]/energy  + SandiaCof[1]/energy2 +
-                  SandiaCof[2]/energy3 + SandiaCof[3]/energy4;
- G4double mfp = DBL_MAX;
- if (cross > 0.) mfp = 1./cross;
- return mfp;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PSTARStopping.hh,v 1.4 2006/06/29 19:50:48 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PSTARStopping.hh,v 1.5 2008/11/13 12:04:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4PSTARStopping_h
 …
   G4double currentE, res;
   G4double e[74][60], kinE[60];
-  G4int Znum[74];
 };

trunk/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh

-              r819
+              r961
 //
 //
 // $Id: G4PhotoElectricEffect.hh,v 1.24 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PhotoElectricEffect.hh,v 1.25 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   // true for Gamma only.
   G4bool IsApplicable(const G4ParticleDefinition&);
+  virtual G4bool IsApplicable(const G4ParticleDefinition&);
   // Print few lines of informations about the process: validity range,
   void PrintInfo();
+  virtual void PrintInfo();
 protected:
   void InitialiseProcess(const G4ParticleDefinition*);
+  virtual void InitialiseProcess(const G4ParticleDefinition*);
 private:
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4bool G4PhotoElectricEffect::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Gamma::Gamma());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh

r819	r961
26	26	//
27	27	// $Id: G4PolarizedComptonScattering.hh,v 1.9 2006/06/29 19:51:14 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// --------- G4PolarizedComptonScattering physics process ----------------------

trunk/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UniversalFluctuation.hh,v 1.5 2007/04/03 11:08:36 urban Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4UniversalFluctuation.hh,v 1.8 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4VEmFluctuationModel.hh"
+#include "G4ParticleDefinition.hh"
 class G4UniversalFluctuation : public G4VEmFluctuationModel
 …
   virtual ~G4UniversalFluctuation();
   G4double SampleFluctuations(const G4Material*,
                           const G4DynamicParticle*,
                                 G4double&,
                                 G4double&,
                                 G4double&);
+  virtual G4double SampleFluctuations(const G4Material*,
+                                      const G4DynamicParticle*,
+                                      G4double&,
+                                      G4double&,
+                                      G4double&);
   G4double Dispersion(    const G4Material*,
                           const G4DynamicParticle*,
                                 G4double&,
                                 G4double&);
+  virtual G4double Dispersion(    const G4Material*,
+                                  const G4DynamicParticle*,
+                                  G4double&,
+                                  G4double&);
+  void InitialiseMe(const G4ParticleDefinition*);
+  // Initialisation before the run
+  virtual void InitialiseMe(const G4ParticleDefinition*);
+protected:
+  // Initialisation prestep
+  virtual void SetParticleAndCharge(const G4ParticleDefinition*, G4double q2);
 private:

trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UrbanMscModel.hh,v 1.31 2007/10/29 08:42:43 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UrbanMscModel.hh,v 1.33 2008/03/10 10:39:21 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #include "G4VEmModel.hh"
+#include "G4VMscModel.hh"
 #include "G4PhysicsTable.hh"
 #include "G4MscStepLimitType.hh"
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 class G4UrbanMscModel : public G4VEmModel
+class G4UrbanMscModel : public G4VMscModel
+{
 public:
+  G4UrbanMscModel(G4double facrange, G4double dtrl, G4double lambdalimit,
+                  G4double facgeom,G4double skin,
+                  G4bool samplez, G4MscStepLimitType stepAlg,
+                  const G4String& nam = "UrbanMscUni");
+  G4UrbanMscModel(const G4String& nam = "UrbanMscUni");
   virtual ~G4UrbanMscModel();
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition* particle,
                                       G4double KineticEnergy,
 …
                          G4double KineticEnergy);
-  void SetStepLimitType(G4MscStepLimitType);
-  void SetLateralDisplasmentFlag(G4bool val);
-  void SetRangeFactor(G4double);
-  void SetGeomFactor(G4double);
-  void SetSkin(G4double);
 private:
 …
   G4double LatCorrelation();
-  G4double GetLambda(G4double kinEnergy);
   void GeomLimit(const G4Track& track);
+  void SetParticle(const G4ParticleDefinition* p);
+  inline G4double GetLambda(G4double kinEnergy);
+  inline void SetParticle(const G4ParticleDefinition*);
   //  hide assignment operator
 …
   G4LossTableManager*         theManager;
   G4double mass;
   G4double charge;
 …
   G4double taulim;
   G4double currentTau;
-  G4double dtrl;
-  G4double lambdalimit;
-  G4double facrange;
   G4double frscaling1,frscaling2;
   G4double tlimit;
 …
   G4double geommin;
   G4double geomlimit;
-  G4double facgeom;
-  G4double skin;
   G4double skindepth;
   G4double smallstep;
   G4double presafety;
-  G4double facsafety;
   G4double lambda0;
 …
   G4double tPathLength;
   G4double zPathLength;
   G4double par1,par2,par3 ;
   G4double stepmin ;
+  G4double par1,par2,par3;
+  G4double stepmin;
   G4double currentKinEnergy;
 …
   G4int    currentMaterialIndex;
-  G4MscStepLimitType steppingAlgorithm;
-  G4bool   samplez;
-  G4bool   latDisplasment;
   G4bool   isInitialized;
   G4bool   inside;
   G4bool   insideskin;
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel::SetLateralDisplasmentFlag(G4bool val)
+{
-  latDisplasment = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel::SetSkin(G4double val)
+{
-  skin = val;
-  stepmin       = tlimitminfix;
-  skindepth     = skin*stepmin;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel::SetRangeFactor(G4double val)
+{
-  facrange = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel::SetGeomFactor(G4double val)
+{
-  facgeom = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel::SetStepLimitType(G4MscStepLimitType val)
+{
-  steppingAlgorithm = val;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel90.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UrbanMscModel90.hh,v 1.1 2007/12/07 17:35:52 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UrbanMscModel90.hh,v 1.4 2008/10/29 14:15:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #include "G4VEmModel.hh"
+#include "G4VMscModel.hh"
 #include "G4PhysicsTable.hh"
 #include "G4MscStepLimitType.hh"
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 class G4UrbanMscModel90 : public G4VEmModel
+class G4UrbanMscModel90 : public G4VMscModel
+{
 public:
+  G4UrbanMscModel90(G4double facrange, G4double dtrl, G4double lambdalimit,
+                  G4double facgeom,G4double skin,
+                  G4bool samplez, G4MscStepLimitType stepAlg,
+                  const G4String& nam = "UrbanMscUni");
+  G4UrbanMscModel90(const G4String& nam = "UrbanMscUni90");
   virtual ~G4UrbanMscModel90();
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition* particle,
 …
                          G4double KineticEnergy);
-  void SetStepLimitType(G4MscStepLimitType);
-  void SetLateralDisplasmentFlag(G4bool val);
-  void SetRangeFactor(G4double);
-  void SetGeomFactor(G4double);
-  void SetSkin(G4double);
 private:
 …
   G4double LatCorrelation();
-  G4double GetLambda(G4double kinEnergy);
   void GeomLimit(const G4Track& track);
+  void SetParticle(const G4ParticleDefinition* p);
+  inline G4double GetLambda(G4double kinEnergy);
+  inline void SetParticle(const G4ParticleDefinition*);
   //  hide assignment operator
 …
   G4LossTableManager*         theManager;
   G4double mass;
   G4double charge;
 …
   G4double taulim;
   G4double currentTau;
-  G4double dtrl;
-  G4double lambdalimit;
-  G4double facrange;
   G4double frscaling1,frscaling2;
   G4double tlimit;
 …
   G4double geommin;
   G4double geomlimit;
-  G4double facgeom;
-  G4double skin;
   G4double skindepth;
   G4double smallstep;
   G4double presafety;
-  G4double facsafety;
   G4double lambda0;
 …
   G4double tPathLength;
   G4double zPathLength;
   G4double par1,par2,par3 ;
   G4double stepmin ;
+  G4double par1,par2,par3;
+  G4double stepmin;
   G4double currentKinEnergy;
 …
   G4int    currentMaterialIndex;
-  G4MscStepLimitType steppingAlgorithm;
-  G4bool   samplez;
-  G4bool   latDisplasment;
   G4bool   isInitialized;
   G4bool   inside;
   G4bool   insideskin;
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel90::SetLateralDisplasmentFlag(G4bool val)
+{
-  latDisplasment = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel90::SetSkin(G4double val)
+{
-  skin = val;
-  stepmin       = tlimitminfix;
-  skindepth     = skin*stepmin;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel90::SetRangeFactor(G4double val)
+{
-  facrange = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel90::SetGeomFactor(G4double val)
+{
-  facgeom = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline
-void G4UrbanMscModel90::SetStepLimitType(G4MscStepLimitType val)
+{
-  steppingAlgorithm = val;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4WaterStopping.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4WaterStopping.hh,v 1.2 2006/06/29 19:51:56 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4WaterStopping.hh,v 1.6 2008/09/09 09:30:58 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 #ifndef G4WaterStopping_h
 …
 public:
   G4WaterStopping(G4EmCorrections* corr = 0);
+  G4WaterStopping(G4EmCorrections* corr = 0, G4bool splineFlag = true);
   ~G4WaterStopping();
 …
   void Initialise(G4EmCorrections*);
+  void AddData(G4double* energy, G4double* stoppower, G4double factor);
   // hide assignment operator
   G4WaterStopping & operator=(const  G4WaterStopping &right);
   G4WaterStopping(const  G4WaterStopping&);
+  G4int    Z[8];
+  G4int    A[8];
+  G4bool   spline;
+  G4int    Z[16];
+  G4double A[16];
   std::vector<G4LPhysicsFreeVector*>  dedx;
 };

trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlung.hh,v 1.36 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eBremsstrahlung.hh,v 1.37 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4eBremsstrahlung();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   // Print out of the class parameters
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4eBremsstrahlung::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Electron::Electron() || &p == G4Positron::Positron());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlungModel.hh,v 1.22 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eBremsstrahlungModel.hh,v 1.26 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   G4eBremsstrahlungModel(const G4ParticleDefinition* p = 0,
                          const G4String& nam = "StandBrem");
+                         const G4String& nam = "eBrem");
   virtual ~G4eBremsstrahlungModel();
 …
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
   G4double MinEnergyCut(const G4ParticleDefinition*,
                         const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
   virtual G4double ComputeDEDXPerVolume(const G4Material*,
 …
                                  G4double maxEnergy);
-  inline void SetLPMflag(G4bool val);
-  inline G4bool LPMflag() const;
-  inline void SetEnergyThreshold(G4double val);
-  inline G4double EnergyThreshold() const;
 protected:
-  inline G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                     G4double kineticEnergy);
   const G4Element* SelectRandomAtom(const G4MaterialCutsCouple* couple);
 …
   G4double MigdalConstant;
   G4double LPMconstant;
-  G4double highEnergyTh;
-  G4bool   theLPMflag;
   G4bool   isInitialised;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4double G4eBremsstrahlungModel::MaxSecondaryEnergy(
-                                 const G4ParticleDefinition*,
-                                       G4double kineticEnergy)
+{
-  return kineticEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-void G4eBremsstrahlungModel::SetLPMflag(G4bool val)
+{
-  theLPMflag = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4bool G4eBremsstrahlungModel::LPMflag() const
+{
-  return theLPMflag;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-void G4eBremsstrahlungModel::SetEnergyThreshold(G4double val)
+{
-  highEnergyTh = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4double G4eBremsstrahlungModel::EnergyThreshold() const
+{
-  return highEnergyTh;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eCoulombScatteringModel.hh,v 1.20 2007/10/24 10:42:05 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eCoulombScatteringModel.hh,v 1.36 2008/08/04 08:49:09 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //                       make some members protected
 // 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
+// 09.06.08 V.Ivanchenko add SelectIsotope and sampling of the recoil ion
 //
 // Class Description:
 …
 public:
+  G4eCoulombScatteringModel(G4double thetaMin = 0.0, G4double thetaMax = pi,
+                           G4bool build = false, G4double tlim = TeV*TeV,
+                           const G4String& nam = "eCoulombScattering");
+  G4eCoulombScatteringModel(const G4String& nam = "eCoulombScattering");
   virtual ~G4eCoulombScatteringModel();
 …
                                  G4double maxEnergy);
+  inline void SetRecoilThreshold(G4double eth);
 protected:
+  G4double ComputeElectronXSectionPerAtom(
+                                 const G4ParticleDefinition*,
+                                 G4double kinEnergy,
+                                 G4double Z,
+                                 G4double A,
+                                 G4double cut);
+  virtual G4double CalculateCrossSectionPerAtom(
+                                 const G4ParticleDefinition*,
+                                 G4double kinEnergy,
+                                 G4double Z, G4double A);
+  G4double CrossSectionPerAtom();
+  G4double SampleCosineTheta();
+  inline void DefineMaterial(const G4MaterialCutsCouple*);
   inline void SetupParticle(const G4ParticleDefinition*);
   inline void SetupKinematic(G4double kinEnergy);
+  inline void SetupKinematic(G4double kinEnergy, G4double cut);
   inline void SetupTarget(G4double Z, G4double A, G4double kinEnergy);
+  inline void SetupTarget(G4double Z, G4double kinEnergy);
 private:
+  void ComputeMaxElectronScattering(G4double cut);
   // hide assignment operator
 …
 protected:
   const G4ParticleDefinition* theProton;
   const G4ParticleDefinition* theElectron;
   const G4ParticleDefinition* thePositron;
+  G4ParticleTable*          theParticleTable;
   G4ParticleChangeForGamma* fParticleChange;
   G4NistManager*            fNistManager;
+  const G4DataVector*       currentCuts;
+  const G4MaterialCutsCouple* currentCouple;
+  const G4Material*           currentMaterial;
+  const G4Element*            currentElement;
+  G4int                       currentMaterialIndex;
   G4double                  coeff;
 …
   G4double                  cosThetaMin;
   G4double                  cosThetaMax;
+  G4double                  cosTetMinNuc;
   G4double                  cosTetMaxNuc;
+  G4double                  cosTetMaxNuc2;
   G4double                  cosTetMaxElec;
+  G4double                  cosTetMaxElec2;
   G4double                  q2Limit;
+  G4double                  recoilThreshold;
   G4double                  elecXSection;
   G4double                  nucXSection;
 …
   G4double                  mom2;
   G4double                  invbeta2;
+  G4double                  etag;
+  G4double                  lowEnergyLimit;
   // target
   G4double                  targetZ;
-  G4double                  targetA;
   G4double                  screenZ;
   G4double                  formfactA;
+  G4int                     idxelm;
 private:
-  G4PhysicsTable*           theCrossSectionTable;
   G4double                  a0;
-  G4double                  lowKEnergy;
-  G4double                  highKEnergy;
   G4double                  alpha2;
   G4double                  faclim;
+  G4int                     nbins;
+  G4int                     nmax;
+  G4int                     index[100];
+  G4bool                    buildTable;
+  G4double                  FF[100];
   G4bool                    isInitialised;
 };
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+void G4eCoulombScatteringModel::DefineMaterial(const G4MaterialCutsCouple* cup)
+{
+  if(cup != currentCouple) {
+    currentCouple = cup;
+    currentMaterial = cup->GetMaterial();
+    currentMaterialIndex = currentCouple->GetIndex();
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     chargeSquare = q*q;
     tkin = 0.0;
+    lowEnergyLimit = keV*mass/electron_mass_c2;
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4eCoulombScatteringModel::SetupKinematic(G4double ekin)
+{
+  if(ekin != tkin) {
+    tkin  = ekin;
+    mom2  = tkin*(tkin + 2.0*mass);
+inline void G4eCoulombScatteringModel::SetupKinematic(G4double ekin,
+                                                      G4double cut)
+{
+  if(ekin != tkin || ecut != cut) {
+    tkin = ekin;
+    mom2 = tkin*(tkin + 2.0*mass);
     invbeta2 = 1.0 +  mass*mass/mom2;
+  }
+    cosTetMinNuc = cosThetaMin;
+    cosTetMaxNuc = cosThetaMax;
+    if(ekin <= 10.*cut && mass < MeV && cosThetaMin < 1.0) {
+      cosTetMinNuc = ekin*(cosThetaMin + 1.0)/(10.*cut) - 1.0;
+    }
+    ComputeMaxElectronScattering(cut);
+  }
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline void G4eCoulombScatteringModel::SetupTarget(G4double Z, G4double A,
+                                                   G4double e)
+{
   if(e != tkin || Z != targetZ || A != targetA) {
+inline void G4eCoulombScatteringModel::SetupTarget(G4double Z, G4double e)
+{
+  if(Z != targetZ || e != etag) {
+    etag    = e;
     targetZ = Z;
+    targetA = A;
+    SetupKinematic(e);
+    cosTetMaxNuc = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/mom2);
+    G4double x = fNistManager->GetZ13(Z);
+    screenZ = a0*x*x*(1.13 + 3.76*invbeta2*Z*Z*chargeSquare*alpha2)/mom2;
+    if(particle == theProton && A < 1.5 && cosTetMaxNuc < 0.0)
+      cosTetMaxNuc = 0.0;
+    G4int iz= G4int(Z);
+    if(iz > 99) iz = 99;
+    G4double x = fNistManager->GetZ13(iz);
+    screenZ = a0*x*x/mom2;
+    if(iz > 1) screenZ *=(1.13 + 3.76*invbeta2*Z*Z*chargeSquare*alpha2);
+    //screenZ = a0*x*x*(1.13 + 3.76*Z*Z*chargeSquare*alpha2)/mom2;
     // A.V. Butkevich et al., NIM A 488 (2002) 282
+    x =  fNistManager->GetLOGA(A);
+    formfactA = mom2*constn*std::exp(0.54*x);
+    formfactA = FF[iz];
+    if(formfactA == 0.0) {
+      x = fNistManager->GetA27(iz);
+      formfactA = constn*x*x;
+      FF[iz] = formfactA;
+    }
+    formfactA *= mom2;
+    cosTetMaxNuc2 = cosTetMaxNuc;
+    if(particle == theProton && 1 == iz && cosTetMaxNuc2 < 0.0) {
+      cosTetMaxNuc2 = 0.0;
+    }
+    /*
+    G4double ee = 10.*eV*Z;
+    if(1 == iz) ee *= 2.0;
+    G4double z = std::min(cosTetMaxElec, 1.0 - std::max(ecut,ee)*amu_c2
+                          *fNistManager->GetAtomicMassAmu(iz)/mom2);
+    cosTetMaxElec2 = std::max(cosTetMaxNuc2, z);
+    */
+    cosTetMaxElec2 = cosTetMaxElec;
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4eCoulombScatteringModel::SetRecoilThreshold(G4double eth)
+{
+  recoilThreshold = eth;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

trunk/source/processes/electromagnetic/standard/include/G4eIonisation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eIonisation.hh,v 1.35 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eIonisation.hh,v 1.36 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4eIonisation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   // Print out of the class parameters
 …
                                            const G4ParticleDefinition*);
   G4double MinPrimaryEnergy(const G4ParticleDefinition*,
                             const G4Material*, G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*,
+                                    const G4Material*, G4double cut);
 private:
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4eIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                const G4Material*,
-                                                G4double cut)
+{
-  G4double x = cut;
-  if(isElectron) x += cut;
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4eIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Electron::Electron() || &p == G4Positron::Positron());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh

r819	r961
25	25	//
26	26	// $Id: G4eeToTwoGammaModel.hh,v 1.14 2007/05/23 08:47:34 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eplusAnnihilation.hh,v 1.23 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eplusAnnihilation.hh,v 1.24 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual ~G4eplusAnnihilation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   virtual G4VParticleChange* AtRestDoIt(
 …
                              const G4Step& stepData);
   G4double AtRestGetPhysicalInteractionLength(
+  virtual G4double AtRestGetPhysicalInteractionLength(
                              const G4Track& track,
                              G4ForceCondition* condition
 …
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4eplusAnnihilation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (&p == G4Positron::Positron());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4double G4eplusAnnihilation::AtRestGetPhysicalInteractionLength(
-                              const G4Track&, G4ForceCondition* condition)
+{
-  *condition = NotForced;
-  return 0.0;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/include/G4hIonisation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hIonisation.hh,v 1.38 2008/01/14 11:59:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hIonisation.hh,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
 // 11-04-04 Move MaxSecondaryEnergy to models (V.Ivanchenko)
+// 12-09-08 Removed CorrectionsAlongStep (VI)
 //
 // Class Description:
 …
 #include "G4Positron.hh"
 #include "globals.hh"
-#include "G4VEmModel.hh"
-#include "G4EmCorrections.hh"
 class G4Material;
 …
   virtual ~G4hIonisation();
   G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                             const G4Material*, G4double cut);
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                    const G4Material*, G4double cut);
   // Print out of the class parameters
 …
 protected:
-  void CorrectionsAlongStep(
-                           const G4MaterialCutsCouple*,
-                           const G4DynamicParticle*,
-                                 G4double& eloss,
-                                 G4double& length);
   virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
 …
   G4hIonisation(const G4hIonisation&);
+  G4bool     isInitialised;
+  G4bool     nuclearStopping;
   G4double   mass;
   G4double   ratio;
+  const G4ParticleDefinition* theParticle;
+  const G4ParticleDefinition* theBaseParticle;
+  G4EmCorrections*            corr;
+  G4bool                      isInitialised;
+  G4bool                      nuclearStopping;
+  G4double                    eth;
+  G4double                    ethnuc;
+  G4double                    massratio;
+  G4double   eth;
 };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4hIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV &&
-         !p.IsShortLived());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4hIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
-                                                const G4Material*,
-                                                G4double cut)
+{
-  G4double x = 0.5*cut/electron_mass_c2;
-  G4double y = electron_mass_c2/mass;
-  G4double g = x*y + std::sqrt((1. + x)*(1. + x*y*y));
-  return mass*(g - 1.0);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hMultipleScattering.hh,v 1.4 2007/12/07 17:35:52 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hMultipleScattering.hh,v 1.6 2008/05/09 08:23:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 class G4UrbanMscModel90;
+class G4VMscModel;
 class G4hMultipleScattering : public G4VMultipleScattering
 …
   void SetLambdalimit(G4double value) { lambdalimit = value;};
+  // The function overloads the corresponding function of the base
+  // class.It limits the step near to boundaries only
+  // and invokes the method GetMscContinuousStepLimit at every step.
+  G4double AlongStepGetPhysicalInteractionLength(
+                                            const G4Track&,
+                                            G4double  previousStepSize,
+                                            G4double  currentMinimalStep,
+                                            G4double& currentSafety,
+                                            G4GPILSelection* selection);
 protected:
 …
 private:        // data members
   G4UrbanMscModel90* mscUrban;
+  G4VMscModel* mscUrban;
   G4double lambdalimit;
 …
   G4bool   samplez;
   G4bool   isInitialized;
+  G4bool   isIon;
 };

trunk/source/processes/electromagnetic/standard/include/G4ionGasIonisation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionGasIonisation.hh,v 1.2 2007/08/13 06:13:30 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionGasIonisation.hh,v 1.4 2008/09/12 16:26:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4ionIonisation.hh"
-class G4Material;
 class G4ionGasIonisation : public G4ionIonisation
+{
 …
   virtual ~G4ionGasIonisation();
-  virtual void PrintInfo();
-protected:
-  // Initialise process before run
-  virtual void InitialiseEnergyLossProcess(
-                                   const G4ParticleDefinition*,
-                                   const G4ParticleDefinition*);
-  // Initialise dynamic charge before step
-  virtual void InitialiseMassCharge(const G4Track&);
-  // Apply correction after step and modify dynamic charge
-  virtual void CorrectionsAlongStep(
-                           const G4MaterialCutsCouple*,
-                           const G4DynamicParticle*,
-                                 G4double& eloss,
-                                 G4double& length);
 private:
-  // Sample change of charge of the projectile ion
-  G4double SampleChargeAfterStep(G4double qeff, G4double xeff);
   // hide assignment operator
   G4ionGasIonisation & operator=(const G4ionGasIonisation &right);
   G4ionGasIonisation(const G4ionGasIonisation&);
-  const G4ParticleDefinition* currParticle;
-  const G4ParticleDefinition* baseParticle;
-  G4double                    basePartMass;
-  G4double                    currMassRatio;
-  G4double                    atomXS;
-  G4double                    preStepKinEnergy;
-  G4int                       currentIonZ;
-  G4int                       ionZ;
-  G4bool                      initialised;
 };

trunk/source/processes/electromagnetic/standard/include/G4ionIonisation.hh

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionIonisation.hh,v 1.50 2007/11/09 11:45:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionIonisation.hh,v 1.57 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 22-07-06 Remove obsolete method (V.Ivantchenko)
 // 07-11-07 Moved CorrectionsAlongStep to cc (V.Ivantchenko)
+// 12-09-08 Removed InitialiseMassCharge and CorrectionsAlongStep (VI)
 //
 // Class Description:
 …
 #include "G4VEnergyLossProcess.hh"
-#include "G4ionEffectiveCharge.hh"
-#include "G4VEmModel.hh"
-#include "G4EmCorrections.hh"
 class G4Material;
+class G4PhysicsVector;
+class G4BraggIonModel;
+class G4EmCorrections;
 class G4ionIonisation : public G4VEnergyLossProcess
 …
   virtual ~G4ionIonisation();
   inline G4bool IsApplicable(const G4ParticleDefinition& p);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& p);
   // Print out of the class parameters
 …
   void AddStoppingData(G4int Z, G4int A, const G4String& materialName,
                        G4PhysicsVector& dVector);
+                       G4PhysicsVector* dVector);
   void ActivateStoppingData(G4bool);
 …
                                            const G4ParticleDefinition*);
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& length);
+  inline void InitialiseMassCharge(const G4Track&);
+  inline G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
+  virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
                                    const G4Material*, G4double cut);
 …
   inline G4bool NuclearStoppingFlag();
-  // protected pointers
-  G4ionEffectiveCharge*       effCharge;
-  G4EmCorrections*            corr;
 private:
 …
   G4ionIonisation(const G4ionIonisation&);
+  // cash
+  const G4Material*           curMaterial;
+  const G4ParticleDefinition* curParticle;
+  G4EmCorrections*            corr;
   const G4ParticleDefinition* theParticle;
-  const G4ParticleDefinition* theBaseParticle;
   G4double                    preKinEnergy;
+  G4double   eth;
+  G4double                    eth;
+  G4double                    baseMass;
+  G4double                    massRatio;
+  G4double                    massFactor;
+  G4double                    charge2;
+  G4bool                      isInitialised;
+  G4bool                      stopDataActive;
+  G4bool                      nuclearStopping;
+  G4bool     isInitialised;
+  G4bool     stopDataActive;
+  G4bool     nuclearStopping;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4ionIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
-  return (p.GetPDGCharge() != 0.0 && !p.IsShortLived() &&
-          p.GetParticleType() == "nucleus");
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4ionIonisation::MinPrimaryEnergy(
-          const G4ParticleDefinition*, const G4Material*, G4double cut)
+{
-  G4double x = 0.5*cut/electron_mass_c2;
-  G4double g = std::sqrt(1. + x);
-  return proton_mass_c2*(g - 1.0);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4ionIonisation::InitialiseMassCharge(const G4Track& track)
+{
-  preKinEnergy = track.GetKineticEnergy();
-  massRatio    = baseMass/track.GetDynamicParticle()->GetMass();
-  charge2      = effCharge->EffectiveChargeSquareRatio(track.GetDefinition(),
-                                                       track.GetMaterial(),
-                                                       preKinEnergy);
-  SetDynamicMassCharge(massRatio, charge2);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ASTARStopping.cc,v 1.6 2006/06/29 19:52:36 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4ASTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //---------------------------------------------------------------------------
 …
 G4ASTARStopping::G4ASTARStopping()
+{
+  currentE = 0.0;
   currentMaterial = 0;
   index = 0;
 …
   for (G4int i=0; i<74; i++){
     if (matName == name[i]){
       matIndex= -1;
+      matIndex = i;
       currentMaterial = mat;
       return i;
 …
       return res;
     } else if (energy >= kinE[77]) {
       index = 58;
+      index = 76;
       res = e[matIndex][77];
       return res;
 …
  for(i=0; i<74; i++) {effZ[i]=Z[i];}
+name [0] = "G4_A-150_TISSUE";
+Znum [0] = 0;
+name [0] = "G4_A-150_TISSUE";
 G4double T0[78] = { 0.001, 0.0015, 0.002, 0.0025, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.0125, 0.015, 0.0175, 0.02, 0.0225, 0.025, 0.0275, 0.03, 0.035, 0.04, 0.045, 0.05, 0.055, 0.06, 0.065, 0.07, 0.075, 0.08, 0.085, 0.09, 0.095, 0.1, 0.125, 0.15, 0.175, 0.2, 0.225, 0.25, 0.275, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.25, 1.5, 1.75, 2, 2.25, 2.5, 2.75, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5, 10 };
 …
 name [1] = "G4_ACETYLENE";
-Znum [1] = 0;
 G4double e1[78] = { 192.2, 229.4, 260.2, 287, 311, 353.1, 389.7, 422.5, 452.4, 480.1, 506, 530.3, 585.9, 635.7, 681.2, 723.2, 762.5, 799.4, 834.3, 867.5, 929.6, 986.9, 1040, 1090, 1137, 1182, 1224, 1265, 1304, 1341, 1376, 1411, 1444, 1475, 1619, 1741, 1847, 1938, 2017, 2085, 2144, 2195, 2275, 2331, 2367, 2388, 2397, 2395, 2386, 2370, 2350, 2326, 2299, 2271, 2241, 2210, 2056, 1913, 1783, 1666, 1562, 1468, 1384, 1308, 1177, 1072, 986.8, 915.5, 855, 802.8, 757.2, 717.1, 681.4, 649.5, 620.7, 594.7, 570.9, 549.2 };
 …
 name [2] = "G4_ADIPOSE_TISSUE_ICRP";
-Znum [2] = 0;
 G4double e2[78] = { 169.4, 204.2, 233.3, 258.8, 281.8, 322.4, 358.1, 390.2, 419.7, 447.2, 472.9, 497.2, 552.9, 603.2, 649.4, 692.4, 732.7, 770.7, 806.8, 841.3, 906, 966.1, 1022, 1075, 1125, 1173, 1219, 1262, 1304, 1344, 1383, 1420, 1456, 1491, 1650, 1787, 1907, 2012, 2104, 2185, 2256, 2317, 2417, 2489, 2539, 2571, 2588, 2592, 2587, 2573, 2554, 2529, 2500, 2468, 2434, 2398, 2213, 2035, 1874, 1731, 1605, 1499, 1408, 1328, 1197, 1091, 1004, 932.2, 870.7, 817.8, 771.5, 730.8, 694.5, 662.1, 632.9, 606.4, 582.3, 560.2 };
 …
 name [3] = "G4_Ag";
-Znum [3] = 47;
 G4double e3[78] = { 31.26, 38.13, 43.91, 48.98, 53.56, 61.66, 68.79, 75.21, 81.11, 86.6, 91.74, 96.6, 107.7, 117.8, 127, 135.6, 143.6, 151.2, 158.4, 165.3, 178.2, 190.2, 201.4, 212, 222, 231.6, 240.7, 249.5, 257.9, 266, 273.9, 281.4, 288.8, 295.9, 328.8, 357.8, 383.8, 407.4, 428.8, 448.4, 466.3, 482.8, 511.8, 536.2, 556.6, 573.5, 587.3, 598.4, 607.2, 613.8, 618.5, 621.6, 623.4, 623.8, 623.3, 621.8, 604.4, 578.7, 550.8, 523.3, 497.6, 474.4, 453.6, 435, 402.7, 375.9, 353.2, 333.6, 316.9, 302, 288.8, 276.9, 266.2, 256.5, 247.7, 239.5, 232, 225.1 };
 …
 name [4] = "G4_AIR";
-Znum [4] = 0;
 G4double e4[78] = { 87.5, 108.6, 126.7, 142.7, 157.3, 183.5, 206.7, 227.9, 247.5, 265.9, 283.2, 299.6, 337.7, 372.3, 404.3, 434.3, 462.6, 489.4, 515, 539.5, 585.8, 629, 669.6, 708.1, 744.8, 779.8, 813.4, 845.7, 876.8, 906.8, 935.9, 964, 991.3, 1018, 1140, 1247, 1343, 1429, 1506, 1575, 1637, 1693, 1787, 1861, 1918, 1961, 1990, 2008, 2017, 2019, 2013, 2002, 1987, 1968, 1946, 1922, 1774, 1625, 1494, 1382, 1287, 1205, 1133, 1072, 968.6, 885.9, 818, 760.7, 711.7, 669.6, 632.7, 600.2, 571.2, 545.3, 521.9, 500.6, 481.2, 463.4 };
 …
 name [5] = "G4_Al";
-Znum [5] = 13;
 G4double e5[78] = { 55.8, 71.89, 86.05, 98.92, 110.9, 132.7, 152.5, 170.9, 188.2, 204.5, 220.1, 235.1, 270.1, 302.5, 332.8, 361.5, 388.6, 414.6, 439.4, 463.3, 508.4, 550.4, 589.6, 626.5, 661.1, 693.7, 724.3, 753.2, 780.3, 805.9, 830.1, 852.8, 874.3, 894.5, 980, 1045, 1096, 1136, 1168, 1195, 1216, 1234, 1262, 1280, 1291, 1297, 1298, 1297, 1293, 1286, 1279, 1269, 1259, 1248, 1237, 1225, 1161, 1098, 1039, 984.9, 937.6, 895.4, 856.8, 821, 756.1, 698.6, 647.8, 604.8, 567.8, 535.7, 507.4, 482.4, 460, 439.8, 421.6, 405.1, 389.9, 376 };
 …
 name [6] = "G4_ALUMINUM_OXIDE";
-Znum [6] = 0;
 G4double e6[78] = { 71.39, 88.59, 103.3, 116.4, 128.4, 149.9, 169, 186.5, 202.8, 218, 232.3, 246, 277.7, 306.6, 333.4, 358.5, 382.1, 404.6, 426, 446.5, 485, 520.9, 554.3, 585.8, 615.5, 643.5, 670, 695.2, 719.1, 741.9, 763.6, 784.3, 804, 822.9, 905.9, 974, 1031, 1080, 1122, 1159, 1191, 1220, 1267, 1304, 1332, 1353, 1368, 1378, 1383, 1385, 1384, 1381, 1376, 1370, 1362, 1352, 1308, 1253, 1187, 1115, 1044, 982.5, 928.4, 880, 801.2, 737, 683.4, 638.1, 599.1, 565.2, 535.4, 508.9, 485.3, 464, 444.8, 427.3, 411.4, 396.7 };
 …
 name [7] = "G4_Ar";
-Znum [7] = 40;
 G4double e7[78] = { 34.54, 44.56, 53.39, 61.42, 68.88, 82.53, 94.95, 106.5, 117.3, 127.6, 137.4, 146.8, 168.8, 189.3, 208.5, 226.7, 244.1, 260.8, 276.8, 292.3, 321.9, 349.8, 376.5, 401.9, 426.4, 450, 472.8, 494.9, 516.3, 537.1, 557.3, 577, 596.1, 614.8, 702.1, 780.3, 850.8, 914.4, 971.9, 1024, 1070, 1111, 1181, 1233, 1272, 1298, 1314, 1321, 1321, 1315, 1305, 1291, 1276, 1258, 1240, 1222, 1130, 1047, 974, 911.2, 856.7, 809, 767, 729.8, 666.1, 613.2, 569.7, 532.7, 501, 473.4, 449.1, 427.4, 408.3, 391, 375.4, 361.1, 348.1, 336 };
 …
 name [8] = "G4_Au";
-Znum [8] = 79;
 G4double e8[78] = { 11.5, 14.55, 17.2, 19.57, 21.76, 25.72, 29.27, 32.54, 35.59, 38.46, 41.18, 43.78, 49.83, 55.39, 60.56, 65.44, 70.06, 74.46, 78.68, 82.74, 90.45, 97.69, 104.5, 111.1, 117.3, 123.3, 129.1, 134.6, 140, 145.2, 150.3, 155.2, 160, 164.7, 186.4, 205.8, 223.5, 239.5, 254.2, 267.7, 280.1, 291.5, 311.6, 328.5, 342.6, 354.3, 363.8, 371.5, 377.5, 382.1, 385.5, 387.8, 389.1, 389.6, 389.4, 388.7, 384.4, 375.7, 362.6, 346.8, 330.5, 316.4, 304, 293, 274.1, 258.4, 245, 233.4, 223.1, 214, 205.8, 198.4, 191.6, 185.5, 179.7, 174.5, 169.6, 165 };
 …
 name [9] = "G4_B-100_BONE";
-Znum [9] = 0;
 G4double e9[78] = { 138.6, 167.7, 192, 213.3, 232.4, 266.3, 296, 322.7, 347.2, 369.9, 391.2, 411.3, 457.3, 498.8, 536.8, 572, 605, 636.1, 665.7, 693.8, 746.5, 795.4, 841, 883.9, 924.5, 963.1, 999.9, 1035, 1069, 1101, 1133, 1163, 1192, 1220, 1348, 1460, 1557, 1643, 1719, 1786, 1845, 1897, 1983, 2047, 2093, 2124, 2142, 2149, 2148, 2139, 2125, 2106, 2084, 2059, 2031, 2003, 1861, 1726, 1600, 1484, 1379, 1290, 1214, 1147, 1035, 945.3, 871.8, 810, 757.7, 712.5, 672.9, 638.1, 607, 579.2, 554.1, 531.3, 510.5, 491.5 };
 …
 name [10] = "G4_Be";
-Znum [10] = 4;
 G4double e10[78] = { 146.3, 177.1, 202.9, 225.4, 245.6, 281.3, 312.5, 340.6, 366.2, 390, 412.2, 433.2, 481.1, 524.1, 563.3, 599.7, 633.6, 665.4, 695.6, 724.2, 777.7, 827, 872.7, 915.5, 955.7, 993.7, 1030, 1064, 1096, 1128, 1157, 1186, 1213, 1239, 1356, 1453, 1534, 1602, 1659, 1706, 1745, 1776, 1821, 1846, 1856, 1855, 1845, 1829, 1809, 1785, 1759, 1732, 1703, 1674, 1645, 1617, 1499, 1406, 1326, 1254, 1189, 1129, 1075, 1024, 935.3, 858.7, 792.9, 737.6, 690, 648.7, 612.5, 580.4, 552, 526.4, 503.3, 482.4, 463.3, 445.8 };
 …
 name [11] = "G4_BONE_COMPACT_ICRU";
-Znum [11] = 0;
 G4double e11[78] = { 125.9, 152.6, 175, 194.8, 212.5, 244.1, 271.8, 296.8, 319.8, 341.1, 361.2, 380.2, 423.8, 463.1, 499.3, 533, 564.6, 594.5, 622.8, 649.9, 700.8, 748.1, 792.4, 834.2, 873.7, 911.4, 947.4, 981.9, 1015, 1047, 1078, 1107, 1136, 1164, 1291, 1401, 1498, 1584, 1660, 1727, 1787, 1839, 1926, 1991, 2039, 2072, 2092, 2103, 2105, 2100, 2089, 2075, 2056, 2035, 2011, 1986, 1846, 1705, 1576, 1460, 1358, 1271, 1196, 1130, 1020, 931.6, 859.4, 798.8, 747.4, 702.9, 664, 629.7, 599.1, 571.7, 547.1, 524.7, 504.3, 485.6 };
 …
 name [12] = "G4_C";
-Znum [12] = 6;
 G4double e12[78] = { 190.6, 225.6, 254.3, 279, 300.9, 339.2, 372.1, 401.4, 427.9, 452.3, 475, 496.2, 544.3, 586.9, 625.5, 661, 693.8, 724.6, 753.5, 780.8, 831.5, 877.9, 920.8, 960.6, 998, 1033, 1066, 1098, 1128, 1156, 1184, 1210, 1235, 1259, 1366, 1455, 1531, 1595, 1650, 1698, 1738, 1772, 1825, 1862, 1886, 1900, 1906, 1906, 1901, 1892, 1880, 1866, 1850, 1833, 1814, 1795, 1684, 1571, 1466, 1372, 1288, 1213, 1145, 1085, 981.9, 898.2, 829.6, 772, 722.9, 680.4, 643.1, 610.2, 580.8, 554.4, 530.6, 509, 489.2, 471.2 };
 …
 name [13] = "G4_C_Graphite";
-Znum [13] = 0;
 G4double e13[78] = { 192.3, 228.9, 259, 285.1, 308.3, 348.9, 384, 415.3, 443.7, 469.9, 494.2, 517, 568.9, 615.1, 657, 695.5, 731.3, 764.8, 796.3, 826.2, 881.8, 932.7, 979.8, 1024, 1065, 1104, 1141, 1175, 1209, 1240, 1271, 1300, 1327, 1354, 1473, 1574, 1658, 1731, 1793, 1845, 1890, 1929, 1987, 2027, 2051, 2063, 2065, 2060, 2049, 2034, 2015, 1993, 1969, 1944, 1917, 1891, 1751, 1620, 1502, 1400, 1310, 1231, 1161, 1099, 994.3, 909, 839.2, 780.7, 730.8, 687.6, 649.8, 616.4, 586.6, 559.8, 535.7, 513.8, 493.8, 475.5 };
 …
 name [14] = "G4_ETHYLENE";
-Znum [14] = 0;
 G4double e14[78] = { 159.8, 195.8, 226, 252.7, 276.8, 319.7, 357.4, 391.5, 422.9, 452.1, 479.5, 505.4, 565.1, 619, 668.6, 714.8, 758.1, 799.1, 838.1, 875.3, 945.4, 1011, 1072, 1130, 1185, 1237, 1288, 1336, 1383, 1428, 1471, 1514, 1555, 1594, 1779, 1945, 2094, 2230, 2354, 2468, 2571, 2666, 2830, 2961, 3060, 3130, 3172, 3189, 3185, 3164, 3129, 3086, 3038, 2986, 2931, 2876, 2578, 2306, 2084, 1907, 1763, 1642, 1539, 1450, 1303, 1185, 1089, 1010, 941.9, 883.6, 832.8, 788.1, 748.4, 712.9, 680.9, 652, 625.7, 601.7 };
 …
 name [15] = "G4_C-552";
-Znum [15] = 0;
 G4double e15[78] = { 124.1, 148.8, 169.3, 187.2, 203.3, 231.5, 256.1, 278.2, 298.4, 317.1, 334.5, 351, 388.6, 422.4, 453.2, 481.8, 508.4, 533.5, 557.3, 579.9, 622.2, 661.3, 697.8, 732, 764.3, 794.9, 824, 851.9, 878.5, 904.1, 928.7, 952.4, 975.2, 997.3, 1097, 1184, 1259, 1325, 1384, 1435, 1481, 1521, 1588, 1639, 1678, 1706, 1726, 1738, 1744, 1745, 1743, 1736, 1727, 1716, 1703, 1688, 1603, 1511, 1421, 1338, 1261, 1190, 1126, 1067, 965.5, 883.8, 816.4, 759.6, 711.1, 669.1, 632.3, 599.9, 571, 545, 521.6, 500.3, 480.9, 463.1 };
 …
 name [16] = "G4_CARBON_DIOXIDE";
-Znum [16] = 0;
 G4double e16[78] = { 93.28, 114.2, 131.9, 147.5, 161.6, 186.6, 208.6, 228.5, 246.8, 263.8, 279.8, 295, 329.8, 361.2, 390.2, 417.1, 442.4, 466.4, 489.1, 510.8, 551.8, 589.8, 625.6, 659.4, 691.5, 722.2, 751.6, 779.8, 807.1, 833.4, 858.9, 883.7, 907.7, 931.1, 1040, 1137, 1225, 1306, 1380, 1449, 1513, 1571, 1676, 1763, 1834, 1891, 1933, 1961, 1977, 1982, 1978, 1967, 1952, 1932, 1911, 1888, 1752, 1614, 1490, 1383, 1290, 1209, 1139, 1077, 973.3, 890, 821.5, 764, 714.9, 672.6, 635.5, 602.6, 573.5, 547.3, 523.7, 502.4, 482.9, 465 };
 …
 name [17] = "G4_CALCIUM_FLUORIDE";
-Znum [17] = 0;
 G4double e17[78] = { 72.78, 90.74, 106.1, 119.8, 132.3, 154.7, 174.6, 192.8, 209.7, 225.5, 240.4, 254.5, 287.2, 317, 344.6, 370.4, 394.6, 417.6, 439.5, 460.5, 499.9, 536.5, 570.8, 603.1, 633.6, 662.6, 690.1, 716.4, 741.5, 765.6, 788.6, 810.8, 832.1, 852.6, 944.4, 1022, 1088, 1145, 1194, 1237, 1275, 1308, 1361, 1401, 1431, 1453, 1467, 1476, 1481, 1481, 1479, 1474, 1466, 1458, 1447, 1436, 1352, 1256, 1166, 1086, 1016, 954.4, 900.2, 852.3, 772.1, 708.1, 655.5, 610.7, 573.3, 540.6, 511.9, 486.6, 464, 443.8, 425.4, 408.7, 393.4, 379.4 };
 …
 name [18] = "G4_CERIC_SULFATE";
-Znum [18] = 0;
 G4double e18[78] = { 99.73, 123.7, 144.1, 162.3, 178.8, 208.3, 234.6, 258.5, 280.5, 301.2, 320.6, 339.1, 381.8, 420.6, 456.5, 490, 521.6, 551.5, 580.1, 607.4, 658.9, 707, 752.2, 795, 835.7, 874.6, 911.8, 947.6, 982, 1015, 1047, 1078, 1109, 1138, 1273, 1391, 1497, 1591, 1676, 1753, 1822, 1884, 1990, 2074, 2140, 2190, 2227, 2251, 2266, 2273, 2272, 2266, 2254, 2238, 2220, 2198, 2049, 1886, 1737, 1607, 1495, 1399, 1315, 1242, 1120, 1023, 942.8, 875.6, 818.4, 769.2, 726.1, 688, 654.2, 624, 596.7, 572, 549.5, 528.9 };
 …
 name [19] = "G4_CELLULOSE_NITRATE";
-Znum [19] = 0;
 G4double e19[78] = { 157.6, 186.4, 209.9, 230.3, 248.3, 279.7, 306.8, 330.8, 352.6, 372.6, 391.2, 408.7, 448.1, 483.2, 514.9, 544.1, 571.1, 596.4, 620.3, 642.8, 684.8, 723.2, 758.8, 792, 823.2, 852.7, 880.6, 907.2, 932.6, 956.9, 980.2, 1003, 1024, 1045, 1139, 1220, 1290, 1353, 1408, 1457, 1502, 1541, 1608, 1662, 1704, 1736, 1761, 1778, 1789, 1796, 1798, 1796, 1790, 1782, 1772, 1760, 1674, 1574, 1476, 1385, 1302, 1227, 1160, 1099, 993.8, 909.3, 839.7, 781.1, 731.2, 688.1, 650.2, 616.7, 587, 560.3, 536.2, 514.4, 494.5, 476.2 };
 …
 name [20] = "G4_BONE_CORTICAL_ICRP";
-Znum [20] = 0;
 G4double e20[78] = { 109.1, 132.8, 152.8, 170.4, 186.2, 214.4, 239.3, 261.7, 282.4, 301.6, 319.7, 336.8, 376.1, 411.7, 444.5, 475, 503.6, 530.7, 556.5, 581.1, 627.4, 670.4, 710.8, 748.9, 785, 819.4, 852.4, 883.9, 914.3, 943.5, 971.7, 999, 1025, 1051, 1168, 1270, 1360, 1440, 1511, 1574, 1630, 1680, 1763, 1826, 1872, 1905, 1927, 1939, 1943, 1941, 1933, 1921, 1905, 1887, 1866, 1844, 1720, 1593, 1475, 1369, 1274, 1193, 1123, 1062, 959.2, 877.1, 809.7, 753, 704.9, 663.4, 627, 594.9, 566.3, 540.6, 517.5, 496.5, 477.4, 459.8 };
 …
 name [21] = "G4_CESIUM_IODIDE";
-Znum [21] = 0;
 G4double e21[78] = { 40.6, 48.54, 55.16, 60.95, 66.15, 75.33, 83.38, 90.64, 97.29, 103.5, 109.3, 114.8, 127.3, 138.7, 149.2, 158.9, 168, 176.7, 184.9, 192.8, 207.6, 221.3, 234.2, 246.4, 258, 269.1, 279.7, 289.9, 299.7, 309.2, 318.3, 327.1, 335.7, 344, 382.3, 415.8, 445.6, 472.1, 495.7, 516.7, 535.4, 551.8, 578.9, 599.2, 613.8, 623.8, 629.9, 633, 633.6, 632.3, 629.5, 625.5, 620.6, 615.1, 609.1, 602.8, 567.7, 533, 501.8, 474.4, 450.3, 429, 410.1, 393.3, 364.6, 340.9, 321, 304, 289.2, 275.9, 264.1, 253.6, 243.9, 235, 226.7, 218.9, 211.9, 205.4 };
 …
 name [22] = "G4_Cu";
-Znum [22] = 29;
 G4double e22[78] = { 29.51, 36.49, 42.42, 47.68, 52.45, 60.98, 68.54, 75.4, 81.74, 87.65, 93.23, 98.51, 110.7, 121.8, 132, 141.5, 150.5, 159, 167.2, 174.9, 189.5, 203.2, 216, 228.1, 239.7, 250.7, 261.3, 271.4, 281.2, 290.7, 299.8, 308.7, 317.3, 325.6, 364.2, 398.4, 429.1, 456.8, 482.1, 505.1, 526.2, 545.4, 579, 607, 630.1, 649.1, 664.4, 676.6, 686.2, 693.4, 698.8, 702.4, 704.6, 705.7, 705.7, 704.9, 692.5, 672.6, 650.3, 627.6, 606, 585.6, 566.3, 548, 514, 483.4, 455.8, 431, 408.4, 388, 369.6, 353.7, 339.1, 325.7, 313.4, 302, 291.7, 282.3 };
 …
 name [23] = "G4_Fe";
-Znum [23] = 26;
 G4double e23[78] = { 54.06, 65.42, 74.91, 83.2, 90.66, 103.8, 115.3, 125.6, 135.1, 143.8, 152, 159.8, 177.4, 193.3, 207.8, 221.3, 233.9, 245.7, 256.9, 267.6, 287.7, 306.2, 323.5, 339.8, 355.2, 369.8, 383.8, 397.1, 410, 422.3, 434.2, 445.7, 456.9, 467.6, 517.1, 560.6, 599.4, 634.3, 665.9, 694.6, 720.8, 744.8, 786.6, 821.5, 850.4, 874.1, 893.1, 908.1, 919.6, 928, 933.6, 936.8, 938, 937.3, 935.1, 931.5, 899.9, 856.7, 810.9, 766.9, 727.3, 691.9, 660.2, 631.5, 581.8, 540.1, 504.6, 473.9, 447.2, 423.6, 402.6, 383.5, 366.9, 352, 338.3, 325.7, 314.1, 303.6 };
 …
 name [24] = "G4_FERROUS_SULFATE";
-Znum [24] = 0;
 G4double e24[78] = { 99.58, 123.5, 144, 162.1, 178.6, 208.1, 234.3, 258.2, 280.2, 300.8, 320.3, 338.7, 381.4, 420.2, 456, 489.5, 521, 551, 579.5, 606.8, 658.3, 706.3, 751.5, 794.2, 834.9, 873.7, 910.9, 946.6, 981, 1014, 1046, 1077, 1108, 1137, 1271, 1390, 1495, 1590, 1675, 1751, 1820, 1882, 1988, 2072, 2138, 2188, 2225, 2250, 2265, 2271, 2271, 2264, 2253, 2237, 2218, 2197, 2048, 1886, 1738, 1609, 1497, 1401, 1317, 1244, 1122, 1025, 944.6, 877.4, 820, 770.7, 727.5, 689.3, 655.4, 625.2, 597.8, 573.1, 550.5, 529.9 };
 …
 name [25] = "G4_Gd";
-Znum [25] = 64;
 G4double e25[78] = { 38.11, 45.4, 51.41, 56.61, 61.25, 69.34, 76.36, 82.61, 88.29, 93.53, 98.41, 103, 113.4, 122.7, 131.1, 138.9, 146.1, 152.9, 159.3, 165.4, 176.7, 187.1, 196.8, 205.9, 214.4, 222.5, 230.3, 237.6, 244.7, 251.5, 258, 264.3, 270.3, 276.2, 303.1, 326.6, 347.4, 366.2, 383.1, 398.5, 412.5, 425.4, 447.8, 466.5, 482.1, 494.8, 505.1, 513.2, 519.4, 523.9, 526.9, 528.6, 529.1, 528.6, 527.3, 525.2, 505.6, 481, 456.8, 434.6, 414.6, 396.6, 380.5, 366, 340.9, 319.7, 301.6, 285.8, 272, 259.8, 248.8, 239, 230.1, 222, 214.6, 207.7, 201.4, 195.6 };
 …
 name [26] = "G4_Ge";
-Znum [26] = 32;
 G4double e26[78] = { 47.65, 57.57, 65.83, 73.05, 79.53, 90.94, 100.9, 109.9, 118, 125.6, 132.7, 139.4, 154.6, 168.3, 180.8, 192.3, 203.1, 213.3, 222.9, 232, 249.1, 264.8, 279.5, 293.2, 306.1, 318.4, 330, 341.1, 351.7, 361.8, 371.5, 380.8, 389.8, 398.4, 437.2, 469.9, 497.8, 521.7, 542.3, 560.1, 575.5, 588.9, 610.7, 627.4, 640.1, 649.9, 657.3, 662.8, 666.8, 669.6, 671.4, 672.3, 672.4, 671.9, 670.9, 669.4, 656.9, 639.5, 619.8, 599.4, 578.4, 557.6, 537.5, 518.5, 483.6, 452.9, 425.8, 401.8, 380.5, 361.5, 344.3, 328.6, 315.1, 303.1, 292.1, 282, 272.6, 263.8 };
 …
 name [27] = "G4_Pyrex_Glass";
-Znum [27] = 0;
 G4double e27[78] = { 83.85, 102.1, 117.5, 131, 143.3, 165, 184.1, 201.3, 217.2, 232, 245.9, 259, 289.2, 316.5, 341.5, 364.8, 386.7, 407.4, 427.1, 445.8, 481.1, 513.8, 544.4, 573.2, 600.6, 626.6, 651.5, 675.3, 698.1, 720.1, 741.3, 761.7, 781.5, 800.6, 888, 963.9, 1031, 1090, 1142, 1189, 1231, 1268, 1330, 1378, 1414, 1441, 1460, 1473, 1481, 1485, 1484, 1481, 1475, 1466, 1456, 1445, 1389, 1323, 1249, 1171, 1095, 1029, 971.4, 920.7, 835.9, 768, 711.5, 663.8, 622.8, 587.4, 556.1, 528.4, 503.7, 481.5, 461.4, 443.2, 426.5, 411.2 };
 …
 name [28] = "G4_H";
-Znum [28] = 1;
 G4double e28[78] = { 212, 275.4, 331.7, 383, 430.9, 518.8, 599.2, 674, 744.5, 811.5, 875.6, 937.1, 1082, 1217, 1344, 1465, 1580, 1691, 1798, 1901, 2098, 2285, 2463, 2634, 2798, 2956, 3108, 3256, 3399, 3538, 3674, 3805, 3933, 4058, 4637, 5152, 5610, 6019, 6383, 6705, 6988, 7235, 7632, 7915, 8100, 8203, 8240, 8222, 8161, 8067, 7947, 7808, 7655, 7494, 7327, 7157, 6345, 5647, 5068, 4588, 4188, 3860, 3585, 3351, 2971, 2675, 2438, 2242, 2078, 1939, 1818, 1713, 1620, 1538, 1464, 1398, 1337, 1283 };
 …
 name [29] = "G4_HELIUM";
-Znum [29] = 2;
 G4double e29[78] = { 87.26, 110.8, 131.3, 149.8, 166.8, 197.7, 225.5, 251.1, 275, 297.5, 318.9, 339.4, 387, 430.9, 471.8, 510.4, 547, 581.9, 615.3, 647.5, 708.7, 766.1, 820.5, 872.3, 921.8, 969.3, 1015, 1059, 1102, 1143, 1183, 1221, 1259, 1296, 1465, 1614, 1748, 1867, 1975, 2071, 2156, 2233, 2361, 2460, 2535, 2588, 2624, 2644, 2652, 2650, 2639, 2621, 2598, 2571, 2540, 2507, 2323, 2139, 1976, 1832, 1706, 1593, 1493, 1402, 1249, 1130, 1033, 953.8, 886.8, 829.5, 779.8, 736.4, 697.9, 663.7, 632.9, 605.2, 580, 557 };
 …
 name [30] = "G4_KAPTON";
-Znum [30] = 0;
 G4double e30[78] = { 165.5, 197.6, 224.2, 247.2, 267.8, 304, 335.4, 363.5, 389.1, 412.8, 434.8, 455.6, 502.9, 545.2, 583.8, 619.4, 652.6, 683.8, 713.3, 741.2, 793.5, 841.6, 886.3, 928.2, 967.7, 1005, 1041, 1074, 1107, 1138, 1167, 1196, 1223, 1250, 1369, 1471, 1560, 1636, 1703, 1762, 1812, 1857, 1928, 1981, 2018, 2042, 2056, 2062, 2061, 2054, 2043, 2028, 2010, 1990, 1969, 1946, 1819, 1688, 1565, 1451, 1350, 1264, 1190, 1125, 1017, 929.8, 858.3, 798.2, 747, 702.8, 664, 629.8, 599.3, 571.9, 547.2, 524.8, 504.4, 485.7 };
 …
 name [31] = "G4_Kr";
-Znum [31] = 36;
 G4double e31[78] = { 10.15, 13.69, 16.93, 19.96, 22.84, 28.23, 33.29, 38.08, 42.66, 47.08, 51.35, 55.5, 65.43, 74.84, 83.85, 92.52, 100.9, 109.1, 117, 124.7, 139.7, 154.1, 168, 181.5, 194.6, 207.4, 219.9, 232.1, 244, 255.7, 267.2, 278.4, 289.5, 300.3, 351.9, 399.6, 443.7, 484.4, 522.1, 556.7, 588.4, 617.2, 666.6, 705.7, 735.5, 757, 771.4, 779.9, 783.4, 783, 779.4, 773.6, 765.9, 757, 747.2, 736.9, 683.7, 635.6, 595.2, 561.5, 533, 508.6, 487.3, 468.5, 439.9, 417.9, 398.8, 381.4, 364.9, 349.2, 334.2, 319.8, 306.2, 293.7, 282.8, 272.8, 263.6, 255.2 };
 …
 name [32] = "G4_LITHIUM_TETRABORATE";
-Znum [32] = 0;
 G4double e32[78] = { 132.7, 159.4, 181.6, 200.9, 218.2, 248.6, 275, 298.7, 320.4, 340.4, 359.1, 376.6, 416.8, 452.7, 485.5, 515.8, 544, 570.6, 595.8, 619.7, 664.3, 705.6, 743.9, 779.9, 813.9, 846.1, 876.8, 906.1, 934.2, 961.1, 987, 1012, 1036, 1059, 1166, 1258, 1338, 1410, 1474, 1531, 1583, 1628, 1706, 1767, 1814, 1849, 1874, 1891, 1899, 1902, 1899, 1891, 1875, 1852, 1825, 1795, 1638, 1494, 1375, 1276, 1193, 1121, 1058, 1002, 908.8, 833.2, 770.5, 717.6, 672.4, 633.2, 598.8, 568.3, 541.2, 516.9, 494.8, 474.9, 456.6, 439.9 };
 …
 name [33] = "G4_LITHIUM_FLUORIDE";
-Znum [33] = 0;
 G4double e33[78] = { 118.7, 142.6, 162.5, 179.7, 195.2, 222.4, 246, 267.2, 286.5, 304.3, 321, 336.6, 372.4, 404.4, 433.5, 460.4, 485.5, 509.1, 531.4, 552.6, 592.1, 628.5, 662.4, 694.1, 724.1, 752.4, 779.4, 805.1, 829.6, 853.2, 875.9, 897.6, 918.7, 938.9, 1031, 1110, 1179, 1240, 1294, 1341, 1383, 1421, 1483, 1530, 1566, 1592, 1610, 1621, 1627, 1627, 1624, 1618, 1609, 1598, 1585, 1571, 1483, 1387, 1296, 1214, 1140, 1074, 1015, 962.2, 872, 799.7, 739.5, 688.5, 644.8, 606.9, 573.7, 544.4, 518.3, 494.9, 473.6, 454.3, 436.7, 420.6 };
 …
 name [34] = "G4_M3_WAX";
-Znum [34] = 0;
 G4double e34[78] = { 173.6, 209, 238.5, 264.3, 287.6, 328.7, 364.7, 397.1, 426.9, 454.5, 480.4, 504.9, 561, 611.6, 658, 701.1, 741.6, 779.8, 816, 850.6, 915.4, 975.6, 1032, 1085, 1135, 1182, 1228, 1271, 1313, 1353, 1392, 1429, 1465, 1499, 1657, 1792, 1910, 2012, 2101, 2179, 2247, 2305, 2398, 2463, 2507, 2533, 2544, 2544, 2534, 2517, 2494, 2468, 2437, 2405, 2371, 2335, 2154, 1981, 1825, 1686, 1564, 1460, 1372, 1295, 1167, 1064, 980.4, 910.2, 850.4, 798.9, 753.8, 714.2, 678.9, 647.3, 618.8, 593, 569.4, 547.9 };
 …
 name [35] = "G4_MS20_TISSUE";
-Znum [35] = 0;
 G4double e35[78] = { 163.5, 196.6, 224.1, 248.2, 269.8, 308, 341.4, 371.4, 398.9, 424.4, 448.3, 470.9, 522.5, 569, 611.6, 651.1, 688, 722.9, 756, 787.5, 846.6, 901.2, 952.3, 1000, 1046, 1089, 1130, 1169, 1207, 1243, 1278, 1311, 1344, 1375, 1516, 1638, 1744, 1836, 1916, 1986, 2048, 2101, 2185, 2247, 2288, 2314, 2327, 2330, 2325, 2312, 2295, 2273, 2249, 2222, 2193, 2163, 2002, 1845, 1703, 1575, 1463, 1368, 1286, 1215, 1097, 1001, 923.2, 857.7, 802, 753.9, 711.7, 674.6, 641.6, 611.9, 585.2, 561, 539, 518.8 };
 …
 name [36] = "G4_METHANE";
-Znum [36] = 0;
 G4double e36[78] = { 197.5, 241.8, 279.3, 312.2, 342, 394.9, 441.5, 483.7, 522.4, 558.5, 592.4, 624.4, 698.1, 764.8, 826, 883.1, 936.6, 987.3, 1035, 1081, 1168, 1249, 1324, 1396, 1464, 1529, 1591, 1650, 1708, 1764, 1818, 1870, 1920, 1970, 2198, 2402, 2586, 2754, 2907, 3047, 3175, 3291, 3492, 3652, 3773, 3856, 3905, 3921, 3899, 3849, 3783, 3708, 3627, 3544, 3460, 3378, 2998, 2685, 2432, 2226, 2055, 1911, 1789, 1683, 1508, 1370, 1257, 1163, 1084, 1015, 955.9, 903.7, 857.5, 816.2, 779.1, 745.5, 714.9, 687.1 };
 …
 name [37] = "G4_Mo";
-Znum [37] = 42;
 G4double e37[78] = { 58.22, 68.98, 77.79, 85.4, 92.16, 103.9, 114.1, 123.1, 131.3, 138.8, 145.8, 152.4, 167.3, 180.5, 192.5, 203.5, 213.8, 223.4, 232.4, 241, 256.9, 271.6, 285.1, 297.8, 309.8, 321.1, 331.8, 342.1, 351.9, 361.3, 370.3, 379, 387.4, 395.5, 432.4, 464.5, 492.9, 518.2, 541, 561.6, 580.4, 597.4, 626.9, 651.2, 671.2, 687.3, 700.1, 710, 717.3, 722.3, 725.4, 726.7, 726.5, 725, 722.3, 718.8, 690.9, 655, 617.8, 582.6, 552.1, 525.7, 502.3, 481.5, 445.5, 415.5, 389.9, 367.7, 348.1, 330.6, 314.8, 300.9, 288.6, 277.3, 266.9, 257.6, 249, 241.2 };
 …
 name [38] = "G4_MUSCLE_WITH_SUCROSE";
-Znum [38] = 0;
 G4double e38[78] = { 111.7, 137.5, 159.4, 178.8, 196.5, 227.9, 255.7, 281, 304.4, 326.2, 346.7, 366.2, 411.2, 452, 489.7, 525, 558.1, 589.5, 619.5, 648.1, 702.2, 752.5, 799.9, 844.6, 887.2, 927.9, 966.8, 1004, 1040, 1075, 1108, 1141, 1172, 1203, 1343, 1467, 1576, 1674, 1762, 1841, 1912, 1975, 2081, 2165, 2230, 2277, 2310, 2331, 2342, 2344, 2339, 2329, 2313, 2293, 2270, 2244, 2074, 1896, 1739, 1607, 1494, 1398, 1314, 1241, 1120, 1022, 942.4, 875.3, 818.1, 768.9, 725.8, 687.7, 653.9, 623.7, 596.4, 571.7, 549.2, 528.6 };
 …
 name [39] = "G4_MUSCLE_WITHOUT_SUCROSE";
-Znum [39] = 0;
 G4double e39[78] = { 108.2, 133.5, 155, 174.1, 191.4, 222.4, 249.8, 274.8, 297.8, 319.3, 339.6, 358.9, 403.3, 443.7, 481, 515.9, 548.7, 579.8, 609.5, 637.9, 691.4, 741.4, 788.3, 832.7, 875, 915.3, 953.9, 991.1, 1027, 1061, 1095, 1127, 1158, 1189, 1328, 1451, 1560, 1658, 1745, 1824, 1895, 1958, 2065, 2150, 2215, 2263, 2298, 2320, 2332, 2335, 2331, 2321, 2306, 2287, 2265, 2240, 2075, 1901, 1746, 1613, 1501, 1404, 1320, 1247, 1125, 1027, 946.2, 878.8, 821.4, 772, 728.6, 690.4, 656.4, 626.1, 598.7, 573.9, 551.3, 530.6 };
 …
 name [40] = "G4_MUSCLE_SKELETAL_ICRP";
-Znum [40] = 0;
 G4double e40[78] = { 104.5, 129.2, 150.2, 168.8, 185.8, 216.1, 242.9, 267.4, 290, 311.1, 331, 349.8, 393.5, 433.1, 469.7, 503.9, 536.2, 566.7, 595.9, 623.7, 676.3, 725.4, 771.5, 815.1, 856.6, 896.2, 934.1, 970.6, 1006, 1040, 1072, 1104, 1135, 1165, 1302, 1422, 1530, 1626, 1712, 1790, 1860, 1922, 2029, 2113, 2178, 2228, 2263, 2286, 2299, 2304, 2302, 2293, 2280, 2262, 2242, 2218, 2059, 1888, 1735, 1604, 1492, 1396, 1312, 1240, 1118, 1021, 941.1, 874.1, 817, 767.9, 724.9, 686.8, 653.1, 622.9, 595.7, 571, 548.6, 528 };
 …
 name [41] = "G4_MUSCLE_STRIATED_ICRU";
-Znum [41] = 0;
 G4double e41[78] = { 104.7, 129.4, 150.5, 169.2, 186.2, 216.5, 243.4, 267.9, 290.5, 311.7, 331.6, 350.5, 394.2, 433.9, 470.6, 504.9, 537.2, 567.8, 596.9, 624.9, 677.5, 726.7, 772.8, 816.5, 858.1, 897.8, 935.8, 972.3, 1007, 1041, 1074, 1106, 1137, 1167, 1304, 1425, 1532, 1629, 1715, 1793, 1863, 1925, 2032, 2116, 2181, 2230, 2265, 2289, 2302, 2306, 2304, 2295, 2282, 2264, 2244, 2220, 2063, 1894, 1742, 1611, 1498, 1401, 1318, 1244, 1123, 1025, 944.5, 877.2, 819.9, 770.6, 727.3, 689.2, 655.3, 625, 597.7, 572.9, 550.4, 529.7 };
 …
 name [42] = "G4_N";
-Znum [42] = 7;
 G4double e42[78] = { 82.8, 103.7, 121.6, 137.7, 152.3, 178.7, 202.3, 223.8, 243.8, 262.5, 280.2, 297.1, 336.2, 372, 405.1, 436.2, 465.5, 493.4, 520.1, 545.7, 594.1, 639.3, 682, 722.5, 761, 797.9, 833.4, 867.4, 900.3, 932, 962.8, 992.5, 1021, 1049, 1179, 1293, 1395, 1486, 1567, 1640, 1706, 1765, 1864, 1940, 1999, 2041, 2069, 2086, 2093, 2091, 2083, 2069, 2051, 2030, 2005, 1978, 1819, 1660, 1522, 1406, 1308, 1224, 1151, 1088, 982.9, 898.5, 829.5, 771.1, 721.3, 678.5, 641, 608, 578.6, 552.3, 528.5, 506.9, 487.2, 469.1 };
 …
 name [43] = "G4_SODIUM_IODIDE";
-Znum [43] = 0;
 G4double e43[78] = { 35.86, 44.19, 51.24, 57.48, 63.13, 73.21, 82.12, 90.2, 97.64, 104.6, 111.1, 117.3, 131.6, 144.5, 156.4, 167.6, 178, 187.9, 197.3, 206.3, 223.3, 239.1, 253.9, 268, 281.3, 294, 306.2, 317.9, 329.2, 340.1, 350.6, 360.8, 370.6, 380.2, 424.5, 463.5, 498.4, 529.9, 558.2, 583.8, 607, 627.8, 663.4, 691.6, 713.4, 729.6, 740.9, 748.1, 751.7, 752.4, 750.7, 747, 741.7, 735.1, 727.6, 719.5, 664.4, 611.2, 569.4, 538.3, 514, 491.6, 472.1, 454, 422.9, 393.7, 370.2, 349.6, 331.4, 315.3, 301.2, 288.5, 276.8, 266.1, 256.3, 247.1, 238.9, 231.5 };
 …
 name [44] = "G4_Ne";
-Znum [44] = 10;
 G4double e44[78] = { 68.73, 83.7, 96.26, 107.3, 117.2, 134.8, 150.3, 164.2, 177, 188.8, 199.9, 210.4, 234.5, 256.2, 276.1, 294.6, 311.9, 328.3, 343.8, 358.6, 386.3, 412, 436.1, 458.8, 480.3, 500.8, 520.3, 539.1, 557.1, 574.5, 591.2, 607.5, 623.2, 638.4, 708.4, 770.3, 825.6, 875.7, 921.2, 962.8, 1001, 1036, 1098, 1150, 1194, 1230, 1260, 1285, 1304, 1319, 1330, 1338, 1343, 1344, 1344, 1341, 1296, 1229, 1160, 1095, 1035, 981.4, 932.6, 888.5, 812.1, 748.3, 695.6, 650.4, 611.3, 577, 546.8, 520, 496, 474.4, 454.8, 437, 420.7, 405.7 };
 …
 name [45] = "G4_NYLON-6/6";
-Znum [45] = 0;
 G4double e45[78] = { 167.4, 201.6, 230.3, 255.4, 278, 317.9, 352.9, 384.4, 413.4, 440.3, 465.5, 489.3, 544, 593.3, 638.6, 680.6, 720.1, 757.3, 792.7, 826.4, 889.7, 948.5, 1003, 1055, 1104, 1151, 1195, 1238, 1279, 1318, 1356, 1392, 1427, 1461, 1617, 1750, 1867, 1969, 2059, 2138, 2207, 2267, 2363, 2433, 2482, 2512, 2527, 2531, 2525, 2511, 2491, 2467, 2439, 2408, 2375, 2340, 2160, 1987, 1830, 1690, 1567, 1463, 1374, 1297, 1169, 1066, 981.3, 910.8, 850.9, 799.3, 754.1, 714.4, 679, 647.4, 618.9, 593, 569.5, 547.9 };
 …
 name [46] = "G4_O";
-Znum [46] = 8;
 G4double e46[78] = { 105.8, 117.3, 257.6, 1.139e-05, 5.976e-06, 0.005, 248.1, 71.83, 352, 3.186e-05, 2.012e-05, 0.015, 412.7, 40.96, 503.1, 6.782e-05, 5.098e-05, 0.035, 610.6, 24.07, 700.7, 0.0001156, 9.613e-05, 0.07, 820, 15.89, 884.2, 0.0001583, 0.0001354, 0.125, 1124, 8.719, 1280, 0.0002775, 0.0002641, 0.3, 1573, 4.478, 1697, 0.0004528, 0.000448, 0.65, 1818, 2.655, 1822, 0.0006468, 0.0006403, 1, 1667, 1.474, 1431, 0.00138, 0.001539, 2.75, 1038, 0.7076, 860.9, 0.003906, 0.004519, 6, 616.1, 0.3845, 556.8, 0.009419, 0.01034, 9.5, 452, 0.2295, 334.7, 0.03447, 0.04325, 27.5, 196.3, 0.09039, 156.5, 0.1784, 0.2149, 60 };
 …
 name [47] = "G4_PARAFFIN";
-Znum [47] = 0;
 G4double e47[78] = { 193.8, 233, 265.8, 294.4, 320.3, 365.9, 405.9, 441.9, 475, 505.7, 534.5, 561.7, 624.2, 680.6, 732.3, 780.4, 825.5, 868.2, 908.6, 947.2, 1020, 1087, 1150, 1209, 1265, 1319, 1370, 1419, 1465, 1510, 1554, 1595, 1636, 1675, 1852, 2004, 2137, 2253, 2354, 2442, 2518, 2584, 2688, 2762, 2810, 2837, 2848, 2845, 2831, 2810, 2782, 2749, 2713, 2674, 2633, 2592, 2381, 2184, 2007, 1851, 1714, 1598, 1500, 1414, 1272, 1158, 1066, 988.4, 922.7, 866.1, 816.7, 773.2, 734.5, 699.9, 668.8, 640.6, 614.9, 591.4 };
 …
 name [48] = "G4_Pb";
-Znum [48] = 82;
 G4double e48[78] = { 17.96, 22.18, 25.76, 28.92, 31.8, 36.93, 41.47, 45.6, 49.4, 52.95, 56.3, 59.46, 66.77, 73.41, 79.52, 85.23, 90.6, 95.69, 100.5, 105.2, 113.9, 122, 129.7, 136.9, 143.8, 150.3, 156.6, 162.7, 168.5, 174.1, 179.5, 184.8, 189.9, 194.9, 217.7, 237.9, 256, 272.3, 287, 300.4, 312.6, 323.6, 342.6, 358.2, 370.7, 380.6, 388.3, 394.2, 398.4, 401.3, 403.1, 404, 404.1, 403.5, 402.4, 401, 392.5, 380.4, 365.3, 348.6, 332, 317.6, 304.9, 293.7, 274.4, 258.3, 244.7, 232.9, 222.5, 213.2, 205, 197.5, 190.7, 184.4, 178.7, 173.4, 168.4, 163.9 };
 …
 name [49] = "G4_PHOTOGRAPHIC_EMULSION";
-Znum [49] = 0;
 G4double e49[78] = { 46.69, 57.18, 66.06, 73.91, 81.04, 93.75, 105, 115.2, 124.7, 133.5, 141.8, 149.6, 167.8, 184.3, 199.6, 213.8, 227.3, 240, 252.1, 263.8, 285.7, 306.2, 325.4, 343.6, 361, 377.5, 393.4, 408.7, 423.3, 437.5, 451.2, 464.5, 477.3, 489.8, 547, 597.3, 641.7, 681.2, 716.3, 747.6, 775.5, 800.2, 841.5, 873.5, 897.8, 915.8, 928.6, 937.1, 940, 938.4, 933.8, 927, 918.6, 909.2, 899.1, 888.5, 833.7, 781.8, 735.1, 693.7, 657.1, 624.6, 595.5, 569.4, 524.5, 487.2, 455.6, 428.5, 404.9, 383.9, 365.2, 348.6, 333.8, 320.5, 308.3, 297.2, 287, 277.8 };
 …
 name [50] = "G4_PLASTIC_SC_VINYLTOLUENE";
-Znum [50] = 0;
 G4double e50[78] = { 192.4, 229.8, 260.8, 287.8, 312, 354.4, 391.4, 424.6, 454.8, 482.8, 509, 533.7, 590, 640.5, 686.6, 729.3, 769.2, 806.7, 842.2, 876, 939.2, 997.5, 1052, 1103, 1151, 1197, 1240, 1281, 1321, 1359, 1395, 1430, 1464, 1497, 1644, 1769, 1878, 1971, 2053, 2123, 2184, 2236, 2319, 2377, 2414, 2436, 2445, 2443, 2433, 2417, 2396, 2371, 2343, 2314, 2283, 2251, 2091, 1936, 1791, 1657, 1537, 1435, 1349, 1273, 1148, 1047, 964.8, 895.9, 837.3, 786.7, 742.4, 703.5, 668.8, 637.7, 609.7, 584.3, 561.2, 540 };
 …
 name [51] = "G4_POLYCARBONATE";
-Znum [51] = 0;
 G4double e51[78] = { 146.3, 178.1, 204.7, 228.1, 249.2, 286.4, 319.1, 348.5, 375.5, 400.6, 424.1, 446.2, 497, 542.8, 584.7, 623.5, 659.9, 694.2, 726.6, 757.6, 815.5, 869.1, 919, 965.9, 1010, 1052, 1092, 1130, 1167, 1202, 1235, 1268, 1299, 1329, 1465, 1581, 1681, 1768, 1843, 1908, 1965, 2013, 2090, 2144, 2180, 2201, 2210, 2209, 2202, 2188, 2170, 2149, 2125, 2099, 2072, 2044, 1912, 1785, 1661, 1543, 1433, 1340, 1261, 1191, 1076, 982.4, 906, 842, 787.5, 740.5, 699.2, 662.9, 630.5, 601.5, 575.3, 551.6, 529.9, 510.1 };
 …
 name [52] = "G4_POLYETHYLENE";
-Znum [52] = 0;
 G4double e52[78] = { 168.2, 205.8, 237.5, 265.4, 290.7, 335.4, 374.8, 410.5, 443.2, 473.7, 502.3, 529.3, 591.4, 647.6, 699.1, 747.1, 792.1, 834.6, 874.9, 913.5, 985.9, 1053, 1116, 1175, 1232, 1285, 1336, 1385, 1432, 1478, 1521, 1564, 1604, 1644, 1825, 1983, 2122, 2246, 2355, 2453, 2539, 2615, 2740, 2833, 2899, 2940, 2962, 2967, 2958, 2938, 2908, 2871, 2829, 2782, 2732, 2681, 2418, 2183, 1987, 1826, 1691, 1577, 1480, 1396, 1257, 1145, 1053, 977.1, 912.4, 856.5, 807.8, 764.9, 726.7, 692.6, 661.8, 633.9, 608.6, 585.4 };
 …
 name [53] = "G4_MYLAR";
-Znum [53] = 0;
 G4double e53[78] = { 163.2, 195.3, 221.8, 244.9, 265.6, 301.9, 333.5, 361.8, 387.6, 411.5, 433.8, 454.8, 502.7, 545.7, 584.8, 621, 654.8, 686.6, 716.7, 745.3, 798.7, 847.9, 893.8, 936.8, 977.4, 1016, 1052, 1087, 1121, 1153, 1183, 1213, 1241, 1269, 1393, 1500, 1593, 1673, 1744, 1806, 1860, 1908, 1985, 2042, 2083, 2110, 2126, 2133, 2133, 2126, 2115, 2100, 2082, 2061, 2038, 2014, 1874, 1731, 1599, 1482, 1379, 1290, 1215, 1148, 1038, 948.5, 875.3, 813.8, 761.5, 716.3, 676.6, 641.6, 610.5, 582.5, 557.3, 534.4, 513.6, 494.5 };
 …
 name [54] = "G4_PLEXIGLASS";
-Znum [54] = 0;
 G4double e54[78] = { 118.7, 146.6, 170.3, 191.4, 210.4, 244.5, 274.7, 302.1, 327.3, 350.9, 373.1, 394.2, 442.7, 486.8, 527.4, 565.2, 600.9, 634.6, 666.7, 697.4, 755.1, 808.9, 859.3, 906.9, 952, 995, 1036, 1075, 1113, 1150, 1185, 1219, 1252, 1283, 1428, 1554, 1665, 1762, 1848, 1923, 1990, 2049, 2144, 2216, 2266, 2300, 2320, 2328, 2327, 2318, 2302, 2282, 2259, 2232, 2203, 2173, 2008, 1847, 1702, 1574, 1464, 1369, 1288, 1217, 1099, 1004, 925.6, 860.1, 804.4, 756.3, 714.1, 676.9, 643.8, 614.2, 587.4, 563.2, 541.1, 520.8 };
 …
 name [55] = "G4_POLYPROPYLENE";
-Znum [55] = 0;
 G4double e55[78] = { 193.7, 232.8, 265.4, 293.9, 319.6, 365, 404.8, 440.6, 473.4, 503.9, 532.5, 559.6, 621.6, 677.5, 728.8, 776.5, 821.2, 863.4, 903.5, 941.8, 1014, 1080, 1142, 1201, 1257, 1309, 1360, 1408, 1454, 1499, 1541, 1583, 1622, 1661, 1836, 1986, 2117, 2231, 2331, 2417, 2492, 2557, 2660, 2732, 2779, 2806, 2817, 2814, 2801, 2780, 2752, 2720, 2684, 2646, 2606, 2565, 2359, 2165, 1991, 1836, 1700, 1585, 1488, 1403, 1263, 1150, 1058, 981.3, 916.1, 860, 810.9, 767.8, 729.5, 695.1, 664.3, 636.2, 610.8, 587.5 };
 …
 name [56] = "G4_POLYSTYRENE";
-Znum [56] = 0;
 G4double e56[78] = { 153, 187.5, 216.6, 242.2, 265.3, 306.5, 342.7, 375.5, 405.6, 433.6, 460, 484.9, 542.1, 593.8, 641.3, 685.4, 726.9, 766, 803.1, 838.5, 905, 966.6, 1024, 1078, 1130, 1178, 1225, 1269, 1312, 1352, 1392, 1429, 1466, 1501, 1661, 1797, 1915, 2017, 2106, 2183, 2249, 2305, 2394, 2454, 2492, 2511, 2516, 2509, 2494, 2471, 2443, 2410, 2376, 2339, 2301, 2262, 2070, 1895, 1742, 1609, 1493, 1395, 1312, 1239, 1119, 1021, 941.4, 874.6, 817.8, 768.7, 725.7, 687.9, 654.1, 623.9, 596.6, 571.9, 549.4, 528.7 };
 …
 name [57] = "G4_TEFLON";
-Znum [57] = 0;
 G4double e57[78] = { 82.7, 99.97, 114.4, 127.1, 138.4, 158.5, 176.2, 192, 206.5, 220, 232.6, 244.5, 271.9, 296.4, 319, 339.8, 359.4, 377.8, 395.3, 412, 443.3, 472.2, 499.3, 524.7, 548.8, 571.7, 593.6, 614.5, 634.6, 653.9, 672.5, 690.4, 707.8, 724.6, 801.6, 868.9, 928.6, 981.9, 1030, 1073, 1112, 1148, 1209, 1260, 1301, 1334, 1361, 1382, 1397, 1408, 1415, 1419, 1420, 1418, 1414, 1409, 1399, 1373, 1319, 1246, 1165, 1095, 1034, 979.4, 887.4, 813.7, 752.5, 700.8, 656.5, 618.1, 584.5, 554.8, 528.3, 504.6, 483, 463.5, 445.6, 429.3 };
 …
 name [58] = "G4_POLYVINYL_CHLORIDE";
-Znum [58] = 0;
 G4double e58[78] = { 94.27, 114.4, 131.3, 146.3, 159.9, 184, 205.5, 224.9, 242.9, 259.7, 275.5, 290.5, 325.3, 357, 386.3, 413.7, 439.5, 464.1, 487.6, 510.1, 552.6, 592.4, 629.9, 665.5, 699.4, 731.8, 762.9, 792.9, 821.8, 849.7, 876.7, 902.9, 928.2, 952.9, 1067, 1167, 1255, 1335, 1405, 1468, 1525, 1574, 1657, 1719, 1764, 1795, 1814, 1823, 1824, 1818, 1807, 1792, 1774, 1753, 1731, 1708, 1591, 1482, 1385, 1299, 1222, 1153, 1092, 1037, 941.7, 862.4, 795.8, 739.8, 692.3, 651.2, 615.4, 583.7, 555.6, 530.3, 507.5, 486.9, 468, 450.8 };
 …
 name [59] = "G4_PROPANE";
-Znum [59] = 0;
 G4double e59[78] = { 194.5, 234.7, 268.4, 298, 324.7, 372, 413.6, 451.2, 485.8, 518, 548.2, 576.8, 642.6, 702.2, 756.9, 808, 855.9, 901.2, 944.4, 985.6, 1063, 1135, 1203, 1267, 1327, 1385, 1440, 1492, 1543, 1592, 1639, 1684, 1728, 1770, 1964, 2131, 2277, 2404, 2516, 2613, 2698, 2771, 2887, 2969, 3022, 3053, 3065, 3061, 3046, 3021, 2990, 2953, 2912, 2868, 2822, 2775, 2564, 2372, 2191, 2022, 1868, 1739, 1629, 1534, 1377, 1252, 1150, 1065, 993, 931.1, 877.2, 829.9, 787.8, 750.2, 716.4, 685.8, 658, 632.5 };
 …
 name [60] = "G4_Pt";
-Znum [60] = 78;
 G4double e60[78] = { 14.45, 17.87, 20.78, 23.37, 25.71, 29.9, 33.61, 36.99, 40.1, 43.01, 45.75, 48.35, 54.36, 59.81, 64.84, 69.54, 73.97, 78.17, 82.17, 86, 93.22, 99.96, 106.3, 112.3, 118, 123.5, 128.7, 133.8, 138.7, 143.4, 147.9, 152.4, 156.7, 160.8, 180.3, 197.6, 213.3, 227.7, 240.9, 253, 264.3, 274.7, 293.2, 309, 322.4, 333.7, 343.1, 350.7, 356.8, 361.6, 365.1, 367.6, 369.1, 369.8, 369.9, 369.3, 364.7, 357, 347.3, 336.6, 325.5, 314.4, 303.6, 293.2, 274.3, 258.5, 245.1, 233.4, 223.1, 214, 205.8, 198.4, 191.6, 185.4, 179.7, 174.4, 169.5, 164.9 };
 …
 name [61] = "G4_Si";
-Znum [61] = 14;
 G4double e61[78] = { 47.32, 61.63, 74.34, 85.98, 96.82, 116.8, 135.1, 152.1, 168.2, 183.4, 198.1, 212.1, 245.3, 276.1, 305.2, 332.7, 359.1, 384.4, 408.7, 432.2, 477, 519.3, 559.4, 597.5, 633.9, 668.6, 701.9, 733.7, 764.3, 793.5, 821.6, 848.5, 874.4, 899.1, 1008, 1097, 1168, 1225, 1270, 1307, 1336, 1359, 1390, 1408, 1416, 1417, 1413, 1405, 1395, 1383, 1370, 1356, 1341, 1326, 1310, 1295, 1218, 1146, 1081, 1023, 970.6, 923.9, 881.4, 842.4, 773.1, 713.1, 661.2, 617.4, 579.7, 547, 518.2, 492.7, 470, 449.5, 430.9, 414, 398.6, 384.4 };
 …
 name [62] = "G4_SILICON_DIOXIDE";
-Znum [62] = 0;
 G4double e62[78] = { 68.9, 85.1, 98.85, 111, 122.1, 141.8, 159.3, 175.1, 189.8, 203.4, 216.3, 228.5, 256.6, 282.1, 305.7, 327.6, 348.3, 367.9, 386.5, 404.4, 437.9, 469.2, 498.5, 526.3, 552.6, 577.7, 601.7, 624.7, 646.9, 668.2, 688.8, 708.7, 728, 746.7, 832.2, 906.8, 972.6, 1031, 1083, 1129, 1170, 1207, 1268, 1315, 1351, 1377, 1396, 1409, 1417, 1421, 1421, 1419, 1414, 1406, 1397, 1387, 1349, 1301, 1237, 1163, 1087, 1021, 964, 913.7, 829.4, 762.2, 706.3, 659, 618.4, 583.3, 552.3, 524.9, 500.4, 478.4, 458.5, 440.4, 423.9, 408.7 };
 …
 name [63] = "G4_STILBENE";
-Znum [63] = 0;
 G4double e63[78] = { 192, 228.9, 259.4, 286, 309.7, 351.2, 387.4, 419.7, 449.2, 476.4, 501.9, 525.8, 580.4, 629.2, 673.8, 714.9, 753.3, 789.4, 823.5, 856, 916.5, 972.3, 1024, 1073, 1119, 1162, 1203, 1243, 1280, 1316, 1351, 1384, 1416, 1446, 1585, 1703, 1805, 1892, 1968, 2034, 2090, 2139, 2215, 2268, 2303, 2323, 2331, 2330, 2321, 2307, 2287, 2265, 2240, 2212, 2184, 2155, 1995, 1841, 1703, 1582, 1477, 1385, 1305, 1233, 1113, 1015, 936, 869.6, 813, 764.1, 721.3, 683.7, 650.1, 620, 592.9, 568.3, 545.9, 525.4 };
 …
 name [64] = "G4_Ti";
-Znum [64] = 22;
 G4double e64[78] = { 59.24, 72.81, 84.28, 94.41, 103.6, 119.9, 134.3, 147.4, 159.4, 170.6, 181.1, 191.1, 214, 234.7, 253.8, 271.6, 288.3, 304.1, 319.1, 333.5, 360.5, 385.5, 409, 431.2, 452.2, 472.2, 491.4, 509.7, 527.3, 544.3, 560.6, 576.4, 591.7, 606.5, 674.2, 733.1, 785, 831, 871.7, 907.9, 940, 968.3, 1015, 1051, 1077, 1095, 1106, 1112, 1114, 1112, 1107, 1100, 1092, 1082, 1071, 1059, 995.6, 933.7, 877.6, 827.9, 785.2, 747.8, 714.5, 684.4, 631.9, 587.1, 548.3, 514.3, 484.2, 457.3, 433.4, 412.5, 393.7, 376.7, 361.5, 347.6, 334.9, 323.2 };
 …
 name [65] = "G4_Sn";
-Znum [65] = 50;
 G4double e65[78] = { 27.39, 33.96, 39.55, 44.52, 49.04, 57.11, 64.28, 70.8, 76.82, 82.45, 87.76, 92.79, 104.4, 115, 124.8, 133.9, 142.5, 150.6, 158.4, 165.8, 179.8, 192.9, 205.2, 216.8, 227.8, 238.4, 248.4, 258.1, 267.4, 276.4, 285.1, 293.5, 301.6, 309.5, 345.7, 377.3, 405.3, 430.1, 452.1, 471.8, 489.3, 504.8, 530.7, 550.9, 566.3, 577.9, 586.3, 592.2, 596.1, 598.4, 599.3, 599.1, 598.1, 596.4, 594.2, 591.5, 573.8, 552.8, 531.2, 510.1, 488.3, 467, 447, 428.6, 396.3, 369.4, 346.8, 327.7, 311.4, 297.1, 283.9, 271.9, 260.8, 250.6, 241.7, 233.6, 226, 218.9 };
 …
 name [66] = "G4_TISSUE_METHANE";
-Znum [66] = 0;
 G4double e66[78] = { 135.1, 165.6, 191.3, 213.9, 234.4, 270.7, 302.8, 331.8, 358.4, 383.2, 406.5, 428.6, 479.3, 525.2, 567.4, 606.7, 643.6, 678.5, 711.7, 743.4, 803.1, 858.6, 910.7, 960.1, 1007, 1052, 1095, 1136, 1176, 1214, 1251, 1287, 1322, 1356, 1514, 1655, 1783, 1899, 2006, 2104, 2193, 2275, 2418, 2535, 2626, 2693, 2737, 2760, 2764, 2752, 2728, 2695, 2655, 2612, 2566, 2519, 2278, 2060, 1878, 1727, 1602, 1494, 1403, 1323, 1191, 1085, 998.2, 926, 864.6, 811.7, 765.6, 724.9, 688.8, 656.5, 627.4, 601.1, 577.1, 555.2 };
 …
 name [67] = "G4_TISSUE_PROPANE";
-Znum [67] = 0;
 G4double e67[78] = { 149.7, 181.5, 208.2, 231.7, 252.8, 290.4, 323.5, 353.4, 380.9, 406.5, 430.5, 453.3, 505.7, 553, 596.6, 637.2, 675.4, 711.5, 745.8, 778.6, 840.4, 897.8, 951.6, 1003, 1051, 1097, 1141, 1183, 1224, 1263, 1301, 1337, 1372, 1407, 1563, 1701, 1822, 1929, 2024, 2109, 2185, 2252, 2362, 2446, 2507, 2549, 2573, 2583, 2581, 2569, 2550, 2524, 2494, 2461, 2426, 2389, 2211, 2043, 1887, 1744, 1616, 1507, 1415, 1334, 1201, 1094, 1006, 933.3, 871.4, 818.1, 771.5, 730.5, 694.1, 661.5, 632.1, 605.6, 581.4, 559.3 };
 …
 name [68] = "G4_TOLUENE";
-Znum [68] = 0;
 G4double e68[78] = { 192.5, 230, 261, 288.1, 312.3, 354.9, 392, 425.3, 455.6, 483.7, 510, 534.8, 591.3, 642.1, 688.4, 731.3, 771.4, 809.1, 844.8, 878.8, 942.4, 1001, 1056, 1107, 1155, 1201, 1245, 1287, 1327, 1365, 1401, 1437, 1471, 1504, 1652, 1779, 1888, 1983, 2065, 2136, 2197, 2250, 2333, 2392, 2430, 2452, 2461, 2459, 2449, 2433, 2411, 2386, 2358, 2328, 2296, 2264, 2109, 1960, 1817, 1683, 1560, 1456, 1368, 1291, 1163, 1060, 976.6, 906.6, 847.1, 795.7, 750.8, 711.3, 676.1, 644.6, 616.2, 590.5, 567, 545.6 };
 …
 name [69] = "G4_U";
-Znum [69] = 92;
 G4double e69[78] = { 13.2, 16.72, 19.77, 22.52, 25.04, 29.61, 33.73, 37.51, 41.03, 44.35, 47.5, 50.51, 57.52, 63.96, 69.97, 75.62, 80.99, 86.11, 91.01, 95.73, 104.7, 113.1, 121.1, 128.7, 136, 143, 149.8, 156.3, 162.6, 168.8, 174.7, 180.5, 186.2, 191.7, 217.4, 240.5, 261.5, 280.8, 298.5, 314.8, 329.8, 343.7, 368, 388.4, 405.3, 419, 429.8, 438.1, 444.2, 448.4, 450.8, 451.8, 451.6, 450.3, 448.2, 445.4, 420, 390.1, 362.9, 339.6, 319.8, 303.1, 288.9, 276.7, 256.9, 241.7, 229.4, 218.6, 209.1, 200.6, 193, 186.1, 179.8, 174, 168.6, 163.7, 159.1, 154.8 };
 …
 name [70] = "G4_W";
-Znum [70] = 74;
 G4double e70[78] = { 20.75, 25.23, 28.99, 32.29, 35.26, 40.51, 45.11, 49.26, 53.06, 56.59, 59.9, 63.02, 70.18, 76.63, 82.54, 88.02, 93.16, 98.01, 102.6, 107, 115.2, 122.9, 130, 136.7, 143.1, 149.2, 155, 160.6, 165.9, 171.1, 176.1, 180.9, 185.6, 190.1, 211.1, 229.6, 246.2, 261.3, 275.1, 287.7, 299.3, 310, 328.8, 344.7, 358.1, 369.2, 378.3, 385.6, 391.3, 395.6, 398.7, 400.6, 401.7, 401.9, 401.4, 400.4, 389.5, 374.8, 359.5, 344.8, 331, 318.3, 306.5, 295.7, 276.7, 260.8, 247.3, 235.5, 225.2, 216.1, 207.8, 200.3, 193.5, 187.3, 181.5, 176.2, 171.3, 166.7 };
 …
 name [71] = "G4_WATER";
-Znum [71] = 0;
 G4double e71[78] = { 98.91, 122.7, 143.1, 161.1, 177.5, 206.9, 233, 256.8, 278.8, 299.3, 318.6, 337, 379.5, 418.1, 453.8, 487.1, 518.6, 548.3, 576.7, 603.9, 655.2, 703, 748, 790.5, 831, 869.6, 906.6, 942.2, 976.4, 1009, 1041, 1072, 1102, 1131, 1265, 1383, 1488, 1582, 1666, 1743, 1811, 1873, 1978, 2062, 2128, 2178, 2215, 2240, 2255, 2262, 2262, 2256, 2245, 2230, 2211, 2190, 2050, 1896, 1752, 1624, 1511, 1414, 1329, 1255, 1132, 1034, 952.7, 884.8, 826.9, 777.1, 733.4, 694.9, 660.7, 630.1, 602.5, 577.6, 554.8, 534 };
 …
 name [72] = "G4_WATER_VAPOR";
-Znum [72] = 0;
 G4double e72[78] = { 126.3, 154.7, 178.7, 199.8, 218.8, 252.7, 282.5, 309.5, 334.3, 357.3, 379, 399.5, 446.7, 489.3, 528.5, 565, 599.2, 631.6, 662.4, 691.9, 747.3, 798.8, 847.2, 892.9, 936.3, 977.8, 1018, 1056, 1093, 1128, 1163, 1196, 1228, 1260, 1405, 1535, 1652, 1758, 1855, 1942, 2022, 2094, 2216, 2309, 2377, 2422, 2446, 2455, 2453, 2446, 2436, 2423, 2409, 2392, 2371, 2346, 2169, 1971, 1797, 1653, 1537, 1437, 1351, 1275, 1149, 1049, 965.8, 896.6, 837.6, 786.9, 742.5, 703.3, 668.6, 637.5, 609.5, 584.2, 561.1, 539.9 };
 …
 name [73] = "G4_Xe";
-Znum [73] = 54;
 G4double e73[78] = { 18.11, 23.3, 27.86, 31.99, 35.83, 42.84, 49.2, 55.1, 60.63, 65.87, 70.87, 75.65, 86.89, 97.3, 107.1, 116.3, 125.1, 133.5, 141.7, 149.5, 164.4, 178.6, 192, 204.9, 217.3, 229.2, 240.7, 251.8, 262.6, 273.1, 283.4, 293.3, 303, 312.5, 356.7, 396.5, 432.5, 465.2, 494.9, 521.8, 546.1, 567.9, 604.7, 633.2, 654.5, 669.3, 678.8, 683.6, 684.6, 682.5, 678, 671.7, 663.9, 655.1, 645.6, 635.6, 584.6, 538.7, 500.4, 468.8, 446.7, 430.5, 417.1, 405.3, 383.9, 364, 344.9, 326.8, 309.7, 294.6, 281.3, 269.5, 258.7, 248.8, 239.6, 231.1, 223.2, 216.2 };

trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BetheBlochModel.cc,v 1.13 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4BetheBlochModel.cc,v 1.25 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 13-02-03 Add name (V.Ivanchenko)
 // 24-03-05 Add G4EmCorrections (V.Ivanchenko)
 // 11-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
+// 11-04-05 Major optimisation of internal interfaces (V.Ivanchenko)
 // 11-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
 // 12-02-06 move G4LossTableManager::Instance()->EmCorrections()
 //          in constructor (mma)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 //
 // -------------------------------------------------------------------
 …
 #include "G4EmCorrections.hh"
 #include "G4ParticleChangeForLoss.hh"
+#include "G4NistManager.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
                                      const G4String& nam)
   : G4VEmModel(nam),
+  particle(0),
+  tlimit(DBL_MAX),
+  twoln10(2.0*log(10.0)),
+  bg2lim(0.0169),
+  taulim(8.4146e-3),
+  isIon(false)
+{
+    particle(0),
+    tlimit(DBL_MAX),
+    twoln10(2.0*log(10.0)),
+    bg2lim(0.0169),
+    taulim(8.4146e-3),
+    isIon(false),
+    isInitialised(false)
+{
+  fParticleChange = 0;
   if(p) SetParticle(p);
   theElectron = G4Electron::Electron();
   corr = G4LossTableManager::Instance()->EmCorrections();
+  nist = G4NistManager::Instance();
+  SetLowEnergyLimit(2.0*MeV);
+}
 …
+{
   if (!particle) SetParticle(p);
+  G4String pname = particle->GetParticleName();
+  if (particle->GetParticleType() == "nucleus" &&
+     pname != "deuteron" && pname != "triton") isIon = true;
+  if (pParticleChange)
+    fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
+                                                              (pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForLoss();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BetheBlochModel::ComputeCrossSectionPerElectron(
+                                           const G4ParticleDefinition* p,
+                                                 G4double kineticEnergy,
+                                                 G4double cutEnergy,
+                                                 G4double maxKinEnergy)
+  corrFactor = chargeSquare;
+  // always false before the run
+  SetDeexcitationFlag(false);
+  if(!isInitialised) {
+    isInitialised = true;
+    if(!fParticleChange) {
+      if (pParticleChange) {
+        fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
+          (pParticleChange);
+      } else {
+        fParticleChange = new G4ParticleChangeForLoss();
+      }
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4BetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+{
+  if(particle != p) {
+    particle = p;
+    G4String pname = particle->GetParticleName();
+    if (particle->GetParticleType() == "nucleus" &&
+        pname != "deuteron" && pname != "triton") {
+      isIon = true;
+    }
+    mass = particle->GetPDGMass();
+    spin = particle->GetPDGSpin();
+    G4double q = particle->GetPDGCharge()/eplus;
+    chargeSquare = q*q;
+    ratio = electron_mass_c2/mass;
+    G4double magmom = particle->GetPDGMagneticMoment()
+      *mass/(0.5*eplus*hbar_Planck*c_squared);
+    magMoment2 = magmom*magmom - 1.0;
+    formfact = 0.0;
+    if(particle->GetLeptonNumber() == 0) {
+      G4double x = 0.8426*GeV;
+      if(spin == 0.0 && mass < GeV) {x = 0.736*GeV;}
+      else if(mass > GeV) {
+        x /= nist->GetZ13(mass/proton_mass_c2);
+        //      tlimit = 51.2*GeV*A13[iz]*A13[iz];
+      }
+      formfact = 2.0*electron_mass_c2/(x*x);
+      tlimit   = 2.0/formfact;
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BetheBlochModel::GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                                 const G4Material* mat,
+                                                 G4double kineticEnergy)
+{
+  // this method is called only for ions
+  G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,kineticEnergy);
+  corrFactor = q2*corr->EffectiveChargeCorrection(p,mat,kineticEnergy);
+  return corrFactor;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BetheBlochModel::GetParticleCharge(const G4ParticleDefinition* p,
+                                              const G4Material* mat,
+                                              G4double kineticEnergy)
+{
+  // this method is called only for ions
+  return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double
+G4BetheBlochModel::ComputeCrossSectionPerElectron(const G4ParticleDefinition* p,
+                                                  G4double kineticEnergy,
+                                                  G4double cutEnergy,
+                                                  G4double maxKinEnergy)
+{
   G4double cross = 0.0;
 …
     G4double beta2     = kineticEnergy*(kineticEnergy + 2.0*mass)/energy2;
+    cross = 1.0/cutEnergy - 1.0/maxEnergy - beta2*log(maxEnergy/cutEnergy)/tmax;
+    cross = 1.0/cutEnergy - 1.0/maxEnergy
+      - beta2*log(maxEnergy/cutEnergy)/tmax;
     // +term for spin=1/2 particle
     if( 0.5 == spin ) cross += 0.5*(maxEnergy - cutEnergy)/energy2;
+    // High order correction different for hadrons and ions
+    // nevetheless they are applied to reduce high energy transfers
+    //    if(!isIon)
+    //cross += corr->FiniteSizeCorrectionXS(p,currentMaterial,
+    //                                    kineticEnergy,cutEnergy);
     cross *= twopi_mc2_rcl2*chargeSquare/beta2;
 …
                                                  G4double maxEnergy)
+{
+  currentMaterial   = material;
   G4double eDensity = material->GetElectronDensity();
   G4double cross = eDensity*ComputeCrossSectionPerElectron
 …
   dedx *= twopi_mc2_rcl2*chargeSquare*eDensity/beta2;
+  //High order correction only for hadrons
+  if(!isIon) dedx += corr->HighOrderCorrections(p,material,kineticEnergy);
+  //High order correction different for hadrons and ions
+  if(isIon) {
+    dedx += corr->IonBarkasCorrection(p,material,kineticEnergy);
+  } else {
+    dedx += corr->HighOrderCorrections(p,material,kineticEnergy,cutEnergy);
+  }
   return dedx;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
+                                             const G4DynamicParticle* dp,
+                                             G4double& eloss,
+                                             G4double&,
+                                             G4double length)
+{
+  const G4ParticleDefinition* p = dp->GetDefinition();
+  const G4Material* mat = couple->GetMaterial();
+  G4double preKinEnergy = dp->GetKineticEnergy();
+  G4double e = preKinEnergy - eloss*0.5;
+  if(e < 0.0) e = preKinEnergy*0.5;
+  if(isIon) {
+    G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,e);
+    GetModelOfFluctuations()->SetParticleAndCharge(p, q2);
+    eloss *= q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor;
+    eloss += length*corr->IonHighOrderCorrections(p,couple,e);
+  }
+  if(nuclearStopping && preKinEnergy*proton_mass_c2/mass < chargeSquare*100.*MeV) {
+    G4double nloss = length*corr->NuclearDEDX(p,mat,e,false);
+    // too big energy loss
+    if(eloss + nloss > preKinEnergy) {
+      nloss *= (preKinEnergy/(eloss + nloss));
+      eloss = preKinEnergy;
+    } else {
+      eloss += nloss;
+    }
+    /*
+    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
+           << " de= " << eloss << " NIEL= " << nloss
+           << " dynQ= " << dp->GetCharge()/eplus << G4endl;
+    */
+    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
 …
   G4double tmax = MaxSecondaryEnergy(dp->GetDefinition(),kineticEnergy);
   G4double maxKinEnergy = min(maxEnergy,tmax);
+  G4double maxKinEnergy = std::min(maxEnergy,tmax);
   if(minKinEnergy >= maxKinEnergy) return;
 …
   G4double beta2         = kineticEnergy*(kineticEnergy + 2.0*mass)/etot2;
+  G4double deltaKinEnergy, f;
+  // sampling follows ...
+  G4double deltaKinEnergy, f;
+  G4double f1 = 0.0;
+  G4double fmax = 1.0;
+  if( 0.5 == spin ) fmax += 0.5*maxKinEnergy*maxKinEnergy/etot2;
+  // sampling without nuclear size effect
   do {
     G4double q = G4UniformRand();
 …
     f = 1.0 - beta2*deltaKinEnergy/tmax;
+    if( 0.5 == spin ) f += 0.5*deltaKinEnergy*deltaKinEnergy/etot2;
+    if(f > 1.0) {
+        G4cout << "G4BetheBlochModel::SampleSecondary Warning! "
+               << "Majorant 1.0 < "
+               << f << " for Edelta= " << deltaKinEnergy
+               << G4endl;
+    }
+  } while( G4UniformRand() > f );
+    if( 0.5 == spin ) {
+      f1 = 0.5*deltaKinEnergy*deltaKinEnergy/etot2;
+      f += f1;
+    }
+  } while( fmax*G4UniformRand() > f);
+  // projectile formfactor - suppresion of high energy
+  // delta-electron production at high energy
+  G4double x = formfact*deltaKinEnergy;
+  if(x > 1.e-6) {
+    G4double x1 = 1.0 + x;
+    G4double g  = 1.0/(x1*x1);
+    if( 0.5 == spin ) {
+      G4double x2 = 0.5*electron_mass_c2*deltaKinEnergy/(mass*mass);
+      g *= (1.0 + magMoment2*(x2 - f1/f)/(1.0 + x2));
+    }
+    if(g > 1.0) {
+      G4cout << "### G4BetheBlochModel WARNING: g= " << g
+             << dp->GetDefinition()->GetParticleName()
+             << " Ekin(MeV)= " <<  kineticEnergy
+             << " delEkin(MeV)= " << deltaKinEnergy
+             << G4endl;
+    }
+    if(G4UniformRand() > g) return;
+  }
+  // delta-electron is produced
   G4double totMomentum = totEnergy*sqrt(beta2);
   G4double deltaMomentum =
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BetheBlochModel::MaxSecondaryEnergy(const G4ParticleDefinition* pd,
+                                               G4double kinEnergy)
+{
+  if(isIon) SetParticle(pd);
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return std::min(tmax,tlimit);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BetheHeitlerModel.cc,v 1.11 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BetheHeitlerModel.cc,v 1.12 2008/10/15 15:54:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForGamma.hh"
+#include "G4LossTableManager.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   : G4VEmModel(nam),
     theCrossSectionTable(0),
+    nbins(200)
+{
+    nbins(10)
+{
+  fParticleChange = 0;
   theGamma    = G4Gamma::Gamma();
   thePositron = G4Positron::Positron();
 …
                                      const G4DataVector&)
+{
+  if(pParticleChange)
+    fParticleChange = reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForGamma();
+  if(!fParticleChange) {
+    if(pParticleChange) {
+      fParticleChange = reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
+    } else {
+      fParticleChange = new G4ParticleChangeForGamma();
+    }
+  }
   if(theCrossSectionTable) {
 …
   G4double emin = LowEnergyLimit();
   G4double emax = HighEnergyLimit();
+  G4int n = nbins*G4int(log10(emax/emin));
+  G4bool spline = G4LossTableManager::Instance()->SplineFlag();
   G4double e, value;
   for(size_t j=0; j<nvect ; j++) {
+    ptrVector  = new G4PhysicsLogVector(emin, emax, nbins);
+    ptrVector  = new G4PhysicsLogVector(emin, emax, n);
+    ptrVector->SetSpline(spline);
     G4double Z = (*theElementTable)[j]->GetZ();
     G4int   iz = G4int(Z);

trunk/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BohrFluctuations.cc,v 1.6 2007/09/27 14:02:41 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BohrFluctuations.cc,v 1.7 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4BohrFluctuations::Dispersion(const G4Material* material,
+                                        const G4DynamicParticle* dp,
+                                        G4double& tmax,
+                                        G4double& length)
+{
+  if(!particle) InitialiseMe(dp->GetDefinition());
+  G4double electronDensity = material->GetElectronDensity();
+  kineticEnergy = dp->GetKineticEnergy();
+  G4double etot = kineticEnergy + particleMass;
+  beta2 = kineticEnergy*(kineticEnergy + 2.0*particleMass)/(etot*etot);
+  G4double siga  = (1.0/beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
+                 * electronDensity * chargeSquare;
+  return siga;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggIonModel.cc,v 1.17 2007/07/28 13:30:53 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4BraggIonModel.cc,v 1.23 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 25-04-06 Add stopping data from ASTAR (V.Ivanchenko)
 // 23-10-06 Reduce lowestKinEnergy to 0.25 keV (V.Ivanchenko)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 //
 …
 #include "G4Electron.hh"
 #include "G4ParticleChangeForLoss.hh"
+#include "G4LossTableManager.hh"
+#include "G4EmCorrections.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
                                  const G4String& nam)
   : G4VEmModel(nam),
+  particle(0),
+  iMolecula(0),
+  isIon(false)
+    corr(0),
+    particle(0),
+    fParticleChange(0),
+    iMolecula(0),
+    isIon(false),
+    isInitialised(false)
+{
   if(p) SetParticle(p);
   highKinEnergy    = 2.0*MeV;
+  lowKinEnergy     = 0.0*MeV;
+  SetHighEnergyLimit(2.0*MeV);
   HeMass           = 3.727417*GeV;
   rateMassHe2p     = HeMass/proton_mass_c2;
 …
+{
   if(p != particle) SetParticle(p);
+  G4String pname = particle->GetParticleName();
+  if(particle->GetParticleType() == "nucleus" &&
+     pname != "deuteron" && pname != "triton") isIon = true;
+  if(pParticleChange)
+    fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
+                                                              (pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForLoss();
+  corrFactor = chargeSquare;
+  // always false before the run
+  SetDeexcitationFlag(false);
+  if(!isInitialised) {
+    isInitialised = true;
+    G4String pname = particle->GetParticleName();
+    if(particle->GetParticleType() == "nucleus" &&
+       pname != "deuteron" && pname != "triton") isIon = true;
+    corr = G4LossTableManager::Instance()->EmCorrections();
+    if(!fParticleChange) {
+      if(pParticleChange) {
+        fParticleChange =
+          reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+      } else {
+        fParticleChange = new G4ParticleChangeForLoss();
+      }
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggIonModel::GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                               const G4Material* mat,
+                                               G4double kineticEnergy)
+{
+  // this method is called only for ions
+  G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,kineticEnergy);
+  corrFactor  = q2*corr->EffectiveChargeCorrection(p,mat,kineticEnergy);
+  return corrFactor;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggIonModel::GetParticleCharge(const G4ParticleDefinition* p,
+                                            const G4Material* mat,
+                                            G4double kineticEnergy)
+{
+  // this method is called only for ions
+  return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
 …
                                                  G4double maxKinEnergy)
+{
   G4double cross     = 0.0;
   G4double tmax      = MaxSecondaryEnergy(p, kineticEnergy);
   G4double maxEnergy = min(tmax,maxKinEnergy);
+  G4double maxEnergy = std::min(tmax,maxKinEnergy);
   if(cutEnergy < tmax) {
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4BraggIonModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
+                                           const G4DynamicParticle* dp,
+                                           G4double& eloss,
+                                           G4double&,
+                                           G4double length)
+{
+  // this method is called only for ions
+  const G4ParticleDefinition* p = dp->GetDefinition();
+  const G4Material* mat = couple->GetMaterial();
+  G4double preKinEnergy = dp->GetKineticEnergy();
+  G4double e = preKinEnergy - eloss*0.5;
+  if(e < 0.0) e = preKinEnergy*0.5;
+  G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,e);
+  GetModelOfFluctuations()->SetParticleAndCharge(p, q2);
+  eloss *= q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor;
+  if(nuclearStopping) {
+    G4double nloss = length*corr->NuclearDEDX(p,mat,e,false);
+    // too big energy loss
+    if(eloss + nloss > preKinEnergy) {
+      nloss *= (preKinEnergy/(eloss + nloss));
+      eloss = preKinEnergy;
+    } else {
+      eloss += nloss;
+    }
+    /*
+    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
+           << " de= " << eloss << " NIEL= " << nloss
+           << " dynQ= " << dp->GetCharge()/eplus << G4endl;
+    */
+    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4BraggIonModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp,
                                         const G4MaterialCutsCouple*,
 …
+{
   G4double tmax = MaxSecondaryKinEnergy(dp);
   G4double xmax = min(tmax, maxEnergy);
+  G4double xmax = std::min(tmax, maxEnergy);
   if(xmin >= xmax) return;
 …
   fParticleChange->SetProposedKineticEnergy(kineticEnergy);
   fParticleChange->SetProposedMomentumDirection(finalP);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggIonModel::MaxSecondaryEnergy(const G4ParticleDefinition* pd,
+                                             G4double kinEnergy)
+{
+  if(pd != particle) SetParticle(pd);
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return tmax;
+}

trunk/source/processes/electromagnetic/standard/src/G4BraggModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4BraggModel.cc,v 1.16 2007/07/28 13:30:53 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4BraggModel.cc,v 1.21 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 15-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
 // 25-04-06 Add stopping data from PSTAR (V.Ivanchenko)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 // Class Description:
 …
 #include "G4Electron.hh"
 #include "G4ParticleChangeForLoss.hh"
+#include "G4LossTableManager.hh"
+#include "G4EmCorrections.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 G4BraggModel::G4BraggModel(const G4ParticleDefinition* p, const G4String& nam)
   : G4VEmModel(nam),
+  particle(0),
+  protonMassAMU(1.007276),
+  iMolecula(0),
+  isIon(false)
+    particle(0),
+    protonMassAMU(1.007276),
+    iMolecula(0),
+    isIon(false),
+    isInitialised(false)
+{
   if(p) SetParticle(p);
+  SetHighEnergyLimit(2.0*MeV);
   lowestKinEnergy  = 1.0*keV;
   theZieglerFactor = eV*cm2*1.0e-15;
 …
+{
   if(p != particle) SetParticle(p);
+  G4String pname = particle->GetParticleName();
+  if(particle->GetParticleType() == "nucleus" &&
+     pname != "deuteron" && pname != "triton") isIon = true;
+  if(pParticleChange)
+    fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
+                                                              (pParticleChange);
+  else
+    fParticleChange = new G4ParticleChangeForLoss();
+  // always false before the run
+  SetDeexcitationFlag(false);
+  if(!isInitialised) {
+    isInitialised = true;
+    G4String pname = particle->GetParticleName();
+    if(particle->GetParticleType() == "nucleus" &&
+       pname != "deuteron" && pname != "triton") isIon = true;
+    corr = G4LossTableManager::Instance()->EmCorrections();
+    if(pParticleChange) {
+      fParticleChange =
+        reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
+    } else {
+      fParticleChange = new G4ParticleChangeForLoss();
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggModel::GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                            const G4Material* mat,
+                                            G4double kineticEnergy)
+{
+  // this method is called only for ions
+  G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,kineticEnergy);
+  GetModelOfFluctuations()->SetParticleAndCharge(p, q2);
+  return q2*corr->EffectiveChargeCorrection(p,mat,kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggModel::GetParticleCharge(const G4ParticleDefinition* p,
+                                         const G4Material* mat,
+                                         G4double kineticEnergy)
+{
+  // this method is called only for ions
+  return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
 …
                                                  G4double maxKinEnergy)
+{
   G4double cross     = 0.0;
   G4double tmax      = MaxSecondaryEnergy(p, kineticEnergy);
   G4double maxEnergy = min(tmax,maxKinEnergy);
+  G4double maxEnergy = std::min(tmax,maxKinEnergy);
   if(cutEnergy < tmax) {
 …
   return dedx;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4BraggModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
+                                        const G4DynamicParticle* dp,
+                                        G4double& eloss,
+                                        G4double&,
+                                        G4double length)
+{
+  if(nuclearStopping) {
+    G4double preKinEnergy = dp->GetKineticEnergy();
+    G4double e = preKinEnergy - eloss*0.5;
+    if(e < 0.0) e = preKinEnergy*0.5;
+    G4double nloss = length*corr->NuclearDEDX(dp->GetDefinition(),
+                                              couple->GetMaterial(),
+                                              e,false);
+    // too big energy loss
+    if(eloss + nloss > preKinEnergy) {
+      nloss *= (preKinEnergy/(eloss + nloss));
+      eloss = preKinEnergy;
+    } else {
+      eloss += nloss;
+    }
+    /*
+    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
+           << " de= " << eloss << " NIEL= " << nloss
+           << " dynQ= " << dp->GetCharge()/eplus << G4endl;
+    */
+    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
 …
   vdp->push_back(delta);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4BraggModel::MaxSecondaryEnergy(const G4ParticleDefinition* pd,
+                                          G4double kinEnergy)
+{
+  if(pd != particle) SetParticle(pd);
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return tmax;
+}

trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ComptonScattering.cc,v 1.27 2006/09/14 10:27:19 maire Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ComptonScattering.cc,v 1.31 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
     isInitialised(false)
+{
+  SetLambdaBinning(90);
+  SetMinKinEnergy(0.1*keV);
+  SetMaxKinEnergy(100.0*GeV);
+  SetProcessSubType(fComptonScattering);
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4ComptonScattering::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Gamma::Gamma());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4ComptonScattering::InitialiseProcess(const G4ParticleDefinition*)
+{
 …
     SetBuildTableFlag(true);
     SetSecondaryParticle(G4Electron::Electron());
-    G4double emin = MinKinEnergy();
-    G4double emax = MaxKinEnergy();
     if(!Model()) SetModel(new G4KleinNishinaCompton);
     Model()->SetLowEnergyLimit(emin);
     Model()->SetHighEnergyLimit(emax);
+    Model()->SetLowEnergyLimit(MinKinEnergy());
+    Model()->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(1, Model());
+  }
 …
 void G4ComptonScattering::PrintInfo()
+{
+  G4cout
+    << " Total cross sections has a good parametrisation"
+    << " from 10 KeV to (100/Z) GeV"
+    << "\n      Sampling according " << Model()->GetName() << " model"
+    << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ComptonScattering52.cc,v 1.5 2007/05/16 14:00:56 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ComptonScattering52.cc,v 1.7 2008/10/15 17:53:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
     NumbBinTable(80),
     fminimalEnergy(1*eV)
+{}
+{
+  SetProcessSubType(13);
+  G4cout << "!!! G4ComptonScattering52 is the obsolete process class and will be removed soon !!!"
+         << G4endl;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4CoulombScattering.cc,v 1.11 2007/11/20 18:43:25 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4CoulombScattering.cc,v 1.20 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4CoulombScattering::G4CoulombScattering(const G4String& name)
   : G4VEmProcess(name),thetaMin(0.0),thetaMax(pi),q2Max(DBL_MAX),
+  : G4VEmProcess(name),thetaMin(0.0),thetaMax(pi),q2Max(TeV*TeV),
     isInitialised(false)
+{
   G4VEmProcess::SetBuildTableFlag(true);
+  SetBuildTableFlag(true);
   SetStartFromNullFlag(false);
   SetIntegral(true);
-  SetMinKinEnergy(keV);
-  SetMaxKinEnergy(PeV);
   thEnergy = PeV;
   thEnergyElec = PeV;
 …
     thEnergyElec = 10.*GeV;
+  }
-  SetLambdaBinning(120);
   SetSecondaryParticle(G4Electron::Electron());
   buildElmTableFlag = true;
+  SetProcessSubType(fCoulombScattering);
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4CoulombScattering::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && !p.IsShortLived());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4CoulombScattering::InitialiseProcess(const G4ParticleDefinition* p)
+{
+  if(!isInitialised) {
+  // second initialisation
+  if(isInitialised) {
+    G4VEmModel* mod = GetModelByIndex(0);
+    mod->SetPolarAngleLimit(PolarAngleLimit());
+    mod = GetModelByIndex(1);
+    if(mod) mod->SetPolarAngleLimit(PolarAngleLimit());
+    // first initialisation
+  } else {
     isInitialised = true;
     aParticle = p;
     G4double mass = p->GetPDGMass();
     if (mass > GeV || p->GetParticleType() == "nucleus") {
       buildElmTableFlag = false;
+      SetBuildTableFlag(false);
       verboseLevel = 0;
     } else {
 …
     if(mass < MeV) eth  = thEnergyElec;
     if(eth > emin) {
       G4eCoulombScatteringModel* model =
         new G4eCoulombScatteringModel(thetaMin,thetaMax,buildElmTableFlag,q2Max);
+      G4eCoulombScatteringModel* model = new G4eCoulombScatteringModel();
+      model->SetPolarAngleLimit(PolarAngleLimit());
       model->SetLowEnergyLimit(emin);
       model->SetHighEnergyLimit(std::min(eth,emax));
 …
+    }
     if(eth < emax) {
       G4CoulombScatteringModel* model =
         new G4CoulombScatteringModel(thetaMin,thetaMax,buildElmTableFlag,q2Max);
+      G4CoulombScatteringModel* model = new G4CoulombScatteringModel();
+      model->SetPolarAngleLimit(PolarAngleLimit());
       model->SetLowEnergyLimit(eth);
       model->SetHighEnergyLimit(emax);
 …
 void G4CoulombScattering::PrintInfo()
+{
+  G4cout << " Scattering of " << aParticle->GetParticleName()
+         << " with   " << thetaMin/degree
+         << " < Theta(degree) < " << thetaMax/degree
+         << "; Eth(MeV)= ";
+  G4cout << "      " << PolarAngleLimit()/degree
+         << " < Theta(degree) < 180"
+         << ", Eth(MeV)= ";
   if(aParticle->GetPDGMass() < MeV) G4cout << thEnergyElec;
   else                              G4cout << thEnergy;

trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4CoulombScatteringModel.cc,v 1.29 2007/11/09 11:45:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4CoulombScatteringModel.cc,v 1.37 2008/07/31 13:11:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 19.10.06 V.Ivanchenko use inheritance from G4eCoulombScatteringModel
 // 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
+// 09.06.08 V.Ivanchenko SelectIsotope is moved to the base class
 //
 // Class Description:
 …
 #include "Randomize.hh"
 #include "G4ParticleChangeForGamma.hh"
-#include "G4NistManager.hh"
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
 …
 using namespace std;
+G4CoulombScatteringModel::G4CoulombScatteringModel(
+  G4double thetaMin, G4double thetaMax, G4bool build,
+  G4double tlim, const G4String& nam)
+  : G4eCoulombScatteringModel(thetaMin,thetaMax,build,tlim,nam)
+{
+  theMatManager    = G4NistManager::Instance();
+  theParticleTable = G4ParticleTable::GetParticleTable();
+}
+G4CoulombScatteringModel::G4CoulombScatteringModel(const G4String& nam)
+  : G4eCoulombScatteringModel(nam)
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
                                 G4double kinEnergy,
                                 G4double Z,
                                 G4double A,
+                                G4double,
                                 G4double cutEnergy,
                                 G4double)
+{
+  if(p == particle && kinEnergy == tkin && Z == targetZ &&
+     A == targetA && cutEnergy == ecut) return nucXSection;
+  // Lab system
+  G4double ekin = std::max(keV, kinEnergy);
+  nucXSection = ComputeElectronXSectionPerAtom(p,ekin,Z,A,cutEnergy);
+  SetupParticle(p);
+  G4double ekin = std::max(lowEnergyLimit, kinEnergy);
+  SetupKinematic(ekin, cutEnergy);
+  // save lab system kinematics
+  G4double xtkin = tkin;
+  G4double xmom2 = mom2;
+  G4double xinvb = invbeta2;
   // CM system
   G4int iz      = G4int(Z);
   G4double m1   = theMatManager->GetAtomicMassAmu(iz)*amu_c2;
+  G4double m2   = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
   G4double etot = tkin + mass;
   G4double ptot = sqrt(mom2);
+  G4double bet  = ptot/(etot + m1);
+  G4double gam  = 1.0/sqrt((1.0 - bet)*(1.0 + bet));
+  G4double momCM= gam*(ptot - bet*etot);
+  //  G4cout << "ptot= " << ptot << " etot= " << etot << " beta= "
+  //     << bet << " gam= " << gam << " Z= " << Z << " A= " << A << G4endl;
+  // G4cout << " CM. mom= " << momCM  << " m= " << m
+  // << " m1= " << m1 << " iz= " << iz <<G4endl;
+  G4double momCM2 = momCM*momCM;
+  cosTetMaxNuc = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/momCM2);
+  if(1.5 > targetA && p == theProton && cosTetMaxNuc < 0.0) cosTetMaxNuc = 0.0;
+  //G4cout << " ctmax= " << cosTetMaxNuc
+  //<< " ctmin= " << cosThetaMin << G4endl;
+  // Cross section in CM system
+  if(cosTetMaxNuc < cosThetaMin) {
+    G4double effmass = mass*m1/(mass + m1);
+    G4double x1 = 1.0 - cosThetaMin;
+    G4double x2 = 1.0 - cosTetMaxNuc;
+    G4double z1 = x1 + screenZ;
+    G4double z2 = x2 + screenZ;
+    G4double d  = 1.0/formfactA;
+    G4double zn1= x1 + d;
+    G4double zn2= x2 + d;
+    nucXSection += coeff*Z*Z*chargeSquare*(1.0 +  effmass*effmass/momCM2)
+      *(1./z1 - 1./z2 + 1./zn1 - 1./zn2 +
+.0*formfactA*std::log(z1*zn2/(z2*zn1)))/momCM2;
+    //G4cout << "XS: x1= " << x1 << " x2= " << x2
+    //<< " cross= " << cross << G4endl;
+    //G4cout << "momCM2= " << momCM2 << " invbeta2= " << invbeta2
+    //       << " coeff= " << coeff << G4endl;
+  }
+  if(nucXSection < 0.0) nucXSection = 0.0;
+  return nucXSection;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4CoulombScatteringModel::SelectIsotope(const G4Element* elm)
+{
+  G4double N = elm->GetN();
+  G4int ni   = elm->GetNumberOfIsotopes();
+  if(ni > 0) {
+    G4double* ab = elm->GetRelativeAbundanceVector();
+    G4double x = G4UniformRand();
+    G4int idx;
+    for(idx=0; idx<ni; idx++) {
+      x -= ab[idx];
+      if (x <= 0.0) break;
+    }
+    if(idx >= ni) {
+      G4cout << "G4CoulombScatteringModel::SelectIsotope WARNING: "
+             << "abandance vector for"
+             << elm->GetName() << " is not normalised to unit" << G4endl;
+    } else {
+      N = G4double(elm->GetIsotope(idx)->GetN());
+    }
+  }
+  return N;
+  G4double m12  = mass*mass;
+  G4double momCM= ptot*m2/sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  mom2 = momCM*momCM;
+  tkin = sqrt(mom2 + m12) - mass;
+  invbeta2 = 1.0 +  m12/mom2;
+  SetupTarget(Z, tkin);
+  G4double xsec = CrossSectionPerAtom();
+  // restore Lab system kinematics
+  tkin = xtkin;
+  mom2 = xmom2;
+  invbeta2 = xinvb;
+  return xsec;
+}
 …
                                const G4DynamicParticle* dp,
                                G4double cutEnergy,
                                G4double maxEnergy)
+                               G4double)
+{
-  const G4Material* aMaterial = couple->GetMaterial();
-  const G4ParticleDefinition* p = dp->GetDefinition();
   G4double kinEnergy = dp->GetKineticEnergy();
+  // Select isotope and setup
+  SetupParticle(p);
+  const G4Element* elm =
+    SelectRandomAtom(aMaterial,p,kinEnergy,cutEnergy,maxEnergy);
+  G4double Z  = elm->GetZ();
+  G4double A  = SelectIsotope(elm);
+  if(kinEnergy <= DBL_MIN) return;
+  DefineMaterial(couple);
+  SetupParticle(dp->GetDefinition());
+  G4double ekin = std::max(lowEnergyLimit, kinEnergy);
+  SetupKinematic(ekin, cutEnergy);
+  // Choose nucleus
+  currentElement = SelectRandomAtom(couple,particle,ekin,ecut,tkin);
+  G4double Z  = currentElement->GetZ();
   G4int iz    = G4int(Z);
+  G4int ia    = G4int(A + 0.5);
+  G4double cross =
+    ComputeCrossSectionPerAtom(p,kinEnergy,Z,A,cutEnergy,maxEnergy);
+  G4double costm = cosTetMaxNuc;
+  G4double formf = formfactA;
+  if(G4UniformRand()*cross < elecXSection) {
+    costm = cosTetMaxElec;
+    formf = 0.0;
+  }
+  //  G4cout << "SampleSec: Ekin= " << kinEnergy << " m1= " << m1
+  // << " Z= "<< Z << " A= " <<A<< G4endl;
+  if(costm >= cosThetaMin) return;
+  // kinematics in CM system
+  G4double m1   = theParticleTable->GetIonTable()->GetNucleusMass(iz, ia);
+  G4double etot = kinEnergy + mass;
+  G4int ia    = SelectIsotopeNumber(currentElement);
+  G4double m2 = theParticleTable->GetIonTable()->GetNucleusMass(iz, ia);
+  // CM system
+  G4double etot = tkin + mass;
   G4double ptot = sqrt(mom2);
+  G4double bet  = ptot/(etot + m1);
+  G4double momCM= ptot*m2/sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
+  mom2 = momCM*momCM;
+  G4double m12 = mass*mass;
+  G4double eCM = sqrt(mom2 + m12);
+  // a correction for heavy projectile
+  G4double fm = m2/(mass + m2);
+  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  // sample scattering angle in CM system
+  SetupTarget(Z, eCM - mass);
+  G4double cost = SampleCosineTheta();
+  G4double z1   = 1.0 - cost;
+  if(z1 < 0.0) return;
+  G4double sint = sqrt(z1*(1.0 + cost));
+  G4double phi  = twopi * G4UniformRand();
+  // kinematics in the Lab system
+  G4double bet  = ptot/(etot + m2);
   G4double gam  = 1.0/sqrt((1.0 - bet)*(1.0 + bet));
+  G4double pCM  = gam*(ptot - bet*etot);
+  G4double eCM  = gam*(etot - bet*ptot);
+  G4double x1 = 1. - cosThetaMin + screenZ;
+  G4double x2 = 1. - costm;
+  G4double x3 = cosThetaMin - costm;
+  G4double grej,  z, z1;
+  do {
+    z  = G4UniformRand()*x3;
+    z1 = (x1*x2 - screenZ*z)/(x1 + z);
+    if(z1 < 0.0) z1 = 0.0;
+    else if(z1 > 2.0) z1 = 2.0;
+    grej = 1.0/(1.0 + formf*z1);
+  } while ( G4UniformRand() > grej*grej );
+  G4double cost = 1.0 - z1;
+  G4double sint= sqrt(z1*(2.0 - z1));
+  G4double phi = twopi * G4UniformRand();
+  // projectile after scattering
+  G4double pzCM = pCM*cost;
+  G4ThreeVector v1(pCM*cos(phi)*sint,pCM*sin(phi)*sint,gam*(pzCM + bet*eCM));
+  G4double pzCM = momCM*cost;
+  G4ThreeVector v1(momCM*cos(phi)*sint,momCM*sin(phi)*sint,gam*(pzCM + bet*eCM));
   G4ThreeVector dir = dp->GetMomentumDirection();
   G4ThreeVector newDirection = v1.unit();
   newDirection.rotateUz(dir);
   fParticleChange->ProposeMomentumDirection(newDirection);
   G4double elab = gam*(eCM + bet*pzCM);
   G4double ekin = elab - mass;
+  ekin = elab - mass;
   if(ekin < 0.0) ekin = 0.0;
-  G4double plab = sqrt(ekin*(ekin + 2.0*mass));
   fParticleChange->SetProposedKineticEnergy(ekin);
   // recoil
   G4double erec = kinEnergy - ekin;
+  if(erec > Z*aMaterial->GetIonisation()->GetMeanExcitationEnergy()) {
+  G4double th =
+    std::min(recoilThreshold,
+             Z*currentElement->GetIonisation()->GetMeanExcitationEnergy());
+  if(erec > th) {
     G4ParticleDefinition* ion = theParticleTable->FindIon(iz, ia, 0, iz);
+    G4double plab = sqrt(ekin*(ekin + 2.0*mass));
     G4ThreeVector p2 = (ptot*dir - plab*newDirection).unit();
     G4DynamicParticle* newdp  = new G4DynamicParticle(ion, p2, erec);

trunk/source/processes/electromagnetic/standard/src/G4GammaConversion.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4GammaConversion.cc,v 1.27 2006/09/14 10:27:19 maire Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4GammaConversion.cc,v 1.31 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
     isInitialised(false)
+{
-  SetLambdaBinning(100);
   SetMinKinEnergy(2.0*electron_mass_c2);
   SetMaxKinEnergy(100.0*GeV);
+  SetProcessSubType(fGammaConversion);
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4GammaConversion::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Gamma::Gamma());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4GammaConversion::InitialiseProcess(const G4ParticleDefinition*)
+{
 …
     SetBuildTableFlag(true);
     SetSecondaryParticle(G4Electron::Electron());
     G4double emin = max(MinKinEnergy(), 2.0*electron_mass_c2);
+    G4double emin = std::max(MinKinEnergy(), 2.0*electron_mass_c2);
     SetMinKinEnergy(emin);
+    G4double emax = MaxKinEnergy();
+    if(!Model()) SetModel(new G4BetheHeitlerModel);
+    if(!Model()) SetModel(new G4BetheHeitlerModel());
     Model()->SetLowEnergyLimit(emin);
     Model()->SetHighEnergyLimit(emax);
+    Model()->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(1, Model());
+  }
 …
 void G4GammaConversion::PrintInfo()
+{
+  G4cout
+    << " Total cross sections has a good parametrisation"
+    << " from 1.5 MeV to 100 GeV for all Z;"
+    << "\n      sampling secondary e+e- according "
+    << Model()->GetName() << " model"
+    << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc

r819	r961
26	26	//
27	27	// $Id: G4InitXscPAI.cc,v 1.9 2006/06/29 19:53:00 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4IonFluctuations.cc,v 1.5.2.1 2008/04/25 00:22:53 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4IonFluctuations.cc,v 1.25 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 16-10-03 Changed interface to Initialisation (V.Ivanchenko)
 // 27-09-07 Use FermiEnergy from material, add cut dependence (V.Ivanchenko)
+// 01-02-08 Add protection for small energies and optimise the code (V.Ivanchenko)
+// 01-06-08 Added initialisation of effective charge prestep (V.Ivanchenko)
 //
 // Class Description:
 …
 #include "G4Material.hh"
 #include "G4DynamicParticle.hh"
-#include "G4ParticleDefinition.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4IonFluctuations::G4IonFluctuations(const G4String& nam)
+ :G4VEmFluctuationModel(nam),
+  particle(0),
+  minNumberInteractionsBohr(10.0),
+  theBohrBeta2(50.0*keV/proton_mass_c2),
+  minFraction(0.2),
+  xmin(0.2),
+  minLoss(0.001*eV)
+  : G4VEmFluctuationModel(nam),
+    particle(0),
+    particleMass(proton_mass_c2),
+    charge(1.0),
+    chargeSquare(1.0),
+    effChargeSquare(1.0),
+    parameter(10.0*CLHEP::MeV/CLHEP::proton_mass_c2),
+    minNumberInteractionsBohr(0.0),
+    theBohrBeta2(50.0*keV/CLHEP::proton_mass_c2),
+    minFraction(0.2),
+    xmin(0.2),
+    minLoss(0.001*eV)
 {}
 …
   charge         = part->GetPDGCharge()/eplus;
   chargeSquare   = charge*charge;
+  chargeSqRatio  = 1.0;
+  effChargeSquare= chargeSquare;
+  uniFluct.InitialiseMe(part);
+}
 …
 G4double G4IonFluctuations::SampleFluctuations(const G4Material* material,
                                                const G4DynamicParticle* dp,
+                                                     G4double& tmax,
+                                                     G4double& length,
+                                                     G4double& meanLoss)
+{
+                                               G4double& tmax,
+                                               G4double& length,
+                                               G4double& meanLoss)
+{
+  //  G4cout << "### meanLoss= " << meanLoss << G4endl;
   if(meanLoss <= minLoss) return meanLoss;
+  //  G4cout << "### meanLoss= " << meanLoss << G4endl;
+  //G4cout << "G4IonFluctuations::SampleFluctuations E(MeV)= " << dp->GetKineticEnergy()
+  //     << "  Elim(MeV)= " << parameter*charge*particleMass << G4endl;
+  // Vavilov fluctuations
+  if(dp->GetKineticEnergy() > parameter*charge*particleMass) {
+    return uniFluct.SampleFluctuations(material,dp,tmax,length,meanLoss);
+  }
   G4double siga = Dispersion(material,dp,tmax,length);
 …
   G4double navr = minNumberInteractionsBohr;
   navr = meanLoss*meanLoss/siga;
   //  G4cout << "### siga= " << sqrt(siga) << "  navr= " << navr << G4endl;
+  //G4cout << "### siga= " << sqrt(siga) << "  navr= " << navr << G4endl;
   // Gaussian fluctuation
 …
     //       G4cout << "siga= " << siga << G4endl;
     siga = sqrt(siga);
     G4double lossmax = meanLoss+meanLoss;
+    do {
+      loss = G4RandGauss::shoot(meanLoss,siga);
+    } while (0.0 > loss || loss > lossmax);
+    if(siga > 5.0*meanLoss) {
+      loss = lossmax*G4UniformRand();
+    } else {
+      do {
+        loss = G4RandGauss::shoot(meanLoss,siga);
+      } while (0.0 > loss || loss > lossmax);
+    }
   // Poisson fluctuations
   } else {
 …
+  }
   //  G4cout << "meanLoss= " << meanLoss << " loss= " << loss << G4endl;
+  //G4cout << "meanLoss= " << meanLoss << " loss= " << loss << G4endl;
   return loss;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4IonFluctuations::Dispersion(
+                          const G4Material* material,
+                          const G4DynamicParticle* dp,
+                                G4double& tmax,
+                                G4double& length)
+{
+  particle       = dp->GetDefinition();
+  charge         = particle->GetPDGCharge()/eplus;
+  G4double Q2    = charge*charge;
+  particleMass   = particle->GetPDGMass();
+  G4double q     = dp->GetCharge()/eplus;
+  chargeSquare   = q*q;
+  chargeSqRatio  = chargeSquare/Q2;
+  //chargeSquare   = charge*charge;
+  //chargeSqRatio  = 1.0;
+G4double G4IonFluctuations::Dispersion(const G4Material* material,
+                                       const G4DynamicParticle* dp,
+                                       G4double& tmax,
+                                       G4double& length)
+{
+  kineticEnergy = dp->GetKineticEnergy();
+  G4double etot = kineticEnergy + particleMass;
+  beta2 = kineticEnergy*(kineticEnergy + 2.*particleMass)/(etot*etot);
   G4double electronDensity = material->GetElectronDensity();
+  kineticEnergy  = dp->GetKineticEnergy();
   G4double etot = kineticEnergy + particleMass;
   //G4cout << "e= " <<  kineticEnergy << " m= " << particleMass
   //     << " tmax= " << tmax << " l= " << length << " q^2= " << chargeSquare << G4endl;
   beta2 = kineticEnergy*(kineticEnergy + 2.*particleMass)/(etot*etot);
+  /*
+  G4cout << "e= " <<  kineticEnergy << " m= " << particleMass
+         << " tmax= " << tmax << " l= " << length
+         << " q^2= " << effChargeSquare << " beta2=" << beta2<< G4endl;
+  */
   G4double siga = (1. - beta2*0.5)*tmax*length*electronDensity*
     twopi_mc2_rcl2*Q2/beta2;
+    twopi_mc2_rcl2*chargeSquare/beta2;
   // Low velocity - additional ion charge fluctuations according to
   // Q.Yang et al., NIM B61(1991)149-155.
+  G4double zeff  = electronDensity/(material->GetTotNbOfAtomsPerVolume());
+  //G4cout << "siga= " << siga << " zeff= " << zeff << " c= " << c << G4endl;
+  G4double f = 0.0;
+  // correction factors with cut dependence
+  if ( beta2 < 3.0*theBohrBeta2*zeff ) {
+    G4double a = CoeffitientA (zeff);
+    G4double b = CoeffitientB (material, zeff);
+    //     G4cout << "a= " << a <<  " b= " << b << G4endl;
+    f = a*chargeSqRatio + b;
+  } else {
+    // H.Geissel et al. NIM B, 195 (2002) 3.
+    f = RelativisticFactor(material, zeff);
+  }
+  //G4cout << "sigE= " << sqrt(siga) << " charge= " << charge <<G4endl;
+  G4double Z = electronDensity/material->GetTotNbOfAtomsPerVolume();
+  G4double fac = Factor(material, Z);
   // heavy ion correction
 …
   if(beta2 > theBohrBeta2)  f1/= beta2;
   else                      f1/= theBohrBeta2;
+  if(f1 > 2.0) f1 = 2.0;
+  f *= (1.0 + f1);
+  if(f > 1.0) {
+    siga *= (1. + (f - 1.0)*2.0*electron_mass_c2*beta2/(tmax*(1.0 - beta2)));
+  }
+  //  G4cout << "siga= " << siga << G4endl;
+  if(f1 > 2.5) f1 = 2.5;
+  fac *= (1.0 + f1);
+  // taking into account the cut
+  if(fac > 1.0) {
+    siga *= (1.0 + (fac - 1.0)*2.0*electron_mass_c2*beta2/(tmax*(1.0 - beta2)));
+  }
+  //G4cout << "siga(keV)= " << sqrt(siga)/keV << " fac= " << fac
+  //     << "  f1= " << f1 << G4endl;
   return siga;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4double G4IonFluctuations::CoeffitientA(G4double& zeff)
+G4double G4IonFluctuations::Factor(const G4Material* material, G4double Z)
+{
   // The aproximation of energy loss fluctuations
 …
   // Reduced energy in MeV/AMU
+  G4double energy = kineticEnergy * amu_c2/(particleMass*MeV) ;
+  static G4double a[96][4] = {
+  G4double energy = kineticEnergy *amu_c2/(particleMass*MeV) ;
+  // simple approximation for higher beta2
+  G4double s1 = RelativisticFactor(material, Z);
+  // tabulation for lower beta2
+  if( beta2 < 3.0*theBohrBeta2*Z ) {
+    static G4double a[96][4] = {
  {-0.3291, -0.8312,  0.2460, -1.0220},
  {-0.5615, -0.5898,  0.5205, -0.7258},
 …
  {-0.3972, -0.3600,  1.0260, -0.5842},
 {-0.3985, -0.3803,  1.0200, -0.6013},
+ {-0.3985, -0.3803,  1.0200, -0.6013},
  {-0.3985, -0.3979,  1.0150, -0.6168},
  {-0.3968, -0.3990,  1.0160, -0.6195},
 …
  {-0.4284, -0.3204,  1.6290, -0.6380},
  {-0.4227, -0.3217,  1.6360, -0.6438}
+  } ;
+  G4int iz = (G4int)zeff - 2 ;
+  if( 0 > iz ) iz = 0 ;
+  if(95 < iz ) iz = 95 ;
+  G4double q = 1.0 / (1.0 + a[iz][0]*pow(energy,a[iz][1])+
+                          + a[iz][2]*pow(energy,a[iz][3])) ;
+  return q ;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4IonFluctuations::CoeffitientB(const G4Material* material, G4double& zeff)
+{
+  // The aproximation of energy loss fluctuations
+  // Q.Yang et al., NIM B61(1991)149-155.
+  // Reduced energy in MeV/AMU
+  G4double energy = kineticEnergy *amu_c2/(particleMass*MeV) ;
+    } ;
+    G4int iz = G4int(Z) - 2;
+    if( 0 > iz )      iz = 0;
+    else if(95 < iz ) iz = 95;
+    G4double ss = 1.0 + a[iz][0]*pow(energy,a[iz][1])+
+      + a[iz][2]*pow(energy,a[iz][3]);
+    // protection for the validity range for low beta
+    G4double slim = 0.001;
+    if(ss < slim) s1 = 1.0/slim;
+    // for high value of beta
+    else if(s1*ss < 1.0) s1 = 1.0/ss;
+  }
   G4int i = 0 ;
 …
   // ions
   } else {
+    factor = charge * pow(charge/zeff, 0.3333) ;
+    factor = charge * pow(charge/Z, 0.33333333);
     if( kStateGas == material->GetState() ) {
 …
     } else {
       energy /= (charge * sqrt(charge*zeff)) ;
+      energy /= (charge * sqrt(charge*Z)) ;
       i = 4 ;
+    }
+  }
+  G4double x = b[i][2] * (1.0 - exp( - energy * b[i][3] )) ;
+  G4double q = factor * x * b[i][0] /
+             ((energy - b[i][1])*(energy - b[i][1]) + x*x) ;
+  return q ;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4IonFluctuations::RelativisticFactor(const G4Material* material,
+                                               G4double& zeff)
+{
+  G4double x = b[i][2];
+  G4double y = energy * b[i][3];
+  if(y <= 0.2) x *= (y*(1.0 - 0.5*y));
+  else         x *= (1.0 - exp(-y));
+  y = energy - b[i][1];
+  G4double s2 = factor * x * b[i][0] / (y*y + x*x);
+  /*
+  G4cout << "s1= " << s1 << " s2= " << s2 << " q^2= " << effChargeSquare
+         << " e= " << energy << G4endl;
+  */
+  return s1*effChargeSquare/chargeSquare + s2;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4IonFluctuations::RelativisticFactor(const G4Material* mat,
+                                               G4double Z)
+{
+  G4double eF = mat->GetIonisation()->GetFermiEnergy();
+  G4double I  = mat->GetIonisation()->GetMeanExcitationEnergy();
   // H.Geissel et al. NIM B, 195 (2002) 3.
-  G4double eF = material->GetIonisation()->GetFermiEnergy();
   G4double bF2= 2.0*eF/electron_mass_c2;
+  G4double I  = material->GetIonisation()->GetMeanExcitationEnergy();
+  G4double f  = 0.4*(1.0 - beta2)/((1.0 - 0.5*beta2)*zeff);
+  G4double f  = 0.4*(1.0 - beta2)/((1.0 - 0.5*beta2)*Z);
   if(beta2 > bF2) f *= log(2.0*electron_mass_c2*beta2/I)*bF2/beta2;
   else            f *= log(4.0*eF/I);
+  //  G4cout << "f= " << f << " beta2= " << beta2
+  //     << " bf2= " << bF2 << " q^2= " << chargeSquare << G4endl;
   return 1.0 + f;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4IonFluctuations::SetParticleAndCharge(const G4ParticleDefinition* part,
+                                             G4double q2)
+{
+  if(part != particle) {
+    particle       = part;
+    particleMass   = part->GetPDGMass();
+    charge         = part->GetPDGCharge()/eplus;
+    chargeSquare   = charge*charge;
+  }
+  effChargeSquare  = q2;
+  uniFluct.SetParticleAndCharge(part, q2);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc

r819	r961
25	25	//
26	26	// $Id: G4KleinNishinaCompton.cc,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MollerBhabhaModel.cc,v 1.30 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MollerBhabhaModel.cc,v 1.31 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
                                          const G4String& nam)
   : G4VEmModel(nam),
+  particle(0),
+  isElectron(true),
+  twoln10(2.0*log(10.0)),
+  lowLimit(0.2*keV)
+    particle(0),
+    isElectron(true),
+    twoln10(2.0*log(10.0)),
+    lowLimit(0.2*keV),
+    isInitialised(false)
+{
   theElectron = G4Electron::Electron();
 …
 G4MollerBhabhaModel::~G4MollerBhabhaModel()
 {}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void G4MollerBhabhaModel::SetParticle(const G4ParticleDefinition* p)
+{
-  particle = p;
-  if(p != theElectron) isElectron = false;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4MollerBhabhaModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                                 G4double kinEnergy)
+{
+  G4double tmax = kinEnergy;
+  if(isElectron) tmax *= 0.5;
+  return tmax;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4MollerBhabhaModel::Initialise(const G4ParticleDefinition* p,
                                      const G4DataVector&)
+{
   if(!particle) SetParticle(p);
+  if(pParticleChange)
+  SetDeexcitationFlag(false);
+  if(isInitialised) return;
+  isInitialised = true;
+  if(pParticleChange) {
     fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>
                                                      (pParticleChange);
   else
+  } else {
     fParticleChange = new G4ParticleChangeForLoss();
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4MscModel71.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MscModel71.cc,v 1.5 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MscModel71.cc,v 1.6 2008/03/13 17:20:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   G4double tau = trueStepLength/lambda0 ;
   if(trueStepLength >= currentRange*dtrl)
+  if(trueStepLength >= currentRange*dtrl) {
     if(par1*trueStepLength < 1.)
       tau = -par2*log(1.-par1*trueStepLength) ;
     else
       tau = taubig ;
+  }
   currentTau = tau ;

trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MultipleScattering.cc,v 1.70 2007/10/29 08:57:19 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MultipleScattering.cc,v 1.75 2008/10/15 17:53:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 // 12-02-07 skin can be changed via UI command, default skin=1 (VI)
 // 24-04-07 default skin=0 (temporal protection) (VI)
+// 11-03-08 use G4VMscModel interface (VI)
 //
 // -----------------------------------------------------------------------------
 …
 #include "G4UrbanMscModel.hh"
 #include "G4MscStepLimitType.hh"
+#include "G4UrbanMscModel.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
   : G4VMultipleScattering(processName)
+{
+  dtrl              = 0.05;
+  lambdalimit       = 1.*mm;
+  samplez           = false ;
+  isInitialized     = false;
+  isInitialized = false;
+}
 …
     SetLateralDisplasmentFlag(false);
     SetBuildLambdaTable(false);
-    SetSkin(0.0);
-    SetRangeFactor(0.2);
+  }
   // initialisation of parameters - defaults for particles other
   // than ions can be overwritten by users
+  mscUrban = new G4UrbanMscModel(RangeFactor(),dtrl,lambdalimit,
+                                 GeomFactor(),Skin(),
+                                 samplez,StepLimitType());
+  mscUrban = new G4UrbanMscModel();
+  mscUrban->SetStepLimitType(StepLimitType());
   mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
+  mscUrban->SetSkin(Skin());
+  mscUrban->SetRangeFactor(RangeFactor());
+  mscUrban->SetGeomFactor(GeomFactor());
   AddEmModel(1,mscUrban);
 …
 void G4MultipleScattering::PrintInfo()
+{
+  G4cout << "      Boundary/stepping algorithm is active with RangeFactor= "
+         << RangeFactor()
+         << "  Step limit type " << StepLimitType()
+  G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << ", skin= " << Skin()
+         << ", geomFactor= " << GeomFactor()
          << G4endl;
+}

trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4MultipleScattering71.cc,v 1.4 2006/10/16 15:26:49 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4MultipleScattering71.cc,v 1.5 2008/07/16 11:27:41 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
 #include "G4MultipleScattering71.hh"
+#include "G4LossTableManager.hh"
 #include "G4MscModel71.hh"
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4MultipleScattering71::GetContinuousStepLimit(
+                                          const G4Track& track,
+                                                G4double,
+                                                G4double currentMinimalStep,
+                                                G4double&)
+{
+  DefineMaterial(track.GetMaterialCutsCouple());
+  const G4MaterialCutsCouple* couple = CurrentMaterialCutsCouple();
+  G4double e = track.GetKineticEnergy();
+  model = dynamic_cast<G4MscModel71*>(SelectModel(e));
+  const G4ParticleDefinition* p = track.GetDefinition();
+  G4double lambda0 = GetLambda(p, e);
+  range =  G4LossTableManager::Instance()->GetRangeFromRestricteDEDX(p,e,couple);
+  if(range < currentMinimalStep) currentMinimalStep = range;
+  truePathLength = TruePathLengthLimit(track,lambda0,currentMinimalStep);
+  //  G4cout << "StepLimit: tpl= " << truePathLength << " lambda0= "
+  //       << lambda0 << " range= " << currentRange
+  //       << " currentMinStep= " << currentMinimalStep << G4endl;
+  if (truePathLength < currentMinimalStep) valueGPILSelectionMSC = CandidateForSelection;
+  geomPathLength = model->GeomPathLength(LambdaTable(),couple,
+           p,e,lambda0,range,truePathLength);
+  if(geomPathLength > lambda0) geomPathLength = lambda0;
+  return geomPathLength;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4PAIModel.cc

-              r819
+              r961
 // ********************************************************************
 //
+// $Id: G4PAIModel.cc,v 1.46 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
+//
+// -------------------------------------------------------------------
+//
+// GEANT4 Class
 // File name:     G4PAIModel.cc
 //
 …
       fCutCouple = theCoupleTable->GetMaterialCutsCouple( fMaterial,
                                           curReg->GetProductionCuts() );
+      //G4cout << "Reg <" <<curReg->GetName() << ">  mat <"
+      //             << fMaterial->GetName() << ">  fCouple= "
+      //             << fCutCouple<<G4endl;
       if( fCutCouple ) {
         fMaterialCutsCoupleVector.push_back(fCutCouple);
 …
+  }
+}
+//////////////////////////////////////////////////////////////////
+void G4PAIModel::InitialiseMe(const G4ParticleDefinition*)
+{}
 //////////////////////////////////////////////////////////////////
 …
+  {
     //  if ( x1 == x2  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*0.5 ;
     else             dNdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
+  {
     //  if ( x1 == x2  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*0.5 ;
     else             dEdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
 //////////////////////////////////////////////////////////////////////////////
 G4double G4PAIModel::ComputeDEDX(const G4MaterialCutsCouple* matCC,
                                  const G4ParticleDefinition* p,
                                        G4double kineticEnergy,
                                        G4double cutEnergy)
+G4double G4PAIModel::ComputeDEDXPerVolume(const G4Material*,
+                                          const G4ParticleDefinition* p,
+                                          G4double kineticEnergy,
+                                          G4double cutEnergy)
+{
   G4int iTkin,iPlace;
   size_t jMat;
+  //G4double cut = std::min(MaxSecondaryEnergy(p, kineticEnergy), cutEnergy);
+  G4double cut = cutEnergy;
   G4double massRatio  = fMass/p->GetPDGMass();
   G4double scaledTkin = kineticEnergy*massRatio;
   G4double charge     = p->GetPDGCharge();
+  G4double charge2    = charge*charge, dEdx;
+  G4double charge2    = charge*charge;
+  const G4MaterialCutsCouple* matCC = CurrentCouple();
   for( jMat = 0 ;jMat < fMaterialCutsCoupleVector.size() ; ++jMat )
 …
   iPlace = iTkin - 1;
   if(iPlace < 0) iPlace = 0;
+  dEdx = charge2*( (*fdEdxVector)(iPlace) - GetdEdxCut(iPlace,cutEnergy) ) ;
+  G4double dEdx = charge2*( (*fdEdxVector)(iPlace) - GetdEdxCut(iPlace,cut) );
   if( dEdx < 0.) dEdx = 0.;
   return dEdx;
 …
 /////////////////////////////////////////////////////////////////////////
 G4double G4PAIModel::CrossSection( const G4MaterialCutsCouple* matCC,
                                    const G4ParticleDefinition* p,
                                          G4double kineticEnergy,
                                          G4double cutEnergy,
                                          G4double maxEnergy  )
+G4double G4PAIModel::CrossSectionPerVolume( const G4Material*,
+                                            const G4ParticleDefinition* p,
+                                            G4double kineticEnergy,
+                                            G4double cutEnergy,
+                                            G4double maxEnergy  )
+{
   G4int iTkin,iPlace;
   size_t jMat;
+  G4double tmax = min(MaxSecondaryEnergy(p, kineticEnergy), maxEnergy);
+  G4double tmax = std::min(MaxSecondaryEnergy(p, kineticEnergy), maxEnergy);
+  if(tmax <= cutEnergy) return 0.0;
   G4double massRatio  = fMass/p->GetPDGMass();
   G4double scaledTkin = kineticEnergy*massRatio;
   G4double charge     = p->GetPDGCharge();
   G4double charge2    = charge*charge, cross, cross1, cross2;
+  const G4MaterialCutsCouple* matCC = CurrentCouple();
   for( jMat = 0 ;jMat < fMaterialCutsCoupleVector.size() ; ++jMat )
 …
+}
+/////////////////////////////////////////////////////////////////////
+G4double G4PAIModel::MaxSecondaryEnergy( const G4ParticleDefinition* p,
+                                         G4double kinEnergy)
+{
+  G4double tmax = kinEnergy;
+  if(p == fElectron) tmax *= 0.5;
+  else if(p != fPositron) {
+    G4double mass = p->GetPDGMass();
+    G4double ratio= electron_mass_c2/mass;
+    G4double gamma= kinEnergy/mass + 1.0;
+    tmax = 2.0*electron_mass_c2*(gamma*gamma - 1.) /
+                  (1. + 2.0*gamma*ratio + ratio*ratio);
+  }
+  return tmax;
+}
+///////////////////////////////////////////////////////////////
+void G4PAIModel::DefineForRegion(const G4Region* r)
+{
+  fPAIRegionVector.push_back(r);
+}
 //

trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc

-              r819
+              r961
 // ********************************************************************
 //
+// $Id: G4PAIPhotonModel.cc,v 1.21 2009/02/19 19:17:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
+//
+// -------------------------------------------------------------------
+//
+// GEANT4 Class
 // File name:     G4PAIPhotonModel.cc
 //
 …
 //////////////////////////////////////////////////////////////////
+void G4PAIPhotonModel::InitialiseMe(const G4ParticleDefinition*)
+{}
+//////////////////////////////////////////////////////////////////
 void G4PAIPhotonModel::ComputeSandiaPhotoAbsCof()
+{
 …
+  {
     //  if ( x1 == x2  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*0.5 ;
     else             dNdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
+  {
     //  if ( x1 == x2  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*0.5 ;
     else             dNdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
+  {
     //  if ( x1 == x2  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dNdxCut = y1 + (y2 - y1)*0.5 ;
     else             dNdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
+  {
     //  if ( x1 == x2  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    //    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*G4UniformRand() ;
+    if ( std::abs(x1-x2) <= eV  ) dEdxCut = y1 + (y2 - y1)*0.5 ;
     else             dEdxCut = y1 + (transferCut - x1)*(y2 - y1)/(x2 - x1) ;
+  }
 …
 //////////////////////////////////////////////////////////////////////////////
 G4double G4PAIPhotonModel::ComputeDEDX(const G4MaterialCutsCouple* matCC,
                                  const G4ParticleDefinition* p,
                                        G4double kineticEnergy,
                                        G4double cutEnergy)
+G4double G4PAIPhotonModel::ComputeDEDXPerVolume(const G4Material*,
+                                                const G4ParticleDefinition* p,
+                                                G4double kineticEnergy,
+                                                G4double cutEnergy)
+{
   G4int iTkin,iPlace;
   size_t jMat;
+  //G4double cut = std::min(MaxSecondaryEnergy(p, kineticEnergy), cutEnergy);
+  G4double cut = cutEnergy;
   G4double particleMass = p->GetPDGMass();
   G4double scaledTkin   = kineticEnergy*proton_mass_c2/particleMass;
 …
   G4double charge2      = charge*charge;
   G4double dEdx         = 0.;
+  const G4MaterialCutsCouple* matCC = CurrentCouple();
   for( jMat = 0 ;jMat < fMaterialCutsCoupleVector.size() ; ++jMat )
 …
   iPlace = iTkin - 1;
   if(iPlace < 0) iPlace = 0;
   dEdx = charge2*( (*fdEdxVector)(iPlace) - GetdEdxCut(iPlace,cutEnergy) ) ;
+  dEdx = charge2*( (*fdEdxVector)(iPlace) - GetdEdxCut(iPlace,cut) ) ;
   if( dEdx < 0.) dEdx = 0.;
 …
 /////////////////////////////////////////////////////////////////////////
 G4double G4PAIPhotonModel::CrossSection( const G4MaterialCutsCouple* matCC,
                                    const G4ParticleDefinition* p,
                                          G4double kineticEnergy,
                                          G4double cutEnergy,
                                          G4double maxEnergy  )
+G4double G4PAIPhotonModel::CrossSectionPerVolume( const G4Material*,
+                                                  const G4ParticleDefinition* p,
+                                                  G4double kineticEnergy,
+                                                  G4double cutEnergy,
+                                                  G4double maxEnergy  )
+{
   G4int iTkin,iPlace;
   size_t jMat, jMatCC;
+  G4double tmax = min(MaxSecondaryEnergy(p, kineticEnergy), maxEnergy);
+  G4double tmax = std::min(MaxSecondaryEnergy(p, kineticEnergy), maxEnergy);
+  if(cutEnergy >= tmax) return 0.0;
   G4double particleMass = p->GetPDGMass();
   G4double scaledTkin   = kineticEnergy*proton_mass_c2/particleMass;
 …
   G4double charge2      = charge*charge, cross, cross1, cross2;
   G4double photon1, photon2, plasmon1, plasmon2;
+  const G4MaterialCutsCouple* matCC = CurrentCouple();
   const G4ProductionCutsTable* theCoupleTable=
 …
+}
+/////////////////////////////////////////////////////////////////////
+G4double G4PAIPhotonModel::MaxSecondaryEnergy( const G4ParticleDefinition* p,
+                                                      G4double kinEnergy)
+{
+  G4double tmax = kinEnergy;
+  if(p == fElectron) tmax *= 0.5;
+  else if(p != fPositron) {
+    G4double mass = p->GetPDGMass();
+    G4double ratio= electron_mass_c2/mass;
+    G4double gamma= kinEnergy/mass + 1.0;
+    tmax = 2.0*electron_mass_c2*(gamma*gamma - 1.) /
+                  (1. + 2.0*gamma*ratio + ratio*ratio);
+  }
+  return tmax;
+}
+///////////////////////////////////////////////////////////////
+void G4PAIPhotonModel::DefineForRegion(const G4Region* r)
+{
+  fPAIRegionVector.push_back(r);
+}
 //

trunk/source/processes/electromagnetic/standard/src/G4PAIxSection.cc

-              r819
+              r961
 //
 //
 // $Id: G4PAIxSection.cc,v 1.21 2006/06/29 19:53:20 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PAIxSection.cc,v 1.24 2008/05/30 16:04:40 grichine Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 .0 ,   100.0 , 300.0 , 600.0 , 1000.0 , 3000.0 ,
 .0 , 50000.0
 } ;
+};
 const G4int G4PAIxSection::
 fRefGammaNumber = 29 ;         // The number of gamma for creation of
+fRefGammaNumber = 29;         // The number of gamma for creation of
                                // spline (9)
 …
 // Local class constants
 const G4double G4PAIxSection::fDelta = 0.005 ; // energy shift from interval border
 const G4double G4PAIxSection::fError = 0.005 ; // error in lin-log approximation
 const G4int G4PAIxSection::fMaxSplineSize = 500 ;  // Max size of output spline
+const G4double G4PAIxSection::fDelta = 0.005; // energy shift from interval border
+const G4double G4PAIxSection::fError = 0.005; // error in lin-log approximation
+const G4int G4PAIxSection::fMaxSplineSize = 500;  // Max size of output spline
                                                     // arrays
 …
   fDensity       = matCC->GetMaterial()->GetDensity();
   G4int matIndex = matCC->GetMaterial()->GetIndex();
+  fMaterialIndex = matIndex;
   fSandia        = new G4SandiaTable(matIndex);
 …
     (*(*fMatSandiaMatrix)[i])[0] = fSandia->GetSandiaMatTable(i,0);
     for(j = 1; j < 5 ; j++)
+    for(j = 1; j < 5; j++)
+    {
       (*(*fMatSandiaMatrix)[i])[j] = fSandia->GetSandiaMatTable(i,j)*fDensity;
+    }
+  }
+}
+////////////////////////////////////////////////////////////////
 G4PAIxSection::G4PAIxSection(G4int materialIndex,
                              G4double maxEnergyTransfer)
+{
+   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
+   G4int i, j ;
+      fDensity                = (*theMaterialTable)[materialIndex]->GetDensity() ;
+   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+   G4int i, j;
+      fMaterialIndex   = materialIndex;
+      fDensity                = (*theMaterialTable)[materialIndex]->GetDensity();
       fElectronDensity        = (*theMaterialTable)[materialIndex]->
                              GetElectronDensity() ;
+                             GetElectronDensity();
       fIntervalNumber         = (*theMaterialTable)[materialIndex]->
                              GetSandiaTable()->GetMatNbOfIntervals() ;
+                             GetSandiaTable()->GetMatNbOfIntervals();
       fIntervalNumber--;
       // G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
       fEnergyInterval = new G4double[fIntervalNumber+2] ;
       fA1             = new G4double[fIntervalNumber+2] ;
       fA2             = new G4double[fIntervalNumber+2] ;
       fA3             = new G4double[fIntervalNumber+2] ;
       fA4             = new G4double[fIntervalNumber+2] ;
       for(i = 1 ; i <= fIntervalNumber ; i++ )
+      // G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl;
+      fEnergyInterval = new G4double[fIntervalNumber+2];
+      fA1             = new G4double[fIntervalNumber+2];
+      fA2             = new G4double[fIntervalNumber+2];
+      fA3             = new G4double[fIntervalNumber+2];
+      fA4             = new G4double[fIntervalNumber+2];
+      for(i = 1; i <= fIntervalNumber; i++ )
+      {
          if(((*theMaterialTable)[materialIndex]->
 …
               i > fIntervalNumber               )
+         {
             fEnergyInterval[i] = maxEnergyTransfer ;
             fIntervalNumber = i ;
+            fEnergyInterval[i] = maxEnergyTransfer;
+            fIntervalNumber = i;
             break;
+         }
 …
                               GetSandiaTable()->GetSandiaCofForMaterial(i-1,4);
          // G4cout<<i<<"\t"<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
          //                               <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
+         //                               <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl;
+      }
       if(fEnergyInterval[fIntervalNumber] != maxEnergyTransfer)
+      {
          fIntervalNumber++;
          fEnergyInterval[fIntervalNumber] = maxEnergyTransfer ;
+         fEnergyInterval[fIntervalNumber] = maxEnergyTransfer;
+      }
 …
 .5*fDelta*(fEnergyInterval[i+1]+fEnergyInterval[i]))
+        {
           continue ;
+          continue;
+        }
         else
 …
           for(j=i;j<fIntervalNumber;j++)
+          {
             fEnergyInterval[j] = fEnergyInterval[j+1] ;
                         fA1[j] = fA1[j+1] ;
                         fA2[j] = fA2[j+1] ;
                         fA3[j] = fA3[j+1] ;
                         fA4[j] = fA4[j+1] ;
+            fEnergyInterval[j] = fEnergyInterval[j+1];
+                        fA1[j] = fA1[j+1];
+                        fA2[j] = fA2[j+1];
+                        fA3[j] = fA3[j+1];
+                        fA4[j] = fA4[j+1];
+          }
           fIntervalNumber-- ;
           i-- ;
+          fIntervalNumber--;
+          i--;
+        }
+      }
 …
       /* *********************************
       fSplineEnergy          = new G4double[fMaxSplineSize] ;
       fRePartDielectricConst = new G4double[fMaxSplineSize] ;
       fImPartDielectricConst = new G4double[fMaxSplineSize] ;
       fIntegralTerm          = new G4double[fMaxSplineSize] ;
       fDifPAIxSection        = new G4double[fMaxSplineSize] ;
       fIntegralPAIxSection   = new G4double[fMaxSplineSize] ;
+      fSplineEnergy          = new G4double[fMaxSplineSize];
+      fRePartDielectricConst = new G4double[fMaxSplineSize];
+      fImPartDielectricConst = new G4double[fMaxSplineSize];
+      fIntegralTerm          = new G4double[fMaxSplineSize];
+      fDifPAIxSection        = new G4double[fMaxSplineSize];
+      fIntegralPAIxSection   = new G4double[fMaxSplineSize];
       for(i=0;i<fMaxSplineSize;i++)
+      {
          fSplineEnergy[i]          = 0.0 ;
          fRePartDielectricConst[i] = 0.0 ;
          fImPartDielectricConst[i] = 0.0 ;
          fIntegralTerm[i]          = 0.0 ;
          fDifPAIxSection[i]        = 0.0 ;
          fIntegralPAIxSection[i]   = 0.0 ;
+         fSplineEnergy[i]          = 0.0;
+         fRePartDielectricConst[i] = 0.0;
+         fImPartDielectricConst[i] = 0.0;
+         fIntegralTerm[i]          = 0.0;
+         fDifPAIxSection[i]        = 0.0;
+         fIntegralPAIxSection[i]   = 0.0;
+      }
       **************************************************  */
       InitPAI() ;  // create arrays allocated above
+      InitPAI();  // create arrays allocated above
       delete[] fEnergyInterval ;
       delete[] fA1 ;
       delete[] fA2 ;
       delete[] fA3 ;
       delete[] fA4 ;
+      delete[] fEnergyInterval;
+      delete[] fA1;
+      delete[] fA2;
+      delete[] fA3;
+      delete[] fA4;
+}
 …
+{
    const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+   G4int i, j ;
+   G4int i, j;
+      fMaterialIndex   = materialIndex;
       fDensity                = (*theMaterialTable)[materialIndex]->GetDensity();
       fElectronDensity        = (*theMaterialTable)[materialIndex]->
                              GetElectronDensity() ;
       fIntervalNumber         = intNumber ;
+                             GetElectronDensity();
+      fIntervalNumber         = intNumber;
       fIntervalNumber--;
       //   G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
+      //   G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl;
       fEnergyInterval = new G4double[fIntervalNumber+2] ;
       fA1             = new G4double[fIntervalNumber+2] ;
       fA2             = new G4double[fIntervalNumber+2] ;
       fA3             = new G4double[fIntervalNumber+2] ;
       fA4             = new G4double[fIntervalNumber+2] ;
       for( i = 1 ; i <= fIntervalNumber ; i++ )
+      fEnergyInterval = new G4double[fIntervalNumber+2];
+      fA1             = new G4double[fIntervalNumber+2];
+      fA2             = new G4double[fIntervalNumber+2];
+      fA3             = new G4double[fIntervalNumber+2];
+      fA4             = new G4double[fIntervalNumber+2];
+      for( i = 1; i <= fIntervalNumber; i++ )
+      {
          if( ( photoAbsCof[i-1][0] >= maxEnergyTransfer ) ||
              i > fIntervalNumber )
+         {
             fEnergyInterval[i] = maxEnergyTransfer ;
             fIntervalNumber = i ;
+            fEnergyInterval[i] = maxEnergyTransfer;
+            fIntervalNumber = i;
             break;
+         }
          fEnergyInterval[i] = photoAbsCof[i-1][0] ;
          fA1[i]             = photoAbsCof[i-1][1] ;
          fA2[i]             = photoAbsCof[i-1][2] ;
          fA3[i]             = photoAbsCof[i-1][3] ;
          fA4[i]             = photoAbsCof[i-1][4] ;
+         fEnergyInterval[i] = photoAbsCof[i-1][0];
+         fA1[i]             = photoAbsCof[i-1][1];
+         fA2[i]             = photoAbsCof[i-1][2];
+         fA3[i]             = photoAbsCof[i-1][3];
+         fA4[i]             = photoAbsCof[i-1][4];
          // G4cout<<i<<"\t"<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
          //        <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
+         //        <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl;
+      }
   // G4cout<<"i last = "<<i<<"; "<<"fIntervalNumber = "<<fIntervalNumber<<G4endl;
 …
+      {
          fIntervalNumber++;
          fEnergyInterval[fIntervalNumber] = maxEnergyTransfer ;
+         fEnergyInterval[fIntervalNumber] = maxEnergyTransfer;
+      }
       for(i=1;i<=fIntervalNumber;i++)
+      {
         //  G4cout<<i<<"\t"<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
         //    <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
+        //    <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl;
+      }
       // Now checking, if two borders are too close together
       for( i = 1 ; i < fIntervalNumber ; i++ )
+      for( i = 1; i < fIntervalNumber; i++ )
+      {
         if(fEnergyInterval[i+1]-fEnergyInterval[i] >
 .5*fDelta*(fEnergyInterval[i+1]+fEnergyInterval[i]))
+        {
           continue ;
+          continue;
+        }
         else
 …
           for(j=i;j<fIntervalNumber;j++)
+          {
             fEnergyInterval[j] = fEnergyInterval[j+1] ;
                         fA1[j] = fA1[j+1] ;
                         fA2[j] = fA2[j+1] ;
                         fA3[j] = fA3[j+1] ;
                         fA4[j] = fA4[j+1] ;
+            fEnergyInterval[j] = fEnergyInterval[j+1];
+                        fA1[j] = fA1[j+1];
+                        fA2[j] = fA2[j+1];
+                        fA3[j] = fA3[j+1];
+                        fA4[j] = fA4[j+1];
+          }
           fIntervalNumber-- ;
           i-- ;
+          fIntervalNumber--;
+          i--;
+        }
+      }
 …
       fLorentzFactor[fRefGammaNumber]*fLorentzFactor[fRefGammaNumber] - 1;
       NormShift(betaGammaSqRef) ;
       SplainPAI(betaGammaSqRef) ;
+      NormShift(betaGammaSqRef);
+      SplainPAI(betaGammaSqRef);
       // Preparation of integral PAI cross section for input betaGammaSq
       for(i = 1 ; i <= fSplineNumber ; i++)
+      for(i = 1; i <= fSplineNumber; i++)
+      {
          fdNdxCerenkov[i]   = PAIdNdxCerenkov(i,betaGammaSq);
+         fdNdxMM[i]   = PAIdNdxMM(i,betaGammaSq);
          fdNdxPlasmon[i]    = PAIdNdxPlasmon(i,betaGammaSq);
+         fdNdxResonance[i]  = PAIdNdxResonance(i,betaGammaSq);
          fDifPAIxSection[i] = DifPAIxSection(i,betaGammaSq);
          // G4cout<<i<<"; dNdxC = "<<fdNdxCerenkov[i]<<"; dNdxP = "<<fdNdxPlasmon[i]
          //    <<"; dNdxPAI = "<<fDifPAIxSection[i]<<G4endl;
+      }
+      IntegralCerenkov() ;
+      IntegralPlasmon() ;
+      IntegralPAIxSection() ;
+      IntegralCerenkov();
+      IntegralMM();
+      IntegralPlasmon();
+      IntegralResonance();
+      IntegralPAIxSection();
       delete[] fEnergyInterval ;
       delete[] fA1 ;
       delete[] fA2 ;
       delete[] fA3 ;
       delete[] fA4 ;
+      delete[] fEnergyInterval;
+      delete[] fA1;
+      delete[] fA2;
+      delete[] fA3;
+      delete[] fA4;
+}
 …
    const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+   G4int i, j, numberOfElements ;
+   G4int i, j, numberOfElements;
+   fMaterialIndex   = materialIndex;
    fDensity         = (*theMaterialTable)[materialIndex]->GetDensity();
    fElectronDensity = (*theMaterialTable)[materialIndex]->GetElectronDensity() ;
    numberOfElements = (*theMaterialTable)[materialIndex]->GetNumberOfElements() ;
    G4int* thisMaterialZ = new G4int[numberOfElements] ;
    for( i = 0 ; i < numberOfElements ; i++ )
+   fElectronDensity = (*theMaterialTable)[materialIndex]->GetElectronDensity();
+   numberOfElements = (*theMaterialTable)[materialIndex]->GetNumberOfElements();
+   G4int* thisMaterialZ = new G4int[numberOfElements];
+   for( i = 0; i < numberOfElements; i++ )
+   {
          thisMaterialZ[i] = (G4int)(*theMaterialTable)[materialIndex]->
+                                      GetElement(i)->GetZ() ;
+   }
+   G4SandiaTable     thisMaterialSandiaTable(materialIndex) ;
+                                      GetElement(i)->GetZ();
+   }
+   // fSandia = new G4SandiaTable(materialIndex);
+   fSandia = (*theMaterialTable)[materialIndex]->
+     GetSandiaTable();
+   G4SandiaTable     thisMaterialSandiaTable(materialIndex);
    fIntervalNumber = thisMaterialSandiaTable.SandiaIntervals
                            (thisMaterialZ,numberOfElements) ;
+                           (thisMaterialZ,numberOfElements);
    fIntervalNumber = thisMaterialSandiaTable.SandiaMixing
                            ( thisMaterialZ ,
                       (*theMaterialTable)[materialIndex]->GetFractionVector() ,
                              numberOfElements,fIntervalNumber) ;
+                             numberOfElements,fIntervalNumber);
    fIntervalNumber--;
       fEnergyInterval = new G4double[fIntervalNumber+2] ;
       fA1             = new G4double[fIntervalNumber+2] ;
       fA2             = new G4double[fIntervalNumber+2] ;
       fA3             = new G4double[fIntervalNumber+2] ;
       fA4             = new G4double[fIntervalNumber+2] ;
       for(i=1;i<=fIntervalNumber;i++)
+      fEnergyInterval = new G4double[fIntervalNumber+2];
+      fA1             = new G4double[fIntervalNumber+2];
+      fA2             = new G4double[fIntervalNumber+2];
+      fA3             = new G4double[fIntervalNumber+2];
+      fA4             = new G4double[fIntervalNumber+2];
+      for( i = 1; i <= fIntervalNumber; i++ )
+      {
   if((thisMaterialSandiaTable.GetPhotoAbsorpCof(i,0) >= maxEnergyTransfer) ||
           i > fIntervalNumber)
+         {
             fEnergyInterval[i] = maxEnergyTransfer ;
             fIntervalNumber = i ;
+            fEnergyInterval[i] = maxEnergyTransfer;
+            fIntervalNumber = i;
             break;
+         }
    fEnergyInterval[i] = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,0) ;
    fA1[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,1)*fDensity ;
    fA2[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,2)*fDensity ;
    fA3[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,3)*fDensity ;
    fA4[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,4)*fDensity ;
+   fEnergyInterval[i] = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,0);
+   fA1[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,1)*fDensity;
+   fA2[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,2)*fDensity;
+   fA3[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,3)*fDensity;
+   fA4[i]             = thisMaterialSandiaTable.GetPhotoAbsorpCof(i,4)*fDensity;
+      }
 …
+      {
          fIntervalNumber++;
          fEnergyInterval[fIntervalNumber] = maxEnergyTransfer ;
          fA1[fIntervalNumber] = fA1[fIntervalNumber-1] ;
          fA2[fIntervalNumber] = fA2[fIntervalNumber-1] ;
          fA3[fIntervalNumber] = fA3[fIntervalNumber-1] ;
          fA4[fIntervalNumber] = fA4[fIntervalNumber-1] ;
+         fEnergyInterval[fIntervalNumber] = maxEnergyTransfer;
+         fA1[fIntervalNumber] = fA1[fIntervalNumber-1];
+         fA2[fIntervalNumber] = fA2[fIntervalNumber-1];
+         fA3[fIntervalNumber] = fA3[fIntervalNumber-1];
+         fA4[fIntervalNumber] = fA4[fIntervalNumber-1];
+      }
       for(i=1;i<=fIntervalNumber;i++)
+      {
         // G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
         //   <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
+        //   <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl;
+      }
       // Now checking, if two borders are too close together
       for(i=1;i<fIntervalNumber;i++)
+      for( i = 1; i < fIntervalNumber; i++ )
+      {
         if(fEnergyInterval[i+1]-fEnergyInterval[i] >
 .5*fDelta*(fEnergyInterval[i+1]+fEnergyInterval[i]))
+        {
           continue ;
+          continue;
+        }
         else
+        {
           for(j=i;j<fIntervalNumber;j++)
+          for( j = i; j < fIntervalNumber; j++ )
+          {
             fEnergyInterval[j] = fEnergyInterval[j+1] ;
                         fA1[j] = fA1[j+1] ;
                         fA2[j] = fA2[j+1] ;
                         fA3[j] = fA3[j+1] ;
                         fA4[j] = fA4[j+1] ;
+            fEnergyInterval[j] = fEnergyInterval[j+1];
+                        fA1[j] = fA1[j+1];
+                        fA2[j] = fA2[j+1];
+                        fA3[j] = fA3[j+1];
+                        fA4[j] = fA4[j+1];
+          }
           fIntervalNumber-- ;
           i-- ;
+          fIntervalNumber--;
+          i--;
+        }
+      }
       /* *********************************
       fSplineEnergy          = new G4double[fMaxSplineSize] ;
       fRePartDielectricConst = new G4double[fMaxSplineSize] ;
       fImPartDielectricConst = new G4double[fMaxSplineSize] ;
       fIntegralTerm          = new G4double[fMaxSplineSize] ;
       fDifPAIxSection        = new G4double[fMaxSplineSize] ;
       fIntegralPAIxSection   = new G4double[fMaxSplineSize] ;
+      fSplineEnergy          = new G4double[fMaxSplineSize];
+      fRePartDielectricConst = new G4double[fMaxSplineSize];
+      fImPartDielectricConst = new G4double[fMaxSplineSize];
+      fIntegralTerm          = new G4double[fMaxSplineSize];
+      fDifPAIxSection        = new G4double[fMaxSplineSize];
+      fIntegralPAIxSection   = new G4double[fMaxSplineSize];
       for(i=0;i<fMaxSplineSize;i++)
+      {
          fSplineEnergy[i]          = 0.0 ;
          fRePartDielectricConst[i] = 0.0 ;
          fImPartDielectricConst[i] = 0.0 ;
          fIntegralTerm[i]          = 0.0 ;
          fDifPAIxSection[i]        = 0.0 ;
          fIntegralPAIxSection[i]   = 0.0 ;
+         fSplineEnergy[i]          = 0.0;
+         fRePartDielectricConst[i] = 0.0;
+         fImPartDielectricConst[i] = 0.0;
+         fIntegralTerm[i]          = 0.0;
+         fDifPAIxSection[i]        = 0.0;
+         fIntegralPAIxSection[i]   = 0.0;
+      }
       */ ////////////////////////
 …
       fLorentzFactor[fRefGammaNumber]*fLorentzFactor[fRefGammaNumber] - 1;
       NormShift(betaGammaSqRef) ;
       SplainPAI(betaGammaSqRef) ;
+      NormShift(betaGammaSqRef);
+      SplainPAI(betaGammaSqRef);
       // Preparation of integral PAI cross section for input betaGammaSq
       for(i = 1 ; i <= fSplineNumber ; i++)
+      for(i = 1; i <= fSplineNumber; i++)
+      {
          fDifPAIxSection[i] = DifPAIxSection(i,betaGammaSq);
          fdNdxCerenkov[i]   = PAIdNdxCerenkov(i,betaGammaSq);
+         fdNdxMM[i]   = PAIdNdxMM(i,betaGammaSq);
          fdNdxPlasmon[i]    = PAIdNdxPlasmon(i,betaGammaSq);
+      }
+      IntegralPAIxSection() ;
+      IntegralCerenkov() ;
+      IntegralPlasmon() ;
+         fdNdxResonance[i]  = PAIdNdxResonance(i,betaGammaSq);
+      }
+      IntegralPAIxSection();
+      IntegralCerenkov();
+      IntegralMM();
+      IntegralPlasmon();
+      IntegralResonance();
       //   delete[] fEnergyInterval ;
       delete[] fA1 ;
       delete[] fA2 ;
       delete[] fA3 ;
       delete[] fA4 ;
+      //   delete[] fEnergyInterval;
+      delete[] fA1;
+      delete[] fA2;
+      delete[] fA3;
+      delete[] fA4;
+}
 …
+{
    /* ************************
    delete[] fSplineEnergy          ;
    delete[] fRePartDielectricConst ;
    delete[] fImPartDielectricConst ;
    delete[] fIntegralTerm          ;
    delete[] fDifPAIxSection        ;
    delete[] fIntegralPAIxSection   ;
+   delete[] fSplineEnergy         ;
+   delete[] fRePartDielectricConst;
+   delete[] fImPartDielectricConst;
+   delete[] fIntegralTerm         ;
+   delete[] fDifPAIxSection       ;
+   delete[] fIntegralPAIxSection  ;
    */ ////////////////////////
+}
 …
 void G4PAIxSection::InitPAI()
+{
    G4int i ;
+   G4int i;
    G4double betaGammaSq = fLorentzFactor[fRefGammaNumber]*
                           fLorentzFactor[fRefGammaNumber] - 1;
 …
    // Preparation of integral PAI cross section for reference gamma
+   NormShift(betaGammaSq) ;
+   SplainPAI(betaGammaSq) ;
+   IntegralPAIxSection() ;
+   IntegralCerenkov() ;
+   IntegralPlasmon() ;
+   for(i = 0 ; i<=fSplineNumber ; i++)
+   {
+      fPAItable[i][fRefGammaNumber] = fIntegralPAIxSection[i] ;
+   NormShift(betaGammaSq);
+   SplainPAI(betaGammaSq);
+   IntegralPAIxSection();
+   IntegralCerenkov();
+   IntegralMM();
+   IntegralPlasmon();
+   IntegralResonance();
+   for(i = 0; i<= fSplineNumber; i++)
+   {
+      fPAItable[i][fRefGammaNumber] = fIntegralPAIxSection[i];
       if(i != 0)
+      {
          fPAItable[i][0] = fSplineEnergy[i] ;
+      }
+   }
    fPAItable[0][0] = fSplineNumber ;
    for(G4int j = 1 ; j < 112 ; j++)       // for other gammas
+   {
       if( j == fRefGammaNumber ) continue ;
+         fPAItable[i][0] = fSplineEnergy[i];
+      }
+   }
+   fPAItable[0][0] = fSplineNumber;
+   for(G4int j = 1; j < 112; j++)       // for other gammas
+   {
+      if( j == fRefGammaNumber ) continue;
       betaGammaSq = fLorentzFactor[j]*fLorentzFactor[j] - 1 ;
+      betaGammaSq = fLorentzFactor[j]*fLorentzFactor[j] - 1;
       for(i = 1 ; i <= fSplineNumber ; i++)
+      for(i = 1; i <= fSplineNumber; i++)
+      {
          fDifPAIxSection[i] = DifPAIxSection(i,betaGammaSq);
          fdNdxCerenkov[i]   = PAIdNdxCerenkov(i,betaGammaSq);
+         fdNdxMM[i]   = PAIdNdxMM(i,betaGammaSq);
          fdNdxPlasmon[i]    = PAIdNdxPlasmon(i,betaGammaSq);
+      }
+      IntegralPAIxSection() ;
+      IntegralCerenkov() ;
+      IntegralPlasmon() ;
+         fdNdxResonance[i]  = PAIdNdxResonance(i,betaGammaSq);
+      }
+      IntegralPAIxSection();
+      IntegralCerenkov();
+      IntegralMM();
+      IntegralPlasmon();
+      IntegralResonance();
       for(i = 0 ; i <= fSplineNumber ; i++)
+      {
          fPAItable[i][j] = fIntegralPAIxSection[i] ;
+      for(i = 0; i <= fSplineNumber; i++)
+      {
+         fPAItable[i][j] = fIntegralPAIxSection[i];
+      }
+   }
 …
 void G4PAIxSection::NormShift(G4double betaGammaSq)
+{
   G4int i, j ;
   for( i = 1 ; i <= fIntervalNumber-1 ; i++ )
+  {
     for( j = 1 ; j <= 2 ; j++ )
+  G4int i, j;
+  for( i = 1; i <= fIntervalNumber-1; i++ )
+  {
+    for( j = 1; j <= 2; j++ )
+    {
       fSplineNumber = (i-1)*2 + j ;
+      fSplineNumber = (i-1)*2 + j;
       if( j == 1 ) fSplineEnergy[fSplineNumber] = fEnergyInterval[i  ]*(1+fDelta);
 …
   fIntegralTerm[1]=RutherfordIntegral(1,fEnergyInterval[1],fSplineEnergy[1]);
   j = 1 ;
   for(i=2;i<=fSplineNumber;i++)
+  j = 1;
+  for( i = 2; i <= fSplineNumber; i++ )
+  {
     if(fSplineEnergy[i]<fEnergyInterval[j+1])
 …
          fIntegralTerm[i] = fIntegralTerm[i-1] +
                             RutherfordIntegral(j,fSplineEnergy[i-1],
                                                  fSplineEnergy[i]   ) ;
+                                                 fSplineEnergy[i]   );
+    }
     else
+    {
        G4double x = RutherfordIntegral(j,fSplineEnergy[i-1],
                                            fEnergyInterval[j+1]   ) ;
+                                           fEnergyInterval[j+1]   );
          j++;
          fIntegralTerm[i] = fIntegralTerm[i-1] + x +
                             RutherfordIntegral(j,fEnergyInterval[j],
                                                  fSplineEnergy[i]    ) ;
+                                                 fSplineEnergy[i]    );
+    }
     // G4cout<<i<<"\t"<<fSplineEnergy[i]<<"\t"<<fIntegralTerm[i]<<"\n"<<G4endl;
+  }
   fNormalizationCof = 2*pi*pi*hbarc*hbarc*fine_structure_const/electron_mass_c2 ;
   fNormalizationCof *= fElectronDensity/fIntegralTerm[fSplineNumber] ;
   // G4cout<<"fNormalizationCof = "<<fNormalizationCof<<G4endl ;
+  fNormalizationCof = 2*pi*pi*hbarc*hbarc*fine_structure_const/electron_mass_c2;
+  fNormalizationCof *= fElectronDensity/fIntegralTerm[fSplineNumber];
+  // G4cout<<"fNormalizationCof = "<<fNormalizationCof<<G4endl;
           // Calculation of PAI differrential cross-section (1/(keV*cm))
           // in the energy points near borders of energy intervals
    for(G4int k=1;k<=fIntervalNumber-1;k++)
+   {
       for(j=1;j<=2;j++)
+      {
          i = (k-1)*2 + j ;
+   for(G4int k = 1; k <= fIntervalNumber-1; k++ )
+   {
+      for( j = 1; j <= 2; j++ )
+      {
+         i = (k-1)*2 + j;
          fImPartDielectricConst[i] = fNormalizationCof*
                                      ImPartDielectricConst(k,fSplineEnergy[i]);
 …
          fDifPAIxSection[i] = DifPAIxSection(i,betaGammaSq);
          fdNdxCerenkov[i]   = PAIdNdxCerenkov(i,betaGammaSq);
+         fdNdxMM[i]   = PAIdNdxMM(i,betaGammaSq);
          fdNdxPlasmon[i]    = PAIdNdxPlasmon(i,betaGammaSq);
+         fdNdxResonance[i]    = PAIdNdxResonance(i,betaGammaSq);
+      }
+   }
 …
 // linear approximation would be smaller than 'fError'
+void
+   G4PAIxSection::SplainPAI(G4double betaGammaSq)
+void G4PAIxSection::SplainPAI(G4double betaGammaSq)
+{
    G4int k = 1 ;
    G4int i = 1 ;
+   G4int k = 1;
+   G4int i = 1;
    while ( (i < fSplineNumber) && (fSplineNumber < fMaxSplineSize-1) )
 …
       if(fSplineEnergy[i+1] > fEnergyInterval[k+1])
+      {
           k++ ;   // Here next energy point is in next energy interval
+          k++;   // Here next energy point is in next energy interval
           i++;
           continue;
 …
       fSplineNumber++;
       for(G4int j = fSplineNumber; j >= i+2 ; j-- )
+      for(G4int j = fSplineNumber; j >= i+2; j-- )
+      {
          fSplineEnergy[j]          = fSplineEnergy[j-1];
 …
          fDifPAIxSection[j] = fDifPAIxSection[j-1];
          fdNdxCerenkov[j]   = fdNdxCerenkov[j-1];
+         fdNdxMM[j]   = fdNdxMM[j-1];
          fdNdxPlasmon[j]    = fdNdxPlasmon[j-1];
+         fdNdxResonance[j]  = fdNdxResonance[j-1];
+      }
       G4double x1  = fSplineEnergy[i];
 …
       G4double a = log10(y2/yy1)/log10(x2/x1);
       G4double b = log10(yy1) - a*log10(x1);
       G4double y = a*log10(en1) + b ;
+      G4double y = a*log10(en1) + b;
       y = pow(10.,y);
 …
       fDifPAIxSection[i+1] = DifPAIxSection(i+1,betaGammaSq);
       fdNdxCerenkov[i+1]   = PAIdNdxCerenkov(i+1,betaGammaSq);
+      fdNdxMM[i+1]   = PAIdNdxMM(i+1,betaGammaSq);
       fdNdxPlasmon[i+1]    = PAIdNdxPlasmon(i+1,betaGammaSq);
+      fdNdxResonance[i+1]  = PAIdNdxResonance(i+1,betaGammaSq);
                   // Condition for next division of this segment or to pass
 …
       if( x < 0 )
+      {
          x = -x ;
+         x = -x;
+      }
       if( x > fError && fSplineNumber < fMaxSplineSize-1 )
 …
                                             G4double x2   )
+{
    G4double  c1, c2, c3 ;
+   G4double  c1, c2, c3;
    // G4cout<<"RI: x1 = "<<x1<<"; "<<"x2 = "<<x2<<G4endl;
    c1 = (x2 - x1)/x1/x2 ;
    c2 = (x2 - x1)*(x2 + x1)/x1/x1/x2/x2 ;
    c3 = (x2 - x1)*(x1*x1 + x1*x2 + x2*x2)/x1/x1/x1/x2/x2/x2 ;
+   c1 = (x2 - x1)/x1/x2;
+   c2 = (x2 - x1)*(x2 + x1)/x1/x1/x2/x2;
+   c3 = (x2 - x1)*(x1*x1 + x1*x2 + x2*x2)/x1/x1/x1/x2/x2/x2;
    // G4cout<<" RI: c1 = "<<c1<<"; "<<"c2 = "<<c2<<"; "<<"c3 = "<<c3<<G4endl;
    return  fA1[k]*log(x2/x1) + fA2[k]*c1 + fA3[k]*c2/2 + fA4[k]*c3/3 ;
+   return  fA1[k]*log(x2/x1) + fA2[k]*c1 + fA3[k]*c2/2 + fA4[k]*c3/3;
 }   // end of RutherfordIntegral
 …
    energy4 = energy3*energy1;
    result = fA1[k]/energy1+fA2[k]/energy2+fA3[k]/energy3+fA4[k]/energy4 ;
    result *=hbarc/energy1 ;
    return result ;
+   result = fA1[k]/energy1+fA2[k]/energy2+fA3[k]/energy3+fA4[k]/energy4;
+   result *=hbarc/energy1;
+   return result;
 }  // end of ImPartDielectricConst
+/////////////////////////////////////////////////////////////////
+//
+// Returns lambda of photon with energy1 in current material
+G4double G4PAIxSection::GetPhotonRange( G4double energy1 )
+{
+  G4int i;
+  G4double energy2, energy3, energy4, result, lambda;
+  energy2 = energy1*energy1;
+  energy3 = energy2*energy1;
+  energy4 = energy3*energy1;
+  // G4double* SandiaCof = fSandia->GetSandiaCofForMaterialPAI(energy1);
+  // result = SandiaCof[0]/energy1+SandiaCof[1]/energy2+SandiaCof[2]/energy3+SandiaCof[3]/energy4;
+  // result *= fDensity;
+  for( i = 1; i <= fIntervalNumber; i++ )
+  {
+     if( energy1 < fEnergyInterval[i]) break;
+  }
+  i--;
+  if(i == 0) i = 1;
+  result = fA1[i]/energy1+fA2[i]/energy2+fA3[i]/energy3+fA4[i]/energy4;
+  if( result > DBL_MIN ) lambda = 1./result;
+  else                   lambda = DBL_MAX;
+  return lambda;
+}
+/////////////////////////////////////////////////////////////////
+//
+// Return lambda of electron with energy1 in current material
+// parametrisation from NIM A554(2005)474-493
+G4double G4PAIxSection::GetElectronRange( G4double energy )
+{
+  G4double range;
+  /*
+  const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+  G4double Z = (*theMaterialTable)[fMaterialIndex]->GetIonisation()->GetZeffective();
+  G4double A = (*theMaterialTable)[fMaterialIndex]->GetA();
+  energy /= keV; // energy in keV in parametrised formula
+  if (energy < 10.)
+  {
+    range = 3.872e-3*A/Z;
+    range *= pow(energy,1.492);
+  }
+  else
+  {
+    range = 6.97e-3*pow(energy,1.6);
+  }
+  */
+  // Blum&Rolandi Particle Detection with Drift Chambers, p. 7
+  G4double cofA = 5.37e-4*g/cm2/keV;
+  G4double cofB = 0.9815;
+  G4double cofC = 3.123e-3/keV;
+  // energy /= keV;
+  range = cofA*energy*( 1 - cofB/(1 + cofC*energy) );
+  // range *= g/cm2;
+  range /= fDensity;
+  return range;
+}
 //////////////////////////////////////////////////////////////////////////////
 …
+{
    G4double x0, x02, x03, x04, x05, x1, x2, xx1 ,xx2 , xx12,
             c1, c2, c3, cof1, cof2, xln1, xln2, xln3, result ;
    x0 = enb ;
    result = 0 ;
+            c1, c2, c3, cof1, cof2, xln1, xln2, xln3, result;
+   x0 = enb;
+   result = 0;
    for(G4int i=1;i<=fIntervalNumber-1;i++)
+   {
       x1 = fEnergyInterval[i] ;
       x2 = fEnergyInterval[i+1] ;
       xx1 = x1 - x0 ;
       xx2 = x2 - x0 ;
       xx12 = xx2/xx1 ;
+      x1 = fEnergyInterval[i];
+      x2 = fEnergyInterval[i+1];
+      xx1 = x1 - x0;
+      xx2 = x2 - x0;
+      xx12 = xx2/xx1;
       if(xx12<0)
 …
          xx12 = -xx12;
+      }
       xln1 = log(x2/x1) ;
       xln2 = log(xx12) ;
       xln3 = log((x2 + x0)/(x1 + x0)) ;
       x02 = x0*x0 ;
       x03 = x02*x0 ;
       x04 = x03*x0 ;
+      xln1 = log(x2/x1);
+      xln2 = log(xx12);
+      xln3 = log((x2 + x0)/(x1 + x0));
+      x02 = x0*x0;
+      x03 = x02*x0;
+      x04 = x03*x0;
       x05 = x04*x0;
       c1  = (x2 - x1)/x1/x2 ;
       c2  = (x2 - x1)*(x2 +x1)/x1/x1/x2/x2 ;
       c3  = (x2 -x1)*(x1*x1 + x1*x2 + x2*x2)/x1/x1/x1/x2/x2/x2 ;
       result -= (fA1[i]/x02 + fA3[i]/x04)*xln1 ;
       result -= (fA2[i]/x02 + fA4[i]/x04)*c1 ;
       result -= fA3[i]*c2/2/x02 ;
       result -= fA4[i]*c3/3/x02 ;
       cof1 = fA1[i]/x02 + fA3[i]/x04 ;
       cof2 = fA2[i]/x03 + fA4[i]/x05 ;
       result += 0.5*(cof1 +cof2)*xln2 ;
       result += 0.5*(cof1 - cof2)*xln3 ;
+      c1  = (x2 - x1)/x1/x2;
+      c2  = (x2 - x1)*(x2 +x1)/x1/x1/x2/x2;
+      c3  = (x2 -x1)*(x1*x1 + x1*x2 + x2*x2)/x1/x1/x1/x2/x2/x2;
+      result -= (fA1[i]/x02 + fA3[i]/x04)*xln1;
+      result -= (fA2[i]/x02 + fA4[i]/x04)*c1;
+      result -= fA3[i]*c2/2/x02;
+      result -= fA4[i]*c3/3/x02;
+      cof1 = fA1[i]/x02 + fA3[i]/x04;
+      cof2 = fA2[i]/x03 + fA4[i]/x05;
+      result += 0.5*(cof1 +cof2)*xln2;
+      result += 0.5*(cof1 - cof2)*xln3;
+   }
    result *= 2*hbarc/pi ;
    return result ;
+   result *= 2*hbarc/pi;
+   return result;
 }   // end of RePartDielectricConst
 …
                                         G4double betaGammaSq  )
+{
    G4double be2,cof,x1,x2,x3,x4,x5,x6,x7,x8,result ;
    //G4double beta, be4 ;
    G4double be4 ;
    G4double betaBohr2 = fine_structure_const*fine_structure_const ;
    G4double betaBohr4 = betaBohr2*betaBohr2*4.0 ;
    be2 = betaGammaSq/(1 + betaGammaSq) ;
    be4 = be2*be2 ;
    //  beta = sqrt(be2) ;
    cof = 1 ;
    x1 = log(2*electron_mass_c2/fSplineEnergy[i]) ;
    if( betaGammaSq < 0.01 ) x2 = log(be2) ;
+   G4double be2,cof,x1,x2,x3,x4,x5,x6,x7,x8,result;
+   //G4double beta, be4;
+   G4double be4;
+   G4double betaBohr2 = fine_structure_const*fine_structure_const;
+   G4double betaBohr4 = betaBohr2*betaBohr2*4.0;
+   be2 = betaGammaSq/(1 + betaGammaSq);
+   be4 = be2*be2;
+   //  beta = sqrt(be2);
+   cof = 1;
+   x1 = log(2*electron_mass_c2/fSplineEnergy[i]);
+   if( betaGammaSq < 0.01 ) x2 = log(be2);
    else
+   {
      x2 = -log( (1/betaGammaSq - fRePartDielectricConst[i])*
                 (1/betaGammaSq - fRePartDielectricConst[i]) +
                 fImPartDielectricConst[i]*fImPartDielectricConst[i] )/2 ;
+                fImPartDielectricConst[i]*fImPartDielectricConst[i] )/2;
+   }
    if( fImPartDielectricConst[i] == 0.0 ||betaGammaSq < 0.01 )
+   {
      x6=0 ;
+     x6=0;
+   }
    else
+   {
      x3 = -fRePartDielectricConst[i] + 1/betaGammaSq ;
+     x3 = -fRePartDielectricConst[i] + 1/betaGammaSq;
      x5 = -1 - fRePartDielectricConst[i] +
           be2*((1 +fRePartDielectricConst[i])*(1 + fRePartDielectricConst[i]) +
           fImPartDielectricConst[i]*fImPartDielectricConst[i]) ;
      x7 = atan2(fImPartDielectricConst[i],x3) ;
      x6 = x5 * x7 ;
+   }
     // if(fImPartDielectricConst[i] == 0) x6 = 0 ;
    x4 = ((x1 + x2)*fImPartDielectricConst[i] + x6)/hbarc ;
    //   if( x4 < 0.0 ) x4 = 0.0 ;
+          fImPartDielectricConst[i]*fImPartDielectricConst[i]);
+     x7 = atan2(fImPartDielectricConst[i],x3);
+     x6 = x5 * x7;
+   }
+    // if(fImPartDielectricConst[i] == 0) x6 = 0;
+   x4 = ((x1 + x2)*fImPartDielectricConst[i] + x6)/hbarc;
+   //   if( x4 < 0.0 ) x4 = 0.0;
    x8 = (1 + fRePartDielectricConst[i])*(1 + fRePartDielectricConst[i]) +
         fImPartDielectricConst[i]*fImPartDielectricConst[i] ;
    result = (x4 + cof*fIntegralTerm[i]/fSplineEnergy[i]/fSplineEnergy[i]) ;
    if(result < 1.0e-8) result = 1.0e-8 ;
    result *= fine_structure_const/be2/pi ;
    //   result *= (1-exp(-beta/betaBohr))*(1-exp(-beta/betaBohr)) ;
    //  result *= (1-exp(-be2/betaBohr2)) ;
    result *= (1-exp(-be4/betaBohr4)) ;
+        fImPartDielectricConst[i]*fImPartDielectricConst[i];
+   result = (x4 + cof*fIntegralTerm[i]/fSplineEnergy[i]/fSplineEnergy[i]);
+   if(result < 1.0e-8) result = 1.0e-8;
+   result *= fine_structure_const/be2/pi;
+   //   result *= (1-exp(-beta/betaBohr))*(1-exp(-beta/betaBohr));
+   //  result *= (1-exp(-be2/betaBohr2));
+   result *= (1-exp(-be4/betaBohr4));
    if(fDensity >= 0.1)
+   {
       result /= x8 ;
+   }
    return result ;
+      result /= x8;
+   }
+   return result;
 } // end of DifPAIxSection
 …
                                          G4double betaGammaSq  )
+{
+   G4double cof, logarithm, x3, x5, argument, modul2, dNdxC ;
+   G4double be2, be4, betaBohr2,betaBohr4,cofBetaBohr ;
+   cof         = 1.0 ;
+   cofBetaBohr = 4.0 ;
+   betaBohr2   = fine_structure_const*fine_structure_const ;
+   betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr ;
+   be2 = betaGammaSq/(1 + betaGammaSq) ;
+   be4 = be2*be2 ;
+   if( betaGammaSq < 0.01 ) logarithm = log(1.0+betaGammaSq) ; // 0.0 ;
+   G4double logarithm, x3, x5, argument, modul2, dNdxC;
+   G4double be2, be4, betaBohr2,betaBohr4,cofBetaBohr;
+   cofBetaBohr = 4.0;
+   betaBohr2   = fine_structure_const*fine_structure_const;
+   betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr;
+   be2 = betaGammaSq/(1 + betaGammaSq);
+   be4 = be2*be2;
+   if( betaGammaSq < 0.01 ) logarithm = log(1.0+betaGammaSq); // 0.0;
    else
+   {
      logarithm  = -log( (1/betaGammaSq - fRePartDielectricConst[i])*
                         (1/betaGammaSq - fRePartDielectricConst[i]) +
                         fImPartDielectricConst[i]*fImPartDielectricConst[i] )*0.5 ;
      logarithm += log(1+1.0/betaGammaSq) ;
+                        fImPartDielectricConst[i]*fImPartDielectricConst[i] )*0.5;
+     logarithm += log(1+1.0/betaGammaSq);
+   }
    if( fImPartDielectricConst[i] == 0.0 || betaGammaSq < 0.01 )
+   {
      argument = 0.0 ;
+     argument = 0.0;
+   }
    else
+   {
      x3 = -fRePartDielectricConst[i] + 1.0/betaGammaSq ;
+     x3 = -fRePartDielectricConst[i] + 1.0/betaGammaSq;
      x5 = -1.0 - fRePartDielectricConst[i] +
           be2*((1.0 +fRePartDielectricConst[i])*(1.0 + fRePartDielectricConst[i]) +
           fImPartDielectricConst[i]*fImPartDielectricConst[i]) ;
+          fImPartDielectricConst[i]*fImPartDielectricConst[i]);
      if( x3 == 0.0 ) argument = 0.5*pi;
      else            argument = atan2(fImPartDielectricConst[i],x3) ;
      argument *= x5  ;
+     else            argument = atan2(fImPartDielectricConst[i],x3);
+     argument *= x5 ;
+   }
    dNdxC = ( logarithm*fImPartDielectricConst[i] + argument )/hbarc ;
+   dNdxC = ( logarithm*fImPartDielectricConst[i] + argument )/hbarc;
    if(dNdxC < 1.0e-8) dNdxC = 1.0e-8 ;
    dNdxC *= fine_structure_const/be2/pi ;
    dNdxC *= (1-exp(-be4/betaBohr4)) ;
+   if(dNdxC < 1.0e-8) dNdxC = 1.0e-8;
+   dNdxC *= fine_structure_const/be2/pi;
+   dNdxC *= (1-exp(-be4/betaBohr4));
    if(fDensity >= 0.1)
+   {
       modul2 = (1.0 + fRePartDielectricConst[i])*(1.0 + fRePartDielectricConst[i]) +
                     fImPartDielectricConst[i]*fImPartDielectricConst[i] ;
       dNdxC /= modul2 ;
+   }
    return dNdxC ;
+                    fImPartDielectricConst[i]*fImPartDielectricConst[i];
+      dNdxC /= modul2;
+   }
+   return dNdxC;
 } // end of PAIdNdxCerenkov
+//////////////////////////////////////////////////////////////////////////
+//
+// Calculation od dN/dx of collisions of MM with creation of Cerenkov pseudo-photons
+G4double G4PAIxSection::PAIdNdxMM( G4int    i ,
+                                         G4double betaGammaSq  )
+{
+   G4double logarithm, x3, x5, argument, dNdxC;
+   G4double be2, be4, betaBohr2,betaBohr4,cofBetaBohr;
+   cofBetaBohr = 4.0;
+   betaBohr2   = fine_structure_const*fine_structure_const;
+   betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr;
+   be2 = betaGammaSq/(1 + betaGammaSq);
+   be4 = be2*be2;
+   if( betaGammaSq < 0.01 ) logarithm = log(1.0+betaGammaSq); // 0.0;
+   else
+   {
+     logarithm  = -log( (1/betaGammaSq - fRePartDielectricConst[i])*
+                        (1/betaGammaSq - fRePartDielectricConst[i]) +
+                        fImPartDielectricConst[i]*fImPartDielectricConst[i] )*0.5;
+     logarithm += log(1+1.0/betaGammaSq);
+   }
+   if( fImPartDielectricConst[i] == 0.0 || betaGammaSq < 0.01 )
+   {
+     argument = 0.0;
+   }
+   else
+   {
+     x3 = -fRePartDielectricConst[i] + 1.0/betaGammaSq;
+     x5 = be2*( 1.0 + fRePartDielectricConst[i] ) - 1.0;
+     if( x3 == 0.0 ) argument = 0.5*pi;
+     else            argument = atan2(fImPartDielectricConst[i],x3);
+     argument *= x5 ;
+   }
+   dNdxC = ( logarithm*fImPartDielectricConst[i]*be2 + argument )/hbarc;
+   if(dNdxC < 1.0e-8) dNdxC = 1.0e-8;
+   dNdxC *= fine_structure_const/be2/pi;
+   dNdxC *= (1-exp(-be4/betaBohr4));
+   return dNdxC;
+} // end of PAIdNdxMM
 //////////////////////////////////////////////////////////////////////////
 …
                                         G4double betaGammaSq  )
+{
    G4double cof, resonance, modul2, dNdxP ;
    G4double be2, be4, betaBohr2, betaBohr4, cofBetaBohr ;
    cof = 1 ;
    cofBetaBohr = 4.0 ;
    betaBohr2   = fine_structure_const*fine_structure_const ;
    betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr ;
    be2 = betaGammaSq/(1 + betaGammaSq) ;
    be4 = be2*be2 ;
+   G4double resonance, modul2, dNdxP, cof = 1.;
+   G4double be2, be4, betaBohr2, betaBohr4, cofBetaBohr;
+   cofBetaBohr = 4.0;
+   betaBohr2   = fine_structure_const*fine_structure_const;
+   betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr;
+   be2 = betaGammaSq/(1 + betaGammaSq);
+   be4 = be2*be2;
    resonance = log(2*electron_mass_c2*be2/fSplineEnergy[i]) ;
    resonance *= fImPartDielectricConst[i]/hbarc ;
    dNdxP = ( resonance + cof*fIntegralTerm[i]/fSplineEnergy[i]/fSplineEnergy[i] ) ;
    if( dNdxP < 1.0e-8 ) dNdxP = 1.0e-8 ;
    dNdxP *= fine_structure_const/be2/pi ;
    dNdxP *= (1-exp(-be4/betaBohr4)) ;
+   resonance = log(2*electron_mass_c2*be2/fSplineEnergy[i]);
+   resonance *= fImPartDielectricConst[i]/hbarc;
+   dNdxP = ( resonance + cof*fIntegralTerm[i]/fSplineEnergy[i]/fSplineEnergy[i] );
+   if( dNdxP < 1.0e-8 ) dNdxP = 1.0e-8;
+   dNdxP *= fine_structure_const/be2/pi;
+   dNdxP *= (1-exp(-be4/betaBohr4));
    if( fDensity >= 0.1 )
+   {
      modul2 = (1 + fRePartDielectricConst[i])*(1 + fRePartDielectricConst[i]) +
         fImPartDielectricConst[i]*fImPartDielectricConst[i] ;
      dNdxP /= modul2 ;
+   }
    return dNdxP ;
+        fImPartDielectricConst[i]*fImPartDielectricConst[i];
+     dNdxP /= modul2;
+   }
+   return dNdxP;
 } // end of PAIdNdxPlasmon
+//////////////////////////////////////////////////////////////////////////
+//
+// Calculation od dN/dx of collisions with creation of longitudinal EM
+// resonance excitations (plasmons, delta-electrons)
+G4double G4PAIxSection::PAIdNdxResonance( G4int    i ,
+                                        G4double betaGammaSq  )
+{
+   G4double resonance, modul2, dNdxP;
+   G4double be2, be4, betaBohr2, betaBohr4, cofBetaBohr;
+   cofBetaBohr = 4.0;
+   betaBohr2   = fine_structure_const*fine_structure_const;
+   betaBohr4   = betaBohr2*betaBohr2*cofBetaBohr;
+   be2 = betaGammaSq/(1 + betaGammaSq);
+   be4 = be2*be2;
+   resonance = log(2*electron_mass_c2*be2/fSplineEnergy[i]);
+   resonance *= fImPartDielectricConst[i]/hbarc;
+   dNdxP = resonance;
+   if( dNdxP < 1.0e-8 ) dNdxP = 1.0e-8;
+   dNdxP *= fine_structure_const/be2/pi;
+   dNdxP *= (1-exp(-be4/betaBohr4));
+   if( fDensity >= 0.1 )
+   {
+     modul2 = (1 + fRePartDielectricConst[i])*(1 + fRePartDielectricConst[i]) +
+        fImPartDielectricConst[i]*fImPartDielectricConst[i];
+     dNdxP /= modul2;
+   }
+   return dNdxP;
+} // end of PAIdNdxResonance
 ////////////////////////////////////////////////////////////////////////
 …
 void G4PAIxSection::IntegralPAIxSection()
+{
   fIntegralPAIxSection[fSplineNumber] = 0 ;
   fIntegralPAIdEdx[fSplineNumber]     = 0 ;
   fIntegralPAIxSection[0]             = 0 ;
   G4int k = fIntervalNumber -1 ;
   for(G4int i = fSplineNumber-1 ; i >= 1 ; i--)
+  fIntegralPAIxSection[fSplineNumber] = 0;
+  fIntegralPAIdEdx[fSplineNumber]     = 0;
+  fIntegralPAIxSection[0]             = 0;
+  G4int k = fIntervalNumber -1;
+  for(G4int i = fSplineNumber-1; i >= 1; i--)
+  {
     if(fSplineEnergy[i] >= fEnergyInterval[k])
+    {
       fIntegralPAIxSection[i] = fIntegralPAIxSection[i+1] + SumOverInterval(i) ;
       fIntegralPAIdEdx[i] = fIntegralPAIdEdx[i+1] + SumOverIntervaldEdx(i) ;
+      fIntegralPAIxSection[i] = fIntegralPAIxSection[i+1] + SumOverInterval(i);
+      fIntegralPAIdEdx[i] = fIntegralPAIdEdx[i+1] + SumOverIntervaldEdx(i);
+    }
     else
+    {
       fIntegralPAIxSection[i] = fIntegralPAIxSection[i+1] +
                                    SumOverBorder(i+1,fEnergyInterval[k]) ;
+                                   SumOverBorder(i+1,fEnergyInterval[k]);
       fIntegralPAIdEdx[i] = fIntegralPAIdEdx[i+1] +
                                    SumOverBorderdEdx(i+1,fEnergyInterval[k]) ;
       k-- ;
+                                   SumOverBorderdEdx(i+1,fEnergyInterval[k]);
+      k--;
+    }
+  }
 …
 void G4PAIxSection::IntegralCerenkov()
+{
   G4int i, k ;
    fIntegralCerenkov[fSplineNumber] = 0 ;
    fIntegralCerenkov[0] = 0 ;
    k = fIntervalNumber -1 ;
    for( i = fSplineNumber-1 ; i >= 1 ; i-- )
+  G4int i, k;
+   fIntegralCerenkov[fSplineNumber] = 0;
+   fIntegralCerenkov[0] = 0;
+   k = fIntervalNumber -1;
+   for( i = fSplineNumber-1; i >= 1; i-- )
+   {
       if(fSplineEnergy[i] >= fEnergyInterval[k])
+      {
         fIntegralCerenkov[i] = fIntegralCerenkov[i+1] + SumOverInterCerenkov(i) ;
+        fIntegralCerenkov[i] = fIntegralCerenkov[i+1] + SumOverInterCerenkov(i);
         // G4cout<<"int: i = "<<i<<"; sumC = "<<fIntegralCerenkov[i]<<G4endl;
+      }
 …
+      {
         fIntegralCerenkov[i] = fIntegralCerenkov[i+1] +
                                    SumOverBordCerenkov(i+1,fEnergyInterval[k]) ;
         k-- ;
+                                   SumOverBordCerenkov(i+1,fEnergyInterval[k]);
+        k--;
         // G4cout<<"bord: i = "<<i<<"; sumC = "<<fIntegralCerenkov[i]<<G4endl;
+      }
 …
 }   // end of IntegralCerenkov
+////////////////////////////////////////////////////////////////////////
+//
+// Calculation of the PAI MM-Cerenkov integral cross-section
+// fIntegralMM[1] = specific MM-Cerenkov ionisation, 1/cm
+// and fIntegralMM[0] = mean MM-Cerenkov loss per cm  in keV/cm
+void G4PAIxSection::IntegralMM()
+{
+  G4int i, k;
+   fIntegralMM[fSplineNumber] = 0;
+   fIntegralMM[0] = 0;
+   k = fIntervalNumber -1;
+   for( i = fSplineNumber-1; i >= 1; i-- )
+   {
+      if(fSplineEnergy[i] >= fEnergyInterval[k])
+      {
+        fIntegralMM[i] = fIntegralMM[i+1] + SumOverInterMM(i);
+        // G4cout<<"int: i = "<<i<<"; sumC = "<<fIntegralMM[i]<<G4endl;
+      }
+      else
+      {
+        fIntegralMM[i] = fIntegralMM[i+1] +
+                                   SumOverBordMM(i+1,fEnergyInterval[k]);
+        k--;
+        // G4cout<<"bord: i = "<<i<<"; sumC = "<<fIntegralMM[i]<<G4endl;
+      }
+   }
+}   // end of IntegralMM
 ////////////////////////////////////////////////////////////////////////
 …
 void G4PAIxSection::IntegralPlasmon()
+{
    fIntegralPlasmon[fSplineNumber] = 0 ;
    fIntegralPlasmon[0] = 0 ;
    G4int k = fIntervalNumber -1 ;
+   fIntegralPlasmon[fSplineNumber] = 0;
+   fIntegralPlasmon[0] = 0;
+   G4int k = fIntervalNumber -1;
    for(G4int i=fSplineNumber-1;i>=1;i--)
+   {
       if(fSplineEnergy[i] >= fEnergyInterval[k])
+      {
         fIntegralPlasmon[i] = fIntegralPlasmon[i+1] + SumOverInterPlasmon(i) ;
+        fIntegralPlasmon[i] = fIntegralPlasmon[i+1] + SumOverInterPlasmon(i);
+      }
       else
+      {
         fIntegralPlasmon[i] = fIntegralPlasmon[i+1] +
                                    SumOverBordPlasmon(i+1,fEnergyInterval[k]) ;
         k-- ;
+                                   SumOverBordPlasmon(i+1,fEnergyInterval[k]);
+        k--;
+      }
+   }
 }   // end of IntegralPlasmon
+////////////////////////////////////////////////////////////////////////
+//
+// Calculation of the PAI resonance integral cross-section
+// fIntegralResonance[1] = resonance primary ionisation, 1/cm
+// and fIntegralResonance[0] = mean resonance loss per cm  in keV/cm
+void G4PAIxSection::IntegralResonance()
+{
+   fIntegralResonance[fSplineNumber] = 0;
+   fIntegralResonance[0] = 0;
+   G4int k = fIntervalNumber -1;
+   for(G4int i=fSplineNumber-1;i>=1;i--)
+   {
+      if(fSplineEnergy[i] >= fEnergyInterval[k])
+      {
+        fIntegralResonance[i] = fIntegralResonance[i+1] + SumOverInterResonance(i);
+      }
+      else
+      {
+        fIntegralResonance[i] = fIntegralResonance[i+1] +
+                                   SumOverBordResonance(i+1,fEnergyInterval[k]);
+        k--;
+      }
+   }
+}   // end of IntegralResonance
 //////////////////////////////////////////////////////////////////////
 …
 G4double G4PAIxSection::SumOverInterval( G4int i )
+{
    G4double x0,x1,y0,yy1,a,b,c,result ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fDifPAIxSection[i] ;
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fDifPAIxSection[i];
    yy1 = fDifPAIxSection[i+1];
    c = x1/x0;
    a = log10(yy1/y0)/log10(c) ;
    // b = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a) ;
    a += 1 ;
+   a = log10(yy1/y0)/log10(c);
+   // b = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 1;
    if(a == 0)
+   {
       result = b*log(x1/x0) ;
+      result = b*log(x1/x0);
+   }
    else
+   {
       result = y0*(x1*pow(c,a-1) - x0)/a ;
+      result = y0*(x1*pow(c,a-1) - x0)/a;
+   }
    a++;
    if(a == 0)
+   {
       fIntegralPAIxSection[0] += b*log(x1/x0) ;
+      fIntegralPAIxSection[0] += b*log(x1/x0);
+   }
    else
+   {
       fIntegralPAIxSection[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a ;
+   }
    return result ;
+      fIntegralPAIxSection[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
+   }
+   return result;
 } //  end of SumOverInterval
 …
 G4double G4PAIxSection::SumOverIntervaldEdx( G4int i )
+{
    G4double x0,x1,y0,yy1,a,b,c,result ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fDifPAIxSection[i] ;
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fDifPAIxSection[i];
    yy1 = fDifPAIxSection[i+1];
    c = x1/x0;
    a = log10(yy1/y0)/log10(c) ;
    // b = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a) ;
    a += 2 ;
+   a = log10(yy1/y0)/log10(c);
+   // b = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 2;
    if(a == 0)
+   {
      result = b*log(x1/x0) ;
+     result = b*log(x1/x0);
+   }
    else
+   {
      result = y0*(x1*x1*pow(c,a-2) - x0*x0)/a ;
+   }
    return result ;
+     result = y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
+   }
+   return result;
 } //  end of SumOverInterval
 …
 G4double G4PAIxSection::SumOverInterCerenkov( G4int i )
+{
    G4double x0,x1,y0,yy1,a,b,c,result ;
    x0  = fSplineEnergy[i] ;
    x1  = fSplineEnergy[i+1] ;
    y0  = fdNdxCerenkov[i] ;
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0  = fSplineEnergy[i];
+   x1  = fSplineEnergy[i+1];
+   y0  = fdNdxCerenkov[i];
    yy1 = fdNdxCerenkov[i+1];
    // G4cout<<"SumC, i = "<<i<<"; x0 ="<<x0<<"; x1 = "<<x1
 …
    c = x1/x0;
    a = log10(yy1/y0)/log10(c) ;
    b = y0/pow(x0,a) ;
    a += 1.0 ;
    if(a == 0) result = b*log(c) ;
    else       result = y0*(x1*pow(c,a-1) - x0)/a ;
    a += 1.0 ;
    if( a == 0 ) fIntegralCerenkov[0] += b*log(x1/x0) ;
    else         fIntegralCerenkov[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a ;
+   a = log10(yy1/y0)/log10(c);
+   b = y0/pow(x0,a);
+   a += 1.0;
+   if(a == 0) result = b*log(c);
+   else       result = y0*(x1*pow(c,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralCerenkov[0] += b*log(x1/x0);
+   else         fIntegralCerenkov[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
    //  G4cout<<"a = "<<a<<"; b = "<<b<<"; result = "<<result<<G4endl;
    return result ;
+   return result;
 } //  end of SumOverInterCerenkov
+//////////////////////////////////////////////////////////////////////
+//
+// Calculation the PAI MM-Cerenkov integral cross-section inside
+// of interval of continuous values of photo-ionisation Cerenkov
+// cross-section. Parameter  'i' is the number of interval.
+G4double G4PAIxSection::SumOverInterMM( G4int i )
+{
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0  = fSplineEnergy[i];
+   x1  = fSplineEnergy[i+1];
+   y0  = fdNdxMM[i];
+   yy1 = fdNdxMM[i+1];
+   // G4cout<<"SumC, i = "<<i<<"; x0 ="<<x0<<"; x1 = "<<x1
+   //   <<"; y0 = "<<y0<<"; yy1 = "<<yy1<<G4endl;
+   c = x1/x0;
+   a = log10(yy1/y0)/log10(c);
+   b = y0/pow(x0,a);
+   a += 1.0;
+   if(a == 0) result = b*log(c);
+   else       result = y0*(x1*pow(c,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralMM[0] += b*log(x1/x0);
+   else         fIntegralMM[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
+   //  G4cout<<"a = "<<a<<"; b = "<<b<<"; result = "<<result<<G4endl;
+   return result;
+} //  end of SumOverInterMM
 //////////////////////////////////////////////////////////////////////
 …
 G4double G4PAIxSection::SumOverInterPlasmon( G4int i )
+{
    G4double x0,x1,y0,yy1,a,b,c,result ;
    x0  = fSplineEnergy[i] ;
    x1  = fSplineEnergy[i+1] ;
    y0  = fdNdxPlasmon[i] ;
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0  = fSplineEnergy[i];
+   x1  = fSplineEnergy[i+1];
+   y0  = fdNdxPlasmon[i];
    yy1 = fdNdxPlasmon[i+1];
    c =x1/x0;
    a = log10(yy1/y0)/log10(c) ;
    // b = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a) ;
    a += 1.0 ;
    if(a == 0) result = b*log(x1/x0) ;
    else       result = y0*(x1*pow(c,a-1) - x0)/a ;
    a += 1.0 ;
    if( a == 0 ) fIntegralPlasmon[0] += b*log(x1/x0) ;
    else         fIntegralPlasmon[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a ;
    return result ;
+   a = log10(yy1/y0)/log10(c);
+   // b = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 1.0;
+   if(a == 0) result = b*log(x1/x0);
+   else       result = y0*(x1*pow(c,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralPlasmon[0] += b*log(x1/x0);
+   else         fIntegralPlasmon[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
+   return result;
 } //  end of SumOverInterPlasmon
+//////////////////////////////////////////////////////////////////////
+//
+// Calculation the PAI resonance integral cross-section inside
+// of interval of continuous values of photo-ionisation resonance
+// cross-section. Parameter  'i' is the number of interval.
+G4double G4PAIxSection::SumOverInterResonance( G4int i )
+{
+   G4double x0,x1,y0,yy1,a,b,c,result;
+   x0  = fSplineEnergy[i];
+   x1  = fSplineEnergy[i+1];
+   y0  = fdNdxResonance[i];
+   yy1 = fdNdxResonance[i+1];
+   c =x1/x0;
+   a = log10(yy1/y0)/log10(c);
+   // b = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 1.0;
+   if(a == 0) result = b*log(x1/x0);
+   else       result = y0*(x1*pow(c,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralResonance[0] += b*log(x1/x0);
+   else         fIntegralResonance[0] += y0*(x1*x1*pow(c,a-2) - x0*x0)/a;
+   return result;
+} //  end of SumOverInterResonance
 ///////////////////////////////////////////////////////////////////////////////
 …
                                        G4double en0    )
+{
    G4double x0,x1,y0,yy1,a,b,c,d,e0,result ;
    e0 = en0 ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fDifPAIxSection[i] ;
    yy1 = fDifPAIxSection[i+1] ;
+   G4double x0,x1,y0,yy1,a,b,c,d,e0,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fDifPAIxSection[i];
+   yy1 = fDifPAIxSection[i+1];
    c = x1/x0;
    d = e0/x0;
    a = log10(yy1/y0)/log10(x1/x0) ;
    // b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a);  // pow(10.,b) ;
    a += 1 ;
+   a = log10(yy1/y0)/log10(x1/x0);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);  // pow(10.,b);
+   a += 1;
    if(a == 0)
+   {
       result = b*log(x0/e0) ;
+      result = b*log(x0/e0);
+   }
    else
+   {
       result = y0*(x0 - e0*pow(d,a-1))/a ;
+   }
    a++ ;
+      result = y0*(x0 - e0*pow(d,a-1))/a;
+   }
+   a++;
    if(a == 0)
+   {
       fIntegralPAIxSection[0] += b*log(x0/e0) ;
+      fIntegralPAIxSection[0] += b*log(x0/e0);
+   }
    else
+   {
       fIntegralPAIxSection[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a ;
+   }
    x0 = fSplineEnergy[i - 1] ;
    x1 = fSplineEnergy[i - 2] ;
    y0 = fDifPAIxSection[i - 1] ;
    yy1 = fDifPAIxSection[i - 2] ;
+      fIntegralPAIxSection[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
+   }
+   x0 = fSplineEnergy[i - 1];
+   x1 = fSplineEnergy[i - 2];
+   y0 = fDifPAIxSection[i - 1];
+   yy1 = fDifPAIxSection[i - 2];
    c = x1/x0;
    d = e0/x0;
    a = log10(yy1/y0)/log10(x1/x0) ;
    //  b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a) ;
    a += 1 ;
+   a = log10(yy1/y0)/log10(x1/x0);
+   //  b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 1;
    if(a == 0)
+   {
       result += b*log(e0/x0) ;
+      result += b*log(e0/x0);
+   }
    else
+   {
       result += y0*(e0*pow(d,a-1) - x0)/a ;
+   }
    a++ ;
+      result += y0*(e0*pow(d,a-1) - x0)/a;
+   }
+   a++;
    if(a == 0)
+   {
       fIntegralPAIxSection[0] += b*log(e0/x0) ;
+      fIntegralPAIxSection[0] += b*log(e0/x0);
+   }
    else
+   {
       fIntegralPAIxSection[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a ;
+   }
    return result ;
+      fIntegralPAIxSection[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
+   }
+   return result;
+}
 …
                                        G4double en0    )
+{
    G4double x0,x1,y0,yy1,a,b,c,d,e0,result ;
    e0 = en0 ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fDifPAIxSection[i] ;
    yy1 = fDifPAIxSection[i+1] ;
+   G4double x0,x1,y0,yy1,a,b,c,d,e0,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fDifPAIxSection[i];
+   yy1 = fDifPAIxSection[i+1];
    c = x1/x0;
    d = e0/x0;
    a = log10(yy1/y0)/log10(x1/x0) ;
    // b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a);  // pow(10.,b) ;
    a += 2 ;
+   a = log10(yy1/y0)/log10(x1/x0);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);  // pow(10.,b);
+   a += 2;
    if(a == 0)
+   {
       result = b*log(x0/e0) ;
+      result = b*log(x0/e0);
+   }
    else
+   {
       result = y0*(x0*x0 - e0*e0*pow(d,a-2))/a ;
+   }
    x0 = fSplineEnergy[i - 1] ;
    x1 = fSplineEnergy[i - 2] ;
    y0 = fDifPAIxSection[i - 1] ;
    yy1 = fDifPAIxSection[i - 2] ;
+      result = y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
+   }
+   x0 = fSplineEnergy[i - 1];
+   x1 = fSplineEnergy[i - 2];
+   y0 = fDifPAIxSection[i - 1];
+   yy1 = fDifPAIxSection[i - 2];
    c = x1/x0;
    d = e0/x0;
    a = log10(yy1/y0)/log10(x1/x0) ;
    //  b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a) ;
    a += 2 ;
+   a = log10(yy1/y0)/log10(x1/x0);
+   //  b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);
+   a += 2;
    if(a == 0)
+   {
       result += b*log(e0/x0) ;
+      result += b*log(e0/x0);
+   }
    else
+   {
       result += y0*(e0*e0*pow(d,a-2) - x0*x0)/a ;
+   }
    return result ;
+      result += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
+   }
+   return result;
+}
 …
                                              G4double en0    )
+{
    G4double x0,x1,y0,yy1,a,b,e0,c,d,result ;
    e0 = en0 ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fdNdxCerenkov[i] ;
    yy1 = fdNdxCerenkov[i+1] ;
+   G4double x0,x1,y0,yy1,a,b,e0,c,d,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fdNdxCerenkov[i];
+   yy1 = fdNdxCerenkov[i+1];
    //  G4cout<<G4endl;
    //  G4cout<<"SumBordC, i = "<<i<<"; en0 = "<<en0<<"; x0 ="<<x0<<"; x1 = "<<x1
    //     <<"; y0 = "<<y0<<"; yy1 = "<<yy1<<G4endl;
    c = x1/x0 ;
    d = e0/x0 ;
    a = log10(yy1/y0)/log10(c) ;
    // b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a); // pow(10.,b0) ;
    a += 1.0 ;
    if( a == 0 ) result = b*log(x0/e0) ;
    else         result = y0*(x0 - e0*pow(d,a-1))/a ;
    a += 1.0 ;
    if( a == 0 ) fIntegralCerenkov[0] += b*log(x0/e0) ;
    else         fIntegralCerenkov[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a ;
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a); // pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result = b*log(x0/e0);
+   else         result = y0*(x0 - e0*pow(d,a-1))/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralCerenkov[0] += b*log(x0/e0);
+   else         fIntegralCerenkov[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
 // G4cout<<"a = "<<a<<"; b0 = "<<b0<<"; b = "<<b<<"; result = "<<result<<G4endl;
    x0  = fSplineEnergy[i - 1] ;
    x1  = fSplineEnergy[i - 2] ;
    y0  = fdNdxCerenkov[i - 1] ;
    yy1 = fdNdxCerenkov[i - 2] ;
+   x0  = fSplineEnergy[i - 1];
+   x1  = fSplineEnergy[i - 2];
+   y0  = fdNdxCerenkov[i - 1];
+   yy1 = fdNdxCerenkov[i - 2];
    // G4cout<<"x0 ="<<x0<<"; x1 = "<<x1
    //    <<"; y0 = "<<y0<<"; yy1 = "<<yy1<<G4endl;
    c = x1/x0 ;
    d = e0/x0 ;
    a  = log10(yy1/y0)/log10(x1/x0) ;
    // b0 = log10(y0) - a*log10(x0) ;
    b  =  y0/pow(x0,a);  // pow(10.,b0) ;
    a += 1.0 ;
    if( a == 0 ) result += b*log(e0/x0) ;
    else         result += y0*(e0*pow(d,a-1) - x0 )/a ;
    a += 1.0 ;
    if( a == 0 )   fIntegralCerenkov[0] += b*log(e0/x0) ;
    else           fIntegralCerenkov[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a ;
+   c = x1/x0;
+   d = e0/x0;
+   a  = log10(yy1/y0)/log10(x1/x0);
+   // b0 = log10(y0) - a*log10(x0);
+   b  =  y0/pow(x0,a);  // pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result += b*log(e0/x0);
+   else         result += y0*(e0*pow(d,a-1) - x0 )/a;
+   a += 1.0;
+   if( a == 0 )   fIntegralCerenkov[0] += b*log(e0/x0);
+   else           fIntegralCerenkov[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
    // G4cout<<"a = "<<a<<"; b0 = "<<b0<<"; b = "
    // <<b<<"; result = "<<result<<G4endl;
+   return result ;
+   return result;
+}
+///////////////////////////////////////////////////////////////////////////////
+//
+// Integration of MM-Cerenkov cross-section for the case of
+// passing across border between intervals
+G4double G4PAIxSection::SumOverBordMM( G4int      i ,
+                                             G4double en0    )
+{
+   G4double x0,x1,y0,yy1,a,b,e0,c,d,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fdNdxMM[i];
+   yy1 = fdNdxMM[i+1];
+   //  G4cout<<G4endl;
+   //  G4cout<<"SumBordC, i = "<<i<<"; en0 = "<<en0<<"; x0 ="<<x0<<"; x1 = "<<x1
+   //     <<"; y0 = "<<y0<<"; yy1 = "<<yy1<<G4endl;
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a); // pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result = b*log(x0/e0);
+   else         result = y0*(x0 - e0*pow(d,a-1))/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralMM[0] += b*log(x0/e0);
+   else         fIntegralMM[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
+// G4cout<<"a = "<<a<<"; b0 = "<<b0<<"; b = "<<b<<"; result = "<<result<<G4endl;
+   x0  = fSplineEnergy[i - 1];
+   x1  = fSplineEnergy[i - 2];
+   y0  = fdNdxMM[i - 1];
+   yy1 = fdNdxMM[i - 2];
+   // G4cout<<"x0 ="<<x0<<"; x1 = "<<x1
+   //    <<"; y0 = "<<y0<<"; yy1 = "<<yy1<<G4endl;
+   c = x1/x0;
+   d = e0/x0;
+   a  = log10(yy1/y0)/log10(x1/x0);
+   // b0 = log10(y0) - a*log10(x0);
+   b  =  y0/pow(x0,a);  // pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result += b*log(e0/x0);
+   else         result += y0*(e0*pow(d,a-1) - x0 )/a;
+   a += 1.0;
+   if( a == 0 )   fIntegralMM[0] += b*log(e0/x0);
+   else           fIntegralMM[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
+   // G4cout<<"a = "<<a<<"; b0 = "<<b0<<"; b = "
+   // <<b<<"; result = "<<result<<G4endl;
+   return result;
+}
 …
                                              G4double en0    )
+{
    G4double x0,x1,y0,yy1,a,b,c,d,e0,result ;
    e0 = en0 ;
    x0 = fSplineEnergy[i] ;
    x1 = fSplineEnergy[i+1] ;
    y0 = fdNdxPlasmon[i] ;
    yy1 = fdNdxPlasmon[i+1] ;
    c = x1/x0 ;
    d = e0/x0 ;
    a = log10(yy1/y0)/log10(c) ;
    //  b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a); //pow(10.,b) ;
    a += 1.0 ;
    if( a == 0 ) result = b*log(x0/e0) ;
    else         result = y0*(x0 - e0*pow(d,a-1))/a ;
    a += 1.0 ;
    if( a == 0 ) fIntegralPlasmon[0] += b*log(x0/e0) ;
    else         fIntegralPlasmon[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a ;
    x0 = fSplineEnergy[i - 1] ;
    x1 = fSplineEnergy[i - 2] ;
    y0 = fdNdxPlasmon[i - 1] ;
    yy1 = fdNdxPlasmon[i - 2] ;
    c = x1/x0 ;
    d = e0/x0 ;
    a = log10(yy1/y0)/log10(c) ;
    // b0 = log10(y0) - a*log10(x0) ;
    b = y0/pow(x0,a);// pow(10.,b0) ;
    a += 1.0 ;
    if( a == 0 ) result += b*log(e0/x0) ;
    else         result += y0*(e0*pow(d,a-1) - x0)/a ;
    a += 1.0 ;
    if( a == 0 )   fIntegralPlasmon[0] += b*log(e0/x0) ;
    else           fIntegralPlasmon[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a ;
    return result ;
+   G4double x0,x1,y0,yy1,a,b,c,d,e0,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fdNdxPlasmon[i];
+   yy1 = fdNdxPlasmon[i+1];
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   //  b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a); //pow(10.,b);
+   a += 1.0;
+   if( a == 0 ) result = b*log(x0/e0);
+   else         result = y0*(x0 - e0*pow(d,a-1))/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralPlasmon[0] += b*log(x0/e0);
+   else         fIntegralPlasmon[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
+   x0 = fSplineEnergy[i - 1];
+   x1 = fSplineEnergy[i - 2];
+   y0 = fdNdxPlasmon[i - 1];
+   yy1 = fdNdxPlasmon[i - 2];
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);// pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result += b*log(e0/x0);
+   else         result += y0*(e0*pow(d,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 )   fIntegralPlasmon[0] += b*log(e0/x0);
+   else           fIntegralPlasmon[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
+   return result;
+}
+///////////////////////////////////////////////////////////////////////////////
+//
+// Integration of resonance cross-section for the case of
+// passing across border between intervals
+G4double G4PAIxSection::SumOverBordResonance( G4int      i ,
+                                             G4double en0    )
+{
+   G4double x0,x1,y0,yy1,a,b,c,d,e0,result;
+   e0 = en0;
+   x0 = fSplineEnergy[i];
+   x1 = fSplineEnergy[i+1];
+   y0 = fdNdxResonance[i];
+   yy1 = fdNdxResonance[i+1];
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   //  b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a); //pow(10.,b);
+   a += 1.0;
+   if( a == 0 ) result = b*log(x0/e0);
+   else         result = y0*(x0 - e0*pow(d,a-1))/a;
+   a += 1.0;
+   if( a == 0 ) fIntegralResonance[0] += b*log(x0/e0);
+   else         fIntegralResonance[0] += y0*(x0*x0 - e0*e0*pow(d,a-2))/a;
+   x0 = fSplineEnergy[i - 1];
+   x1 = fSplineEnergy[i - 2];
+   y0 = fdNdxResonance[i - 1];
+   yy1 = fdNdxResonance[i - 2];
+   c = x1/x0;
+   d = e0/x0;
+   a = log10(yy1/y0)/log10(c);
+   // b0 = log10(y0) - a*log10(x0);
+   b = y0/pow(x0,a);// pow(10.,b0);
+   a += 1.0;
+   if( a == 0 ) result += b*log(e0/x0);
+   else         result += y0*(e0*pow(d,a-1) - x0)/a;
+   a += 1.0;
+   if( a == 0 )   fIntegralResonance[0] += b*log(e0/x0);
+   else           fIntegralResonance[0] += y0*(e0*e0*pow(d,a-2) - x0*x0)/a;
+   return result;
+}
 /////////////////////////////////////////////////////////////////////////
 //
 //
+// Returns random PAI-total energy loss over step
 G4double G4PAIxSection::GetStepEnergyLoss( G4double step )
+{
+  G4int iTransfer  ;
+  G4long numOfCollisions ;
+  G4double loss = 0.0 ;
+  G4double meanNumber, position ;
+  // G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<G4endl ;
+  meanNumber = fIntegralPAIxSection[1]*step ;
+  numOfCollisions = G4Poisson(meanNumber) ;
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
+  G4long numOfCollisions;
+  G4double meanNumber, loss = 0.0;
+  // G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<G4endl;
+  meanNumber = fIntegralPAIxSection[1]*step;
+  numOfCollisions = G4Poisson(meanNumber);
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl;
   while(numOfCollisions)
+  {
+    position = fIntegralPAIxSection[1]*G4UniformRand() ;
+    for( iTransfer=1 ; iTransfer<=fSplineNumber ; iTransfer++ )
+    {
+        if( position >= fIntegralPAIxSection[iTransfer] ) break ;
+    }
+    loss += fSplineEnergy[iTransfer]  ;
+    numOfCollisions-- ;
+   loss += GetEnergyTransfer();
+   numOfCollisions--;
+  }
   // G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<G4endl ;
   return loss ;
+  // G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<G4endl;
+  return loss;
+}
 /////////////////////////////////////////////////////////////////////////
 //
+//
+// Returns random PAI-total energy transfer in one collision
+G4double G4PAIxSection::GetEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = fIntegralPAIxSection[1]*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= fIntegralPAIxSection[iTransfer] ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns random Cerenkov energy loss over step
 G4double G4PAIxSection::GetStepCerenkovLoss( G4double step )
+{
+  G4int iTransfer  ;
+  G4long numOfCollisions ;
+  G4double loss = 0.0 ;
+  G4double meanNumber, position ;
+  // G4cout<<" G4PAIxSection::GetStepCreLosnkovs "<<G4endl ;
+  meanNumber = fIntegralCerenkov[1]*step ;
+  numOfCollisions = G4Poisson(meanNumber) ;
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
+  G4long numOfCollisions;
+  G4double meanNumber, loss = 0.0;
+  // G4cout<<" G4PAIxSection::GetStepCerenkovLoss "<<G4endl;
+  meanNumber = fIntegralCerenkov[1]*step;
+  numOfCollisions = G4Poisson(meanNumber);
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl;
   while(numOfCollisions)
+  {
+    position = fIntegralCerenkov[1]*G4UniformRand() ;
+    for( iTransfer=1 ; iTransfer<=fSplineNumber ; iTransfer++ )
+    {
+        if( position >= fIntegralCerenkov[iTransfer] ) break ;
+    }
+    loss += fSplineEnergy[iTransfer]  ;
+    numOfCollisions-- ;
+    loss += GetCerenkovEnergyTransfer();
+    numOfCollisions--;
+  }
   // G4cout<<"PAI Cerenkov loss = "<<loss/keV<<" keV"<<G4endl ;
   return loss ;
+  // G4cout<<"PAI Cerenkov loss = "<<loss/keV<<" keV"<<G4endl;
+  return loss;
+}
 /////////////////////////////////////////////////////////////////////////
 //
+//
+// Returns random MM-Cerenkov energy loss over step
+G4double G4PAIxSection::GetStepMMLoss( G4double step )
+{
+  G4long numOfCollisions;
+  G4double meanNumber, loss = 0.0;
+  // G4cout<<" G4PAIxSection::GetStepMMLoss "<<G4endl;
+  meanNumber = fIntegralMM[1]*step;
+  numOfCollisions = G4Poisson(meanNumber);
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl;
+  while(numOfCollisions)
+  {
+    loss += GetMMEnergyTransfer();
+    numOfCollisions--;
+  }
+  // G4cout<<"PAI MM-Cerenkov loss = "<<loss/keV<<" keV"<<G4endl;
+  return loss;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns Cerenkov energy transfer in one collision
+G4double G4PAIxSection::GetCerenkovEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = fIntegralCerenkov[1]*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= fIntegralCerenkov[iTransfer] ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns MM-Cerenkov energy transfer in one collision
+G4double G4PAIxSection::GetMMEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = fIntegralMM[1]*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= fIntegralMM[iTransfer] ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns random plasmon energy loss over step
 G4double G4PAIxSection::GetStepPlasmonLoss( G4double step )
+{
+  G4int iTransfer  ;
+  G4long numOfCollisions ;
+  G4double loss = 0.0 ;
+  G4double meanNumber, position ;
+  // G4cout<<" G4PAIxSection::GetStepCreLosnkovs "<<G4endl ;
+  meanNumber = fIntegralPlasmon[1]*step ;
+  numOfCollisions = G4Poisson(meanNumber) ;
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
+  G4long numOfCollisions;
+  G4double  meanNumber, loss = 0.0;
+  // G4cout<<" G4PAIxSection::GetStepPlasmonLoss "<<G4endl;
+  meanNumber = fIntegralPlasmon[1]*step;
+  numOfCollisions = G4Poisson(meanNumber);
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl;
   while(numOfCollisions)
+  {
+    position = fIntegralPlasmon[1]*G4UniformRand() ;
+    for( iTransfer=1 ; iTransfer<=fSplineNumber ; iTransfer++ )
+    {
+        if( position >= fIntegralPlasmon[iTransfer] ) break ;
+    }
+    loss += fSplineEnergy[iTransfer]  ;
+    numOfCollisions-- ;
+    loss += GetPlasmonEnergyTransfer();
+    numOfCollisions--;
+  }
   // G4cout<<"PAI Plasmon loss = "<<loss/keV<<" keV"<<G4endl ;
   return loss ;
+  // G4cout<<"PAI Plasmon loss = "<<loss/keV<<" keV"<<G4endl;
+  return loss;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns plasmon energy transfer in one collision
+G4double G4PAIxSection::GetPlasmonEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = fIntegralPlasmon[1]*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= fIntegralPlasmon[iTransfer] ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns random resonance energy loss over step
+G4double G4PAIxSection::GetStepResonanceLoss( G4double step )
+{
+  G4long numOfCollisions;
+  G4double meanNumber, loss = 0.0;
+  // G4cout<<" G4PAIxSection::GetStepCreLosnkovs "<<G4endl;
+  meanNumber = fIntegralResonance[1]*step;
+  numOfCollisions = G4Poisson(meanNumber);
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl;
+  while(numOfCollisions)
+  {
+    loss += GetResonanceEnergyTransfer();
+    numOfCollisions--;
+  }
+  // G4cout<<"PAI resonance loss = "<<loss/keV<<" keV"<<G4endl;
+  return loss;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns resonance energy transfer in one collision
+G4double G4PAIxSection::GetResonanceEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = fIntegralResonance[1]*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= fIntegralResonance[iTransfer] ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
+/////////////////////////////////////////////////////////////////////////
+//
+// Returns Rutherford energy transfer in one collision
+G4double G4PAIxSection::GetRutherfordEnergyTransfer()
+{
+  G4int iTransfer ;
+  G4double energyTransfer, position;
+  position = (fIntegralPlasmon[1]-fIntegralResonance[1])*G4UniformRand();
+  for( iTransfer = 1; iTransfer <= fSplineNumber; iTransfer++ )
+  {
+        if( position >= (fIntegralPlasmon[iTransfer]-fIntegralResonance[iTransfer]) ) break;
+  }
+  if(iTransfer > fSplineNumber) iTransfer--;
+  energyTransfer = fSplineEnergy[iTransfer];
+  if(iTransfer > 1)
+  {
+    energyTransfer -= (fSplineEnergy[iTransfer]-fSplineEnergy[iTransfer-1])*G4UniformRand();
+  }
+  return energyTransfer;
+}
 …
 //
 G4int G4PAIxSection::fNumberOfGammas = 111 ;
+G4int G4PAIxSection::fNumberOfGammas = 111;
 const G4double G4PAIxSection::fLorentzFactor[112] =     // fNumberOfGammas+1
 …
 .658206e+04, 6.422112e+04, 7.289153e+04, 8.273254e+04, 9.390219e+04, // 110
 .065799e+05
 } ;
+};
 ///////////////////////////////////////////////////////////////////////
 …
 const
 G4int G4PAIxSection::fRefGammaNumber = 29 ;
+G4int G4PAIxSection::fRefGammaNumber = 29;

trunk/source/processes/electromagnetic/standard/src/G4PAIySection.cc

r819	r961
26	26	//
27	27	// $Id: G4PAIySection.cc,v 1.3 2007/10/01 18:38:10 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/standard/src/G4PEEffectModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PEEffectModel.cc,v 1.6 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PEEffectModel.cc,v 1.7 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //
 // 04.12.05 : SetProposedKineticEnergy(0.) for the killed photon (mma)
+// 20.02.09 : Added initialisation of deexcitation flag and method
+//            CrossSectionPerVolume instead of mfp (V.Ivanchenko)
 //
 // Class Description:
 …
   theGamma    = G4Gamma::Gamma();
   theElectron = G4Electron::Electron();
+  fminimalEnergy = 1.0*eV;
+}
 …
 G4PEEffectModel::~G4PEEffectModel()
+{
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
                                  const G4DataVector&)
+{
+ if (isInitialized) return;
+ if (pParticleChange)
+   fParticleChange =
+                  reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
+  else
+   fParticleChange = new G4ParticleChangeForGamma();
+ fminimalEnergy = 1.0*eV;
+  // always false before the run
+  SetDeexcitationFlag(false);
+  if (isInitialized) return;
+  if (pParticleChange) {
+    fParticleChange = reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
+  } else {
+    fParticleChange = new G4ParticleChangeForGamma();
+  }
+  isInitialized = true;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4double G4PEEffectModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                                     G4double energy,
+                                                     G4double Z, G4double,
+                                                     G4double, G4double)
+{
+  G4double* SandiaCof = G4SandiaTable::GetSandiaCofPerAtom((G4int)Z, energy);
+  G4double energy2 = energy*energy;
+  G4double energy3 = energy*energy2;
+  G4double energy4 = energy2*energy2;
+  return SandiaCof[0]/energy  + SandiaCof[1]/energy2 +
+    SandiaCof[2]/energy3 + SandiaCof[3]/energy4;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4PEEffectModel::CrossSectionPerVolume(const G4Material* material,
+                                                const G4ParticleDefinition*,
+                                                G4double energy,
+                                                G4double, G4double)
+{
+  G4double* SandiaCof =
+    material->GetSandiaTable()->GetSandiaCofForMaterial(energy);
+  G4double energy2 = energy*energy;
+  G4double energy3 = energy*energy2;
+  G4double energy4 = energy2*energy2;
+  return SandiaCof[0]/energy  + SandiaCof[1]/energy2 +
+    SandiaCof[2]/energy3 + SandiaCof[3]/energy4;
+}

trunk/source/processes/electromagnetic/standard/src/G4PSTARStopping.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PSTARStopping.cc,v 1.5 2006/06/29 19:53:24 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4PSTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //---------------------------------------------------------------------------
 …
 G4PSTARStopping::G4PSTARStopping()
+{
+  currentE = 0.0;
   currentMaterial = 0;
   index = 0;
 …
   for (G4int i=0; i<74; i++){
     if (matName == name[i]){
       matIndex= -1;
+      matIndex = i;
       currentMaterial = mat;
       return i;
 …
   res = e1*std::exp(std::log(energy/t1)*std::log(e2/e1)/std::log(t2/t1));
   return res;
+ }
+}
 void G4PSTARStopping::Initialise()
 …
   name [0] = "G4_A-150_TISSUE";
-  Znum [0] = 0;
   G4double T0[60] = {
 .001, 0.0015, 0.002, 0.0025, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008,
 …
 .275, 0.3,    0.35,  0.4,    0.45,  0.5,    0.55,   0.6, 0.65,  0.7,
 .75,  0.8,    0.85,  0.9,    0.95,  1.,     1.25,   1.5, 1.75,  2. };
   G4double e0[60] = { 176.8, 216.6, 250.1, 279.6, 306.3, 351.1, 390.9, 426.8, 459.8, 489.9, 517.8, 544, 596.4, 641.3, 680.6, 715.7, 747, 775, 800, 822.6, 861.7, 894.2, 920.7, 941.5, 957.3, 968.6, 976.2, 980.5, 982, 981, 978, 973.2, 967, 959.5, 910.4, 853.6, 797.9, 746.9, 701.5, 661.5, 626.4, 595.6, 544.8, 504.4, 471.1, 442.8, 416.4, 392, 369.9, 350, 332.2, 316.4, 302.2, 289.5, 278.1, 267.9, 228.9, 200.8, 179.5, 162.6 };
 …
   name [1] = "G4_ACETYLENE";
-  Znum [1] = 0;
   G4double e1[60] = { 185.5, 227.2, 262.3, 293.2, 321.2, 364.8, 404, 439.3, 471.6, 500.3, 526.4, 550.6, 600.2, 641.6, 677.4, 709.2, 737.3, 762, 783.7, 803.1, 837.2, 866.8, 891.7, 911.6, 926.6, 937.4, 944.7, 949, 950.8, 950.3, 947.9, 943.9, 938.4, 931.8, 887.1, 833.7, 779.9, 729.5, 686.8, 650.4, 618.5, 590.2, 541.4, 500.4, 465.3, 434.8, 408, 384.6, 364.4, 346.5, 330.5, 316.1, 303.2, 291.3, 280.4, 270.4, 230.7, 202.2, 180.5, 163.5 };
 …
   name [2] = "G4_ADIPOSE_TISSUE_ICRP";
-  Znum [2] = 0;
   G4double e2[60] = { 195.9, 239.9, 277, 309.7, 339.3, 387.5, 430.6, 469.4, 505, 537.2, 566.9, 594.6, 649.9, 696.7, 737.4, 773.3, 805.2, 833.4, 858.3, 880.5, 918.9, 951, 977.2, 997.6, 1013, 1023, 1030, 1034, 1034, 1033, 1029, 1023, 1016, 1008, 955.6, 895, 835.1, 779.6, 729.7, 685.6, 646.6, 612.3, 555, 509.1, 471.6, 440.3, 413.7, 390.4, 370.1, 352.1, 336, 321.4, 308.3, 296.3, 285.3, 275.2, 234.9, 206, 184, 166.7 };
 …
   name [3] = "G4_Ag";
-  Znum [3] = 47;
   G4double e3[60] = { 29.73, 36.41, 42.05, 47.01, 51.5, 59.46, 66.48, 72.83, 78.66, 84.09, 89.2, 94.02, 103.7, 112.1, 119.7, 126.6, 132.8, 138.5, 143.7, 148.5, 157.1, 164.3, 170.5, 175.7, 180.1, 183.7, 186.7, 189.1, 191.1, 192.5, 193.6, 194.4, 194.8, 195, 193.4, 189.3, 184.4, 179.2, 174.1, 169.3, 164.8, 160.5, 152.7, 145.7, 139.5, 133.8, 128.6, 123.9, 119.5, 115.4, 111.7, 108.1, 104.8, 101.7, 98.74, 95.98, 84.49, 75.92, 69.3, 64.05 };
 …
   name [4] = "G4_AIR";
-  Znum [4] = 0;
   G4double e4[60] = { 119.7, 146.7, 169.3, 189.3, 207.4, 239.5, 267.8, 293.3, 316.8, 338.7, 359.2, 378.7, 417, 450.4, 480.1, 506.7, 530.7, 552.6, 572.4, 590.5, 622.1, 648.3, 670, 687.7, 702, 713.2, 721.7, 727.8, 731.9, 734.1, 734.8, 734, 732, 729, 702.9, 667.2, 629.1, 592.2, 558.3, 527.8, 500.6, 476.3, 434.9, 401.2, 373.3, 349.8, 329.7, 312.1, 296.4, 282.4, 269.9, 258.7, 248.5, 239.1, 230.6, 222.7, 191.1, 168.2, 150.8, 137 };
 …
   name [5] = "G4_Al";
-  Znum [5] = 13;
   G4double e5[60] = { 92.38, 113.1, 130.6, 146.1, 160, 184.8, 206.6, 226.3, 244.4, 261.3, 277.1, 292.1, 320.6, 344.8, 365.7, 383.8, 399.6, 413.2, 425, 435.1, 451, 462, 469.2, 473.4, 475.2, 475.1, 473.7, 471.2, 468, 464.2, 460.1, 455.8, 451.3, 446.8, 424.5, 404.5, 386.7, 371, 356.8, 344, 332.3, 321.5, 301.7, 284.2, 268.6, 254.8, 242.5, 231.4, 221.5, 212.4, 204.2, 196.6, 189.7, 183.3, 177.4, 171.9, 149.4, 132.7, 119.8, 109.4 };
 …
   name [6] = "G4_ALUMINUM_OXIDE";
-  Znum [6] = 0;
   G4double e6[60] = { 73.51, 90.03, 104, 116.2, 127.3, 147, 164.4, 180.1, 194.5, 207.9, 220.5, 232.5, 256.1, 276.8, 295.3, 311.9, 327, 340.8, 353.4, 364.9, 385.3, 402.5, 417, 429.2, 439.3, 447.6, 454.3, 459.6, 463.7, 466.6, 468.6, 469.8, 470.2, 470, 461.9, 447.2, 430.1, 412.7, 396.5, 381.4, 367.5, 354.5, 331.1, 310.6, 292.6, 276.5, 262.2, 249.4, 238.1, 227.9, 218.7, 210.2, 202.6, 195.7, 189.2, 183.2, 158.9, 140.9, 127, 116 };
 …
   name [7] = "G4_Ar";
-  Znum [7] = 40;
   G4double e7[60] = { 86.08, 105.4, 121.7, 136.1, 149.1, 172.2, 192.5, 210.9, 227.7, 243.5, 258.2, 272.2, 299.7, 323.5, 344.5, 363.3, 380.2, 395.3, 409, 421.4, 442.5, 459.4, 472.8, 483.1, 490.7, 496, 499.2, 500.7, 500.8, 499.5, 497.2, 494, 490, 485.5, 457.4, 426.7, 397.7, 371.9, 349.5, 330.1, 313.2, 298.5, 274.2, 254.9, 239, 225.6, 214.4, 204.7, 196.1, 188.4, 181.3, 174.9, 168.9, 163.4, 158.2, 153.3, 133, 118.2, 106.8, 97.72 };
 …
   name [8] = "G4_Au";
-  Znum [8] = 79;
   G4double e8[60] = { 14.76, 18.07, 20.87, 23.33, 25.56, 29.51, 33, 36.15, 39.04, 41.74, 44.27, 46.66, 51.51, 55.8, 59.66, 63.18, 66.43, 69.43, 72.23, 74.84, 79.58, 83.77, 87.5, 90.81, 93.77, 96.4, 98.74, 100.8, 102.6, 104.3, 105.7, 106.9, 108, 108.9, 111.5, 112, 111.2, 109.6, 107.6, 105.4, 103.2, 101, 96.33, 91.8, 87.7, 84.05, 80.83, 78, 75.47, 73.18, 71.11, 69.21, 67.46, 65.83, 64.32, 62.91, 56.98, 52.39, 48.68, 45.58 };
 …
   name [9] = "G4_B-100_BONE";
-  Znum [9] = 0;
   G4double e9[60] = { 142.5, 174.5, 201.5, 225.2, 246.7, 283.1, 315.3, 344.4, 371.1, 395.5, 418.2, 439.6, 482.3, 519, 551.3, 580.1, 606, 629.2, 650.1, 669, 701.9, 729.5, 752.2, 770.4, 784.5, 795.1, 802.6, 807.4, 810, 810.5, 809.3, 806.6, 802.7, 797.7, 762.5, 719.5, 676.2, 635.8, 599.3, 566.7, 537.9, 512.3, 468.1, 431.4, 400.8, 375, 353, 333.7, 316.9, 301.9, 288.5, 276.3, 265.3, 255.1, 245.9, 237.4, 203.4, 178.9, 160.2, 145.4 };
 …
   name [10] = "G4_Be";
-  Znum [10] = 4;
   G4double e10[60] = { 149.7, 183.3, 211.7, 236.7, 259.2, 299.3, 334.7, 366.6, 396, 423.3, 449, 473.3, 517.2, 553.4, 583.6, 608.7, 629.6, 646.8, 660.7, 671.9, 687.3, 695.5, 698.4, 697.6, 694.2, 689.1, 682.8, 675.7, 668.2, 660.5, 652.7, 644.9, 637.2, 629.6, 594.2, 563, 535.4, 510.7, 488.4, 468.2, 449.8, 432.8, 404.4, 380.1, 358.1, 337.6, 318.8, 302.2, 287.4, 274.2, 262.3, 251.5, 241.7, 232.7, 224.4, 216.8, 186, 163.6, 146.3, 132.6 };
 …
   name [11] = "G4_BONE_COMPACT_ICRU";
-  Znum [11] = 0;
   G4double e11[60] = { 141.6, 173.4, 200.2, 223.8, 245.2, 281.3, 313.3, 342.2, 368.8, 393.1, 415.6, 436.8, 479, 515.2, 547, 575.3, 600.7, 623.4, 643.8, 662.1, 694.2, 721, 743.2, 760.9, 774.8, 785.2, 792.6, 797.6, 800.3, 801.1, 800.3, 797.9, 794.4, 789.9, 756.4, 714.5, 671.4, 630.5, 593.2, 559.7, 530, 503.5, 459, 423, 393.3, 368.3, 346.9, 328.1, 311.6, 296.9, 283.7, 271.8, 261, 251.1, 242, 233.7, 200.3, 176.3, 158, 143.5 };
 …
   name [12] = "G4_C";
-  Znum [12] = 6;
   G4double e12[60] = { 138.4, 169.5, 195.7, 218.8, 239.7, 270.2, 297.8, 322.7, 345.4, 365.1, 382.6, 398.7, 433.5, 462.4, 487.4, 509.9, 530, 547.7, 563.4, 577.6, 603.9, 628.3, 650.1, 668.6, 683.5, 695.3, 704.5, 711.4, 716.3, 719.4, 720.8, 720.9, 719.7, 717.4, 694.5, 661.1, 624.7, 589.1, 556, 526, 499.1, 475, 435.8, 404.4, 377.9, 354.6, 334, 315.9, 300.2, 286.2, 273.7, 262.4, 252.2, 242.7, 234.1, 226.1, 194.2, 171.1, 153.4, 139.4 };
   for(i=0; i<60; i++) {e[12][i]=e12[i]*MeV*cm2/g;}
+  name [13] = "G4_C_Graphite";
+  Znum [13] = 0;
+  name [13] = "G4_GRAPHITE";
   G4double e13[60] = { 142.6, 175.3, 203.1, 228, 250.5, 283.4, 313.3, 340.4, 365.1, 386.7, 405.9, 423.5, 462, 494, 521.9, 546.9, 569.3, 589.2, 606.9, 622.9, 652.4, 679.9, 704.5, 725.3, 742.2, 755.6, 766.1, 774, 779.6, 783.1, 784.7, 784.8, 783.4, 780.7, 753.8, 714.5, 671.4, 629.1, 590.2, 555.6, 524.9, 497.7, 453.9, 419.3, 390.3, 365.1, 343, 323.7, 307.1, 292.3, 279.1, 267.3, 256.6, 246.8, 237.8, 229.5, 196.7, 173, 155, 140.8 };
 …
   name [14] = "G4_ETHYLENE";
-  Znum [14] = 0;
   G4double e14[60] = { 225.8, 276.5, 319.3, 357, 391.1, 445.9, 494.9, 539.1, 579.6, 616, 649.5, 680.6, 742.9, 795.1, 840.1, 879.9, 914.8, 945.5, 972.4, 996.1, 1037, 1071, 1099, 1120, 1135, 1145, 1150, 1152, 1152, 1148, 1142, 1135, 1126, 1115, 1052, 981.5, 912.8, 849.7, 795.6, 749, 708.3, 672.4, 611.7, 562.1, 520.6, 485.3, 454.9, 428.4, 405.5, 385.2, 367.1, 350.8, 336.2, 322.8, 310.5, 299.3, 254.6, 222.7, 198.6, 179.6 };
 …
   name [15] = "G4_C-552";
-  Znum [15] = 0;
   G4double e15[60] = { 119.2, 146, 168.6, 188.5, 206.5, 235.1, 260.7, 283.8, 305, 323.9, 341.3, 357.4, 390.7, 418.9, 443.7, 465.8, 485.7, 503.6, 519.5, 534.1, 560.1, 583.2, 603.2, 620, 633.7, 644.7, 653.4, 660.1, 665, 668.4, 670.3, 671.1, 670.7, 669.5, 652.9, 626.4, 596.2, 565.7, 537, 510.7, 486.8, 465.1, 427.5, 396.1, 369.6, 347, 327.4, 310.1, 294.9, 281.3, 269, 258, 247.9, 238.6, 230.2, 222.4, 191, 168.2, 150.8, 137 };
 …
   name [16] = "G4_CARBON_DIOXIDE";
-  Znum [16] = 0;
   G4double e16[60] = { 106.4, 130.3, 150.4, 168.2, 184.2, 212.7, 237.9, 260.6, 281.4, 300.9, 319.1, 336.4, 370.9, 401.2, 428.3, 452.8, 475.1, 495.6, 514.4, 531.8, 562.6, 588.8, 611.2, 630.2, 646.1, 659.3, 670.1, 678.6, 685.2, 690, 693.2, 694.9, 695.4, 694.8, 679, 650.5, 617.3, 583.6, 552.1, 523.6, 497.8, 474.6, 434.7, 401.8, 374.3, 351, 330.9, 313.2, 297.6, 283.7, 271.2, 259.9, 249.6, 240.3, 231.7, 223.7, 191.9, 168.9, 151.4, 137.5 };
 …
   name [17] = "G4_CALCIUM_FLUORIDE";
-  Znum [17] = 0;
   G4double e17[60] = { 74.48, 91.21, 105.3, 117.8, 129, 149, 166.5, 182.4, 197, 210.6, 223.4, 235.5, 259.6, 280.7, 299.6, 316.6, 332, 346.2, 359.1, 371.1, 392.2, 410.1, 425.2, 438, 448.7, 457.5, 464.6, 470.3, 474.7, 477.9, 480.1, 481.4, 481.9, 481.7, 473, 456.7, 437.6, 417.8, 398.6, 380.6, 364, 348.7, 322.9, 301.7, 283.5, 267.5, 253.4, 240.9, 229.8, 219.9, 210.8, 202.5, 194.8, 187.7, 181.3, 175.5, 151.6, 134.4, 121.1, 110.6 };
 …
   name [18] = "G4_CERIC_SULFATE";
-  Znum [18] = 0;
   G4double e18[60] = { 135.4, 165.8, 191.5, 214.1, 234.5, 270.8, 302.8, 331.7, 358.2, 383, 406.2, 428.2, 471.7, 509.8, 543.6, 574, 601.5, 626.5, 649.3, 670.1, 706.4, 736.5, 761.2, 781.4, 797.4, 809.8, 819, 825.3, 829.2, 830.8, 830.6, 828.7, 825.4, 820.9, 785.9, 741.4, 696, 653.6, 618.4, 588.8, 562.8, 539.6, 499.3, 464.8, 434.6, 407.9, 384.2, 363.4, 344.9, 328.4, 313.6, 300.3, 288.2, 277.2, 267, 257.7, 220.4, 193.5, 173, 156.9 };
 …
   name [19] = "G4_CELLULOSE_NITRATE";
-  Znum [19] = 0;
   G4double e19[60] = { 132.2, 161.9, 187, 209, 229, 262.6, 292.5, 319.4, 344.2, 366.8, 387.8, 407.5, 447, 481, 510.8, 537.6, 561.6, 583.2, 602.7, 620.4, 651.5, 677.9, 700, 718.2, 732.7, 744.1, 752.7, 759, 763.2, 765.5, 766.2, 765.5, 763.5, 760.6, 734.4, 698.2, 659.3, 621.4, 586, 553.8, 524.9, 498.9, 452.4, 413.9, 382.9, 358, 337.7, 319.7, 303.9, 289.7, 277.1, 265.6, 255.2, 245.6, 236.9, 228.8, 196.4, 173, 155, 140.8 };
 …
   name [20] = "G4_BONE_CORTICAL_ICRP";
-  Znum [20] = 0;
   G4double e20[60] = { 123.5, 151.3, 174.7, 195.3, 214, 246.1, 274.5, 300.2, 323.8, 345.6, 365.9, 385, 423, 455.7, 484.7, 510.5, 533.8, 554.8, 573.7, 590.9, 620.8, 645.9, 666.5, 683.3, 696.6, 706.8, 714.4, 719.7, 723, 724.5, 724.5, 723.1, 720.6, 717.1, 689.6, 653.5, 615.8, 579.8, 546.6, 516.7, 490, 466.2, 426.1, 393.6, 366.6, 343.7, 324, 306.7, 291.5, 278, 265.8, 254.7, 244.7, 235.5, 227.1, 219.4, 188.4, 166.1, 149, 135.4 };
 …
   name [21] = "G4_CESIUM_IODIDE";
-  Znum [21] = 0;
   G4double e21[60] = { 34.67, 42.46, 49.03, 54.82, 60.05, 69.34, 77.52, 84.92, 91.73, 98.06, 104, 109.6, 121, 130.9, 139.9, 148, 155.5, 162.3, 168.6, 174.5, 184.9, 194, 201.8, 208.5, 214.2, 219, 223, 226.3, 228.9, 231, 232.5, 233.4, 234, 234.1, 230.4, 221.9, 211.4, 200.6, 190.1, 180.6, 171.9, 164.1, 151.1, 140.6, 132.1, 125.1, 119.1, 114, 109.6, 105.6, 102.1, 98.92, 95.83, 92.83, 89.95, 87.22, 75.76, 67.41, 61.26, 56.63 };
 …
   name [22] = "G4_Cu";
-  Znum [22] = 29;
   G4double e22[60] = { 34.9, 42.74, 49.35, 55.18, 60.45, 69.8, 78.04, 85.48, 92.33, 98.71, 104.7, 110.4, 121.4, 130.9, 139.2, 146.6, 153.2, 159, 164.3, 168.9, 176.9, 183.2, 188.4, 192.5, 195.9, 198.7, 201, 202.8, 204.4, 205.6, 206.7, 207.5, 208.2, 208.7, 209.9, 209.2, 207.5, 205.1, 202.3, 199.1, 195.8, 192.3, 185.4, 178.6, 172, 165.8, 159.6, 153.6, 148, 142.7, 137.8, 133.3, 129.1, 125.2, 121.7, 118.3, 104.7, 94.43, 86.45, 79.87 };
 …
   name [23] = "G4_Fe";
-  Znum [23] = 26;
   G4double e23[60] = { 37.81, 46.31, 53.47, 59.78, 65.49, 75.62, 84.54, 92.61, 100, 106.9, 113.4, 119.6, 132, 143, 153, 162, 170.4, 178.2, 185.4, 192.2, 204.6, 215.6, 225.4, 234.2, 242.1, 249.2, 255.5, 261.2, 266.2, 270.7, 274.6, 278.1, 281, 283.6, 290.9, 291.5, 287.6, 281, 272.8, 263.9, 254.9, 246, 229.5, 214.8, 202.1, 191.1, 181.6, 173.4, 166.2, 159.7, 153.8, 148.5, 143.6, 139.1, 135, 131.1, 115.3, 103.5, 94.02, 86.52 };
 …
   name [24] = "G4_FERROUS_SULFATE";
-  Znum [24] = 0;
   G4double e24[60] = { 135.1, 165.5, 191.1, 213.6, 234, 270.2, 302.1, 330.9, 357.4, 382.1, 405.3, 427.2, 470.7, 508.7, 542.4, 572.8, 600.3, 625.3, 648, 668.8, 705, 735.1, 759.9, 780.1, 796.1, 808.5, 817.7, 824.1, 827.9, 829.6, 829.4, 827.5, 824.2, 819.7, 784.9, 740.5, 695.1, 652.8, 617.8, 588.4, 562.8, 539.9, 499.9, 465.6, 435.5, 408.8, 385, 364.1, 345.6, 329.1, 314.3, 300.9, 288.8, 277.7, 267.6, 258.3, 220.8, 193.9, 173.4, 157.2 };
 …
   name [25] = "G4_Gd";
-  Znum [25] = 64;
   G4double e25[60] = { 25.71, 31.49, 36.37, 40.66, 44.54, 51.43, 57.5, 62.99, 68.03, 72.73, 77.14, 81.32, 89.78, 97.24, 104, 110.1, 115.8, 121, 125.8, 130.4, 138.5, 145.7, 152.1, 157.7, 162.6, 166.9, 170.7, 173.9, 176.7, 179, 181, 182.5, 183.8, 184.7, 185.6, 182.1, 176.3, 169.4, 162.2, 155.2, 148.7, 142.6, 132, 123.3, 116.2, 110.2, 105, 100.6, 96.67, 93.2, 90.08, 87.27, 84.72, 82.38, 80.24, 78.26, 70.14, 63.87, 58.87, 54.76 };
 …
   name [26] = "G4_Ge";
-  Znum [26] = 32;
   G4double e26[60] = { 45.91, 56.23, 64.93, 72.59, 79.52, 91.82, 102.7, 112.5, 121.5, 129.9, 137.7, 145.2, 159.7, 172.3, 183.3, 193.1, 201.7, 209.4, 216.3, 222.3, 232.3, 240, 245.6, 249.6, 252.3, 253.9, 254.5, 254.5, 253.9, 252.9, 251.5, 250, 248.2, 246.4, 236.5, 227.2, 218.9, 211.6, 205.1, 199.3, 193.9, 189, 180.1, 172.3, 165.2, 158.8, 152.6, 146.6, 140.9, 135.7, 130.8, 126.3, 122.1, 118.3, 114.7, 111.3, 97.72, 87.77, 80.18, 74.18 };
 …
   name [27] = "G4_Pyrex_Glass";
-  Znum [27] = 0;
   G4double e27[60] = { 88.74, 108.7, 125.5, 140.3, 153.7, 177.5, 198.4, 217.4, 234.8, 251, 266.2, 280.6, 308.9, 333.6, 355.6, 375.3, 393.1, 409.2, 423.9, 437.3, 460.8, 480.4, 496.7, 510.2, 521.2, 530.1, 537.1, 542.5, 546.4, 549.1, 550.6, 551.2, 551, 550.1, 537.6, 518.1, 496.1, 473.9, 451.2, 429.2, 408.8, 390.1, 357.9, 331.5, 309.8, 291.7, 276.2, 262.4, 250.1, 239.1, 229.2, 220.2, 212, 204.6, 197.7, 191.4, 165.6, 146.7, 132.1, 120.4 };
 …
   name [28] = "G4_H";
-  Znum [28] = 1;
   G4double e28[60] = { 746.5, 914.3, 1056, 1180, 1293, 1493, 1669, 1829, 1975, 2112, 2240, 2361, 2586, 2777, 2942, 3084, 3208, 3316, 3409, 3490, 3618, 3710, 3771, 3808, 3823, 3822, 3807, 3781, 3745, 3702, 3654, 3601, 3545, 3487, 3183, 2890, 2629, 2402, 2204, 2031, 1882, 1753, 1544, 1384, 1258, 1159, 1077, 1007, 947, 894.2, 847.5, 805.9, 768.6, 734.9, 704.3, 676.4, 566.7, 489.7, 432.5, 388.1 };
 …
   name [29] = "G4_He";
-  Znum [29] = 2;
   G4double e29[60] = { 184.2, 225.6, 260.6, 291.3, 319.1, 368.5, 412, 451.3, 487.4, 521.1, 552.7, 582.6, 641.3, 691.9, 736.7, 776.6, 812.5, 844.9, 874.2, 900.8, 946.6, 984.1, 1014, 1039, 1058, 1072, 1083, 1089, 1093, 1094, 1093, 1090, 1085, 1079, 1032, 973, 911.2, 852.1, 797.5, 748.3, 704.5, 665.8, 600.4, 547.7, 504.5, 468.3, 437.7, 411.3, 388.2, 368, 349.9, 333.8, 319.3, 306.2, 294.2, 283.2, 239.6, 208.6, 185.2, 167 };
 …
   name [30] = "G4_KAPTON";
-  Znum [30] = 0;
   G4double e30[60] = { 145.4, 178.1, 205.6, 229.9, 251.8, 286.2, 317.1, 344.9, 370.4, 393.1, 413.7, 432.9, 472.6, 506.1, 535.2, 561.3, 584.6, 605.3, 623.8, 640.4, 670.2, 696.5, 719.1, 737.7, 752.5, 763.9, 772.5, 778.6, 782.6, 784.6, 784.9, 783.8, 781.4, 778, 749.2, 710.6, 669.6, 630, 593.5, 560.4, 530.8, 504.4, 459.6, 423.3, 393.3, 368.2, 346.8, 328, 311.6, 296.9, 283.8, 272, 261.3, 251.5, 242.4, 234.1, 200.8, 176.8, 158.4, 143.8 };
 …
   name [31] = "G4_Kr";
-  Znum [31] = 36;
   G4double e31[60] = { 45.92, 56.24, 64.94, 72.6, 79.53, 91.84, 102.7, 112.5, 121.5, 129.9, 137.8, 145.2, 160.1, 173.2, 184.9, 195.5, 205.1, 213.8, 221.8, 229.1, 242, 252.7, 261.6, 268.8, 274.6, 279, 282.3, 284.5, 285.8, 286.2, 286, 285.1, 283.8, 281.9, 268.6, 252.2, 236.2, 221.7, 209, 198.2, 188.9, 180.9, 168.1, 158.1, 150.2, 143.7, 138.1, 133.2, 128.8, 124.8, 121.2, 117.8, 114.6, 111.6, 108.8, 106.1, 94.63, 85.43, 77.91, 71.84 };
 …
   name [32] = "G4_LITHIUM_TETRABORATE";
-  Znum [32] = 0;
   G4double e32[60] = { 111, 135.9, 157, 175.5, 192.2, 222, 248.2, 271.9, 293.6, 313.9, 333, 351, 386.5, 417.4, 444.8, 469.4, 491.6, 511.7, 530.1, 546.7, 575.8, 599.9, 619.8, 636, 649.1, 659.3, 667.2, 672.9, 676.7, 678.9, 679.6, 679.1, 677.6, 675.1, 653, 622.4, 589.5, 557.3, 525.5, 495.6, 468.4, 444.1, 403.1, 370.6, 344.6, 323.5, 305.9, 290.3, 276.4, 263.9, 252.7, 242.4, 233.2, 224.7, 216.9, 209.6, 180.4, 159.2, 142.8, 129.9 };
 …
   name [33] = "G4_LITHIUM_FLUORIDE";
-  Znum [33] = 0;
   G4double e33[60] = { 80.87, 99.04, 114.4, 127.9, 140.1, 161.7, 180.8, 198.1, 214, 228.7, 242.6, 255.7, 281.9, 304.9, 325.4, 344, 360.9, 376.5, 390.8, 404, 427.6, 447.8, 465.3, 480.3, 493.1, 504.1, 513.3, 521.1, 527.4, 532.5, 536.5, 539.6, 541.7, 543, 540.3, 527.4, 509.2, 488.8, 467.4, 446.5, 426.9, 408.7, 376.9, 350.4, 328, 309.1, 292.7, 278.1, 265.1, 253.3, 242.5, 232.8, 223.9, 215.6, 208.2, 201.2, 173.1, 152.5, 136.8, 124.4 };
 …
   name [34] = "G4_M3_WAX";
-  Znum [34] = 0;
   G4double e34[60] = { 198.1, 242.6, 280.2, 313.3, 343.1, 391.9, 435.4, 474.6, 510.6, 543.1, 573, 601, 656.7, 703.7, 744.4, 780.4, 812.2, 840.3, 865, 887, 925, 956.5, 982.1, 1002, 1016, 1026, 1032, 1035, 1036, 1033, 1029, 1023, 1016, 1007, 953.3, 891.9, 831.3, 775.4, 725.1, 680.6, 641.3, 606.6, 546.6, 497.8, 458.8, 427.4, 401.7, 379.2, 359.6, 342.2, 326.7, 312.7, 300.1, 288.5, 277.8, 268.1, 229.1, 201, 179.7, 162.8 };
 …
   name [35] = "G4_MS20_TISSUE";
-  Znum [35] = 0;
   G4double e35[60] = { 174.4, 213.6, 246.7, 275.8, 302.1, 345, 383.2, 417.7, 449.4, 477.9, 504.3, 528.8, 578.1, 619.8, 656, 688.2, 716.7, 742, 764.4, 784.4, 819.3, 848.7, 872.8, 892, 906.4, 916.8, 923.7, 927.8, 929.4, 928.8, 926.4, 922.3, 916.9, 910.4, 866.6, 814.5, 762, 712.8, 668.3, 628.6, 593.3, 562.1, 507.7, 463.3, 427.6, 398.9, 375.3, 354.7, 336.7, 320.6, 306.2, 293.3, 281.6, 270.9, 261, 252, 215.7, 189.5, 169.6, 153.9 };
 …
   name [36] = "G4_METHANE";
-  Znum [36] = 0;
   G4double e36[60] = { 272.8, 334.1, 385.8, 431.4, 472.5, 545.6, 610, 668.2, 721.8, 771.6, 818.4, 862.7, 949.2, 1024, 1090, 1148, 1200, 1246, 1288, 1325, 1387, 1436, 1473, 1500, 1518, 1528, 1532, 1530, 1524, 1514, 1501, 1485, 1467, 1447, 1338, 1227, 1127, 1041, 967.3, 904.6, 850.4, 803.2, 724.6, 661.8, 610.5, 567.7, 531.4, 499.8, 472.5, 448.3, 426.7, 407.4, 390, 374.1, 359.6, 346.4, 293.7, 256.2, 227.9, 205.7 };
 …
   name [37] = "G4_Mo";
-  Znum [37] = 42;
   G4double e37[60] = { 40.18, 49.21, 56.82, 63.53, 69.59, 80.35, 89.84, 98.41, 106.3, 113.6, 120.5, 127, 140.2, 151.7, 162.1, 171.5, 180.1, 188, 195.4, 202.1, 214.3, 224.8, 233.8, 241.6, 248.3, 253.9, 258.7, 262.6, 265.7, 268.2, 270, 271.3, 272.1, 272.4, 268.7, 259.5, 248, 235.8, 224, 213.1, 203.1, 194.1, 178.9, 166.6, 156.5, 148.1, 141, 134.9, 129.5, 124.7, 120.4, 116.4, 112.6, 109.1, 105.8, 102.6, 89.8, 80.34, 73.15, 67.51 };
 …
   name [38] = "G4_MUSCLE_WITH_SUCROSE";
-  Znum [38] = 0;
   G4double e38[60] = { 149.4, 183, 211.3, 236.2, 258.7, 298.3, 333.3, 364.8, 393.8, 420.8, 446, 469.8, 516.6, 557.2, 593.1, 625.2, 654, 680, 703.5, 724.8, 761.7, 792, 816.7, 836.5, 851.9, 863.6, 871.9, 877.4, 880.4, 881.2, 880.1, 877.3, 873.2, 867.9, 829.5, 781.9, 733.4, 688, 647.9, 612.8, 581.8, 554.2, 507.1, 468.4, 435.9, 408.3, 384.4, 363.5, 344.9, 328.4, 313.7, 300.3, 288.2, 277.2, 267, 257.7, 220.4, 193.5, 173, 156.9 };
 …
   name [39] = "G4_MUSCLE_WITHOUT_SUCROSE";
-  Znum [39] = 0;
   G4double e39[60] = { 146.6, 179.5, 207.3, 231.8, 253.9, 292.9, 327.3, 358.4, 386.9, 413.5, 438.4, 461.9, 508.2, 548.4, 584, 615.8, 644.5, 670.4, 693.8, 715.1, 752, 782.3, 807.1, 827, 842.5, 854.3, 862.9, 868.5, 871.6, 872.6, 871.6, 869, 865, 859.8, 822, 774.9, 726.9, 682, 643, 609.2, 579.4, 552.9, 507.4, 469.6, 437.7, 410.1, 386.1, 365.1, 346.5, 329.9, 315, 301.6, 289.4, 278.3, 268.2, 258.8, 221.3, 194.3, 173.7, 157.5 };
 …
   name [40] = "G4_MUSCLE_SKELETAL_ICRP";
-  Znum [40] = 0;
   G4double e40[60] = { 141.3, 173.1, 199.9, 223.5, 244.8, 282.5, 315.8, 345.8, 373.5, 399.2, 423.3, 446.1, 491.1, 530.2, 565, 596.1, 624.2, 649.7, 672.8, 693.8, 730.4, 760.6, 785.3, 805.3, 821.1, 833.1, 841.9, 847.9, 851.4, 852.6, 852, 849.7, 846.1, 841.2, 804.8, 758.9, 712.2, 668.5, 631.2, 599, 570.8, 545.6, 502.2, 465.8, 434.6, 407.5, 383.7, 362.8, 344.4, 327.9, 313.1, 299.8, 287.7, 276.7, 266.6, 257.3, 220, 193.2, 172.8, 156.7 };
 …
   name [41] = "G4_MUSCLE_STRIATED_ICRU";
-  Znum [41] = 0;
   G4double e41[60] = { 141.7, 173.5, 200.4, 224, 245.4, 283.2, 316.5, 346.6, 374.3, 400, 424.2, 447, 492.1, 531.3, 566.1, 597.3, 625.4, 650.9, 674, 695.1, 731.6, 761.9, 786.7, 806.6, 822.4, 834.4, 843.3, 849.2, 852.6, 853.9, 853.2, 851, 847.3, 842.4, 805.8, 759.8, 713, 669.2, 632, 600.1, 572.1, 547.1, 504, 467.7, 436.5, 409.3, 385.3, 364.3, 345.7, 329.2, 314.4, 300.9, 288.8, 277.8, 267.6, 258.3, 220.8, 193.9, 173.4, 157.2 };
 …
   name [42] = "G4_N";
-  Znum [42] = 7;
   G4double e42[60] = { 126.5, 155, 179, 200.1, 219.2, 253.1, 283, 310, 334.8, 357.9, 379.6, 400.2, 440.6, 475.8, 507, 535, 560.2, 583.1, 603.8, 622.7, 655.5, 682.7, 704.9, 722.9, 737.3, 748.4, 756.6, 762.3, 765.9, 767.5, 767.5, 766, 763.3, 759.4, 729.3, 689.8, 648.6, 609.1, 572.9, 540.4, 511.6, 486.2, 443.4, 408.8, 380.1, 356, 335.4, 317.2, 301.2, 286.8, 274.1, 262.6, 252.2, 242.7, 234, 225.9, 193.8, 170.5, 152.8, 138.8 };
 …
   name [43] = "G4_SODIUM_IODIDE";
-  Znum [43] = 0;
   G4double e43[60] = { 41.1, 50.34, 58.12, 64.98, 71.19, 82.2, 91.9, 100.7, 108.7, 116.2, 123.3, 130, 143.4, 155.2, 165.8, 175.4, 184.2, 192.3, 199.7, 206.6, 219, 229.6, 238.9, 246.8, 253.5, 259.2, 264, 268, 271.1, 273.6, 275.4, 276.7, 277.4, 277.7, 273.7, 264.2, 252.3, 239.7, 227.6, 216.2, 205.9, 196.6, 180.7, 167.8, 157.3, 148.5, 141.1, 134.7, 129.1, 124.1, 119.7, 115.7, 111.9, 108.4, 105.1, 101.9, 88.79, 78.99, 71.48, 65.54 };
 …
   name [44] = "G4_Ne";
-  Znum [44] = 10;
   G4double e44[60] = { 58.01, 71.05, 82.04, 91.73, 100.5, 116, 129.7, 142.1, 153.5, 164.1, 174, 183.5, 202.5, 219.3, 234.5, 248.3, 261, 272.8, 283.8, 294, 312.7, 329.2, 343.8, 356.9, 368.6, 379, 388.3, 396.5, 403.8, 410.2, 415.8, 420.7, 424.8, 428.4, 438.1, 437.9, 431.3, 420.8, 408.2, 394.6, 380.7, 367.1, 339, 313.8, 293.3, 277.2, 264.3, 252.6, 241.9, 232.2, 223.2, 215, 207.4, 200.4, 193.8, 187.7, 163, 144.6, 130.3, 118.9 };
 …
   name [45] = "G4_NYLON_6/6";
-  Znum [45] = 0;
   G4double e45[60] = { 191, 233.9, 270.1, 302, 330.8, 377.8, 419.7, 457.5, 492.1, 523.4, 552.3, 579.2, 633, 678.5, 717.9, 752.9, 783.8, 811.1, 835.3, 856.8, 894.2, 925.4, 951, 971, 985.8, 996.3, 1003, 1007, 1008, 1006, 1003, 997.7, 991.2, 983.5, 933.5, 875.4, 817.5, 763.6, 715, 671.7, 633.5, 599.6, 542.9, 497.4, 460.4, 429.7, 403.7, 381, 361.2, 343.6, 327.9, 313.8, 301, 289.3, 278.6, 268.8, 229.5, 201.3, 179.8, 162.9 };
 …
   name [46] = "G4_O";
-  Znum [46] = 8;
   G4double e46[60] = { 99.46, 121.8, 140.7, 157.3, 172.3, 198.9, 222.4, 243.6, 263.1, 281.3, 298.4, 314.5, 346.6, 374.7, 399.8, 422.4, 443, 461.9, 479.1, 495, 523.1, 547, 567.2, 584.4, 598.7, 610.6, 620.2, 628, 633.9, 638.3, 641.3, 643, 643.6, 643.3, 630.5, 606.7, 578.3, 549.1, 520.9, 494.6, 470.9, 449.7, 413.2, 383.1, 357.8, 336.3, 317.6, 301.1, 286.3, 273.2, 261.3, 250.5, 240.8, 231.9, 223.7, 216.1, 185.7, 163.7, 146.7, 133.4 };
 …
   name [47] = "G4_PARAFFIN";
-  Znum [47] = 0;
   G4double e47[60] = { 228.8, 280.2, 323.5, 361.7, 396.2, 451.9, 501.6, 546.5, 587.6, 624.6, 658.6, 690.2, 753.4, 806.4, 852.1, 892.4, 927.9, 959.1, 986.3, 1010, 1052, 1086, 1114, 1135, 1150, 1160, 1166, 1168, 1166, 1163, 1157, 1149, 1140, 1129, 1064, 992.4, 922.6, 858.6, 801.5, 751.1, 706.8, 667.8, 601.8, 548.9, 506.2, 471.3, 442.2, 416.9, 394.9, 375.4, 358, 342.3, 328.2, 315.3, 303.4, 292.6, 249.3, 218.3, 194.8, 176.3 };
 …
   name [48] = "G4_Pb";
-  Znum [48] = 82;
   G4double e48[60] = { 15.4, 18.86, 21.78, 24.35, 26.68, 30.81, 34.44, 37.73, 40.75, 43.57, 46.21, 48.71, 53.82, 58.34, 62.45, 66.21, 69.7, 72.94, 75.98, 78.85, 84.11, 88.84, 93.13, 97.02, 100.6, 103.8, 106.8, 109.5, 111.9, 114.1, 116.2, 118, 119.6, 121.1, 126.1, 128.1, 127.9, 126.3, 123.6, 120.4, 116.9, 113.3, 106.4, 99.98, 94.37, 89.5, 85.18, 81.37, 78.01, 75.05, 72.42, 70.08, 67.99, 66.12, 64.44, 62.92, 56.88, 52.22, 48.46, 45.34 };
 …
   name [49] = "G4_PHOTO_EMULSION";
-  Znum [49] = 0;
   G4double e49[60] = { 61.33, 75.12, 86.74, 96.97, 106.2, 122.2, 136.3, 149.1, 160.8, 171.6, 181.6, 191.1, 210, 226.3, 240.6, 253.5, 265, 275.4, 284.8, 293.3, 308, 320.3, 330.3, 338.4, 344.7, 349.4, 352.8, 355.1, 356.4, 356.9, 356.6, 355.7, 354.3, 352.4, 338.9, 322.3, 305.5, 289.9, 275.7, 263, 251.7, 241.5, 224.4, 210.3, 198.3, 188, 179, 171, 163.9, 157.5, 151.6, 146.3, 141.3, 136.6, 132.1, 128, 110.6, 97.75, 87.92, 80.2 };
 …
   name [50] = "G4_PLASTIC_SC_VINYLTOLUENE";
-  Znum [50] = 0;
   G4double e50[60] = { 190.1, 232.8, 268.8, 300.5, 329.2, 374.1, 414.4, 450.7, 483.9, 513.5, 540.4, 565.4, 616.5, 659.2, 696, 728.7, 757.6, 783, 805.3, 825.2, 860.1, 890.2, 915.4, 935.4, 950.4, 961.1, 968.2, 972.3, 973.8, 973, 970.2, 965.7, 959.9, 952.8, 906, 850.6, 795.1, 743.3, 696.4, 654.7, 617.9, 585.3, 530.7, 487.1, 451.3, 421.4, 395.9, 373.7, 354.4, 337.2, 321.9, 308.1, 295.7, 284.2, 273.8, 264.1, 225.7, 198.1, 177.1, 160.5 };
 …
   name [51] = "G4_POLYCARBONATE";
-  Znum [51] = 0;
   G4double e51[60] = { 164.8, 201.8, 233, 260.5, 285.4, 324.6, 359.7, 391.4, 420.3, 446.2, 469.7, 491.7, 536.5, 574.3, 607.1, 636.2, 662.2, 685.1, 705.4, 723.6, 755.9, 783.9, 807.7, 826.9, 841.7, 852.8, 860.8, 866, 868.8, 869.6, 868.6, 866, 862.1, 857.1, 820.5, 774.5, 727.2, 682.2, 641.1, 604.1, 571.2, 542, 492.3, 452.1, 419.1, 391.8, 368.6, 348.4, 330.7, 314.9, 300.8, 288.1, 276.7, 266.1, 256.5, 247.6, 212, 186.3, 166.8, 151.3 };
 …
   name [52] = "G4_POLYETHYLENE";
-  Znum [52] = 0;
   G4double e52[60] = { 184.9, 226.5, 261.5, 292.4, 320.3, 369.9, 413.5, 453, 489.3, 523, 554.8, 584.8, 643.9, 695.3, 740.8, 781.4, 817.9, 850.9, 880.6, 907.5, 953.7, 990.9, 1021, 1044, 1061, 1073, 1081, 1084, 1085, 1083, 1078, 1072, 1064, 1054, 994.1, 927.8, 865, 808.9, 760.1, 717.9, 681.4, 649.7, 591.2, 541, 499.2, 464.9, 436.3, 411.4, 389.8, 370.6, 353.4, 338.1, 324.2, 311.4, 299.8, 289.1, 246.4, 215.9, 192.7, 174.4 };
 …
   name [53] = "G4_POLYETHYLENE_TEREPHTHALATE_MYLAR";
-  Znum [53] = 0;
   G4double e53[60] = { 150.9, 184.9, 213.5, 238.7, 261.4, 297.8, 330.2, 359.6, 386.4, 410.5, 432.5, 453, 494.9, 530.3, 561.2, 588.8, 613.4, 635.3, 654.7, 672.3, 703.4, 730.5, 753.5, 772.3, 787, 798.3, 806.6, 812.4, 816, 817.6, 817.4, 815.8, 812.9, 808.9, 777.6, 736.5, 693.4, 651.9, 613.6, 579.1, 548.2, 520.6, 472.9, 434, 402.2, 376.1, 354.3, 335, 318.2, 303.2, 289.8, 277.7, 266.7, 256.6, 247.4, 238.9, 204.8, 180.2, 161.4, 146.5 };
 …
   name [54] = "G4_PLEXIGLASS";
-  Znum [54] = 0;
   G4double e54[60] = { 174.9, 214.2, 247.4, 276.6, 303, 345.9, 384.1, 418.7, 450.4, 479, 505.2, 529.8, 579.1, 620.8, 657.1, 689.3, 717.9, 743.2, 765.7, 785.8, 820.8, 850.5, 875, 894.5, 909.3, 920.1, 927.4, 931.9, 933.9, 933.7, 931.6, 928, 922.9, 916.8, 874.4, 823.2, 771.3, 722.4, 676.2, 634, 596.2, 562.8, 507.2, 463.4, 428.5, 400.2, 376.7, 356.1, 338, 321.9, 307.5, 294.5, 282.8, 272, 262.1, 253, 216.6, 190.4, 170.3, 154.5 };
 …
   name [55] = "G4_POLYPROPYLENE";
-  Znum [55] = 0;
   G4double e55[60] = { 197.6, 242, 279.4, 312.4, 342.2, 395.1, 441.8, 483.9, 522.7, 558.8, 592.7, 624.8, 687.3, 741.3, 789, 831.4, 869.4, 903.6, 934.3, 962, 1009, 1048, 1078, 1101, 1119, 1132, 1140, 1145, 1146, 1145, 1141, 1135, 1128, 1119, 1060, 991.7, 924.3, 862, 806.1, 756.5, 712.8, 674.2, 605.4, 548.6, 503.3, 467.5, 438.7, 413.6, 391.8, 372.4, 355.2, 339.7, 325.7, 312.9, 301.1, 290.4, 247.5, 216.8, 193.5, 175.1 };
 …
   name [56] = "G4_POLYSTYRENE";
-  Znum [56] = 0;
   G4double e56[60] = { 186, 227.8, 263.1, 294.1, 322.2, 372.1, 416, 455.7, 492.2, 526.2, 558.1, 588.3, 645.3, 693.8, 735.8, 772.4, 804.5, 832.6, 857.2, 878.7, 913.5, 939.2, 957.2, 969, 975.6, 978, 976.8, 972.8, 966.5, 958.4, 948.9, 938.3, 926.9, 914.9, 851.3, 789.6, 734.2, 685.4, 642.9, 605.7, 573, 543.9, 499.5, 465.2, 435.8, 409.1, 384.6, 363.2, 344.6, 328.1, 313.3, 300, 288, 277, 266.8, 257.5, 220.4, 193.6, 173.2, 157 };
   for(i=0; i<60; i++) {e[56][i]=e56[i]*MeV*cm2/g;}
+  name [57] = "G4_POLYTETRAFLUOROETHYLENE";
+  Znum [57] = 0;
+  name [57] = "G4_TEFLON";
   G4double e57[60] = { 83.27, 102, 117.8, 131.7, 144.2, 165, 183.4, 200.1, 215.3, 229.2, 242, 254, 278.7, 300, 319, 336.2, 351.9, 366.1, 379.2, 391.2, 413.1, 432.7, 450, 465.1, 478, 489.1, 498.5, 506.4, 513, 518.4, 522.7, 526, 528.4, 530.1, 528.6, 516.7, 499.4, 479.6, 460.4, 442.3, 425.4, 409.6, 381.2, 356.4, 334.6, 315.4, 298.3, 283.1, 269.6, 257.4, 246.5, 236.5, 227.4, 219.1, 211.5, 204.4, 175.9, 155.2, 139.3, 126.7 };
 …
   name [58] = "G4_POLYVINYL_CHLORIDE";
-  Znum [58] = 0;
   G4double e58[60] = { 140.2, 171.7, 198.3, 221.7, 242.8, 277.9, 309, 337.2, 363, 386.4, 408.1, 428.4, 468.9, 503.4, 533.6, 560.3, 584.1, 605.3, 624.1, 640.9, 670.1, 694.5, 714.3, 729.8, 741.4, 749.6, 755, 757.9, 758.6, 757.6, 755, 751, 746, 740, 701.3, 656.7, 612.9, 572.6, 538.7, 509.8, 484.7, 462.4, 424.2, 392.4, 365.3, 341.8, 321.1, 302.9, 287.3, 273.6, 261.3, 250.1, 240.1, 231.1, 222.7, 215, 184.5, 162.6, 145.9, 132.6 };
 …
   name [59] = "G4_PROPANE";
-  Znum [59] = 0;
   G4double e59[60] = { 194.5, 234.7, 268.4, 298, 324.7, 372, 413.6, 451.2, 485.8, 518, 548.2, 576.8, 642.6, 702.2, 756.9, 808, 855.9, 901.2, 944.4, 985.6, 1063, 1135, 1203, 1267, 1327, 1385, 1440, 1492, 1543, 1592, 1639, 1684, 1728, 1770, 1964, 2131, 2277, 2404, 2516, 2613, 2698, 2771, 2887, 2969, 3022, 3053, 3065, 3061, 3046, 3021, 2990, 2953, 2912, 2868, 2822, 2775, 2564, 2372, 2191, 2022 };
 …
   name [60] = "G4_Pt";
-  Znum [60] = 78;
   G4double e60[60] = { 30.79, 33.73, 36.43, 38.95, 41.31, 43.55, 48.11, 52.16, 55.83, 59.2, 62.32, 65.23, 67.95, 70.51, 75.22, 79.46, 83.3, 86.79, 89.97, 92.87, 95.51, 97.92, 100.1, 102.1, 103.9, 105.5, 107, 108.3, 112.7, 114.5, 114.4, 113, 110.8, 108.1, 105.3, 102.4, 96.92, 92.12, 87.91, 84.22, 80.97, 78.11, 75.56, 73.26, 71.17, 69.26, 67.5, 65.87, 64.36, 62.94, 57, 52.39, 48.67, 45.57, 42.94, 40.66, 38.67, 36.9, 33.91, 31.45 };
 …
   name [61] = "G4_Si";
-  Znum [61] = 14;
   G4double e61[60] = { 105, 128.6, 148.5, 166, 181.8, 210, 234.8, 257.2, 277.8, 296.9, 315, 332, 364.6, 392.5, 416.7, 437.8, 456.3, 472.5, 486.6, 498.9, 518.4, 532.3, 541.6, 547, 549.2, 549, 546.8, 543, 538, 532.2, 525.7, 518.8, 511.7, 504.4, 468.7, 437.3, 410.7, 388.4, 369.4, 353, 338.7, 325.9, 304.1, 285.9, 270.3, 256.7, 245.2, 235.1, 225.9, 217.2, 209, 201.1, 193.6, 187, 180.9, 175.3, 152.3, 135.4, 122.2, 111.7 };
   for(i=0; i<60; i++) {e[61][i]=e61[i]*MeV*cm2/g;}
+  name [62] = "G4_SiO2";
+  Znum [62] = 0;
+  name [62] = "G4_SILICON_DIOXIDE";
   G4double e62[60] = { 85.64, 104.9, 121.1, 135.4, 148.3, 171.3, 191.5, 209.8, 226.6, 242.2, 256.9, 270.8, 298.1, 322, 343.1, 362.1, 379.3, 394.9, 409.1, 422.1, 444.8, 463.8, 479.7, 492.8, 503.6, 512.3, 519.2, 524.5, 528.5, 531.2, 532.9, 533.7, 533.6, 532.9, 521.9, 503.9, 483.5, 462.8, 442.9, 424.2, 406.7, 390.6, 358.9, 330.8, 307.6, 288.9, 273.6, 259.9, 247.8, 236.9, 227.1, 218.2, 210.1, 202.7, 195.9, 189.7, 164.2, 145.5, 131.1, 119.6 };
 …
   name [63] = "G4_STILBENE";
-  Znum [63] = 0;
   G4double e63[60] = { 179.2, 219.5, 253.4, 283.3, 310.4, 352.2, 389.8, 423.8, 454.7, 482.3, 507.2, 530.3, 577.9, 617.7, 652.1, 682.6, 709.7, 733.5, 754.4, 773, 806.1, 835.1, 859.5, 879.2, 894.2, 905.1, 912.7, 917.4, 919.6, 919.6, 917.7, 914.2, 909.3, 903.3, 861.4, 810.7, 759.2, 710.8, 667.1, 628.3, 593.9, 563.4, 511.8, 470.2, 435.9, 407.2, 382.8, 361.4, 342.9, 326.4, 311.6, 298.4, 286.4, 275.4, 265.3, 256.1, 219, 192.4, 172.1, 156.1 };
 …
   name [64] = "G4_Ti";
-  Znum [64] = 22;
   G4double e64[60] = { 60.88, 74.56, 86.1, 96.26, 105.4, 121.8, 136.1, 149.1, 161.1, 172.2, 182.6, 192.5, 212.3, 229.6, 245.1, 259.1, 271.8, 283.5, 294.2, 304.1, 321.6, 336.5, 349.1, 359.8, 368.7, 376, 382, 386.7, 390.2, 392.7, 394.4, 395.2, 395.3, 394.8, 385.4, 369.3, 351, 332.6, 315.4, 299.6, 285.5, 272.8, 251.3, 233.9, 219.6, 207.6, 197.4, 188.7, 181, 174.1, 167.9, 162.2, 157, 152.2, 147.7, 143.5, 126, 112.5, 101.7, 93.07 };
 …
   name [65] = "G4_Sn";
-  Znum [65] = 50;
   G4double e65[60] = { 32.4, 39.68, 45.82, 51.23, 56.12, 64.8, 72.45, 79.36, 85.72, 91.64, 97.2, 102.5, 113.1, 122.4, 130.8, 138.5, 145.5, 151.9, 157.9, 163.4, 173.4, 182, 189.5, 196, 201.6, 206.4, 210.4, 213.8, 216.5, 218.7, 220.4, 221.6, 222.4, 222.9, 220.7, 213.8, 204.9, 195.4, 186, 177.3, 169.4, 162.3, 150.1, 140.3, 132.2, 125.5, 119.7, 114.7, 110.1, 106.1, 102.5, 99.14, 96.12, 93.34, 90.77, 88.4, 78.69, 71.47, 65.7, 60.79 };
 …
   name [66] = "G4_TISSUE-METHANE";
-  Znum [66] = 0;
   G4double e66[60] = { 174.5, 213.8, 246.8, 276, 302.3, 349.1, 390.3, 427.6, 461.8, 493.7, 523.6, 552, 607.8, 656.2, 699.1, 737.4, 771.9, 803, 831.1, 856.5, 900.2, 935.6, 963.8, 985.9, 1003, 1015, 1022, 1027, 1028, 1027, 1023, 1018, 1011, 1002, 947.8, 885.5, 824.9, 769.7, 720.9, 678.2, 641, 608.6, 553.2, 507.9, 470.5, 439.1, 412.4, 389, 368.6, 350.5, 334.4, 319.8, 306.6, 294.6, 283.6, 273.5, 233.2, 204.4, 182.5, 165.2 };
 …
   name [67] = "G4_TISSUE-PROPANE";
-  Znum [67] = 0;
   G4double e67[60] = { 169.9, 208.1, 240.3, 268.6, 294.3, 339.8, 379.9, 416.2, 449.5, 480.6, 509.7, 537.3, 591.5, 638.4, 679.9, 716.9, 750.2, 780.2, 807.4, 832, 874.4, 909.1, 937.1, 959.3, 976.6, 989.5, 998.7, 1005, 1008, 1008, 1006, 1003, 998, 991.7, 946.9, 891.9, 836, 783.4, 735.7, 693.2, 655.4, 622, 563.5, 515.3, 475.8, 443.4, 416.2, 392.6, 371.9, 353.6, 337.3, 322.5, 309.3, 297.1, 286, 275.8, 235.1, 206, 183.9, 166.5 };
 …
   name [68] = "G4_TOLUENE";
-  Znum [68] = 0;
   G4double e68[60] = { 191.6, 234.7, 271, 302.9, 331.9, 377.2, 417.8, 454.5, 488, 517.9, 545.1, 570.4, 621.9, 665, 702.2, 735.2, 764.3, 790, 812.4, 832.5, 867.7, 897.9, 923.2, 943.3, 958.3, 969, 976, 980, 981.4, 980.4, 977.5, 972.9, 966.9, 959.8, 912.2, 856.2, 800.1, 747.8, 700.6, 658.5, 621.4, 588.5, 535.1, 492.8, 457.8, 427.9, 401.8, 379.1, 359.4, 341.9, 326.3, 312.3, 299.6, 287.9, 277.3, 267.5, 228.5, 200.4, 179.1, 162.3 };
 …
   name [69] = "G4_U";
-  Znum [69] = 92;
   G4double e69[60] = { 18.38, 22.51, 25.99, 29.06, 31.83, 36.75, 41.09, 45.01, 48.62, 51.98, 55.13, 58.11, 64.19, 69.57, 74.44, 78.9, 83.02, 86.84, 90.42, 93.78, 99.92, 105.4, 110.3, 114.8, 118.8, 122.4, 125.7, 128.6, 131.2, 133.5, 135.6, 137.4, 139, 140.4, 144.4, 144.8, 142.7, 139.1, 134.5, 129.6, 124.2, 118.8, 108.7, 100, 92.78, 86.72, 81.64, 77.35, 73.71, 70.6, 67.92, 65.59, 63.56, 61.77, 60.19, 58.78, 53.33, 49.08, 45.62, 42.73 };
 …
   name [70] = "G4_W";
-  Znum [70] = 74;
   G4double e70[60] = { 14.97, 18.34, 21.17, 23.67, 25.93, 29.94, 33.47, 36.67, 39.61, 42.34, 44.91, 47.34, 52.3, 56.7, 60.68, 64.33, 67.7, 70.84, 73.78, 76.55, 81.61, 86.15, 90.24, 93.95, 97.3, 100.3, 103.1, 105.6, 107.8, 109.9, 111.7, 113.3, 114.7, 116, 120, 121.2, 120.5, 118.5, 115.9, 112.9, 109.8, 106.7, 100.2, 94.14, 89.08, 85, 81.68, 78.78, 76.2, 73.88, 71.78, 69.86, 68.09, 66.45, 64.93, 63.5, 57.52, 52.9, 49.15, 46.04 };
 …
   name [71] = "G4_WATER";
-  Znum [71] = 0;
   G4double e71[60] = { 133.7, 163.8, 189.1, 211.4, 231.6, 267.5, 299, 327.6, 353.8, 378.2, 401.2, 422.9, 466, 503.6, 537.2, 567.3, 594.6, 619.5, 642.1, 662.8, 698.9, 729, 753.8, 774, 790.1, 802.6, 811.9, 818.3, 822.3, 824.1, 823.9, 822.2, 819, 814.5, 780.1, 736, 695.9, 660.4, 628.6, 599.9, 573.7, 549.7, 507.5, 471.4, 440.1, 412.8, 388.8, 367.6, 348.9, 332.2, 317.2, 303.7, 291.4, 280.3, 270, 260.6, 222.8, 195.5, 174.8, 158.5 };
 …
   name [72] = "G4_WATER_VAPOR";
-  Znum [72] = 0;
   G4double e72[60] = { 152.2, 186.5, 215.3, 240.7, 263.7, 304.5, 340.4, 372.9, 402.8, 430.6, 456.7, 481.4, 530.5, 573.2, 611.3, 645.4, 676.4, 704.4, 730, 753.3, 793.8, 827.4, 855, 877.2, 894.8, 908.2, 918.1, 924.7, 928.5, 929.9, 929.1, 926.5, 922.3, 916.9, 876.3, 825.9, 775.3, 728.5, 686.8, 650.1, 618, 589.9, 536.1, 489.2, 450.8, 420.2, 395.5, 373.8, 354.6, 337.5, 322.2, 308.3, 295.8, 284.4, 273.9, 264.3, 225.7, 198, 176.9, 160.4 };
 …
   name [73] = "G4_Xe";
-  Znum [73] = 54;
   G4double e73[60] = { 38.1, 46.67, 53.88, 60.24, 65.99, 76.2, 85.2, 93.33, 100.8, 107.8, 114.3, 120.5, 132.8, 143.6, 153.2, 161.8, 169.6, 176.7, 183.2, 189.1, 199.4, 208, 215, 220.7, 225.2, 228.7, 231.2, 232.9, 233.9, 234.3, 234.1, 233.5, 232.5, 231.1, 221.3, 209.3, 197.4, 186.5, 177, 168.6, 161.3, 155, 144.4, 135.9, 128.8, 122.8, 117.5, 112.7, 108.4, 104.5, 101, 97.75, 94.8, 92.09, 89.6, 87.29, 77.8, 70.52, 64.84, 60.13 };

trunk/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4PhotoElectricEffect.cc,v 1.37 2006/09/14 10:27:19 maire Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PhotoElectricEffect.cc,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   G4ProcessType type):G4VEmProcess (processName, type),
     isInitialised(false)
+{}
+{
+  SetProcessSubType(fPhotoElectricEffect);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 G4PhotoElectricEffect::~G4PhotoElectricEffect()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4PhotoElectricEffect::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Gamma::Gamma());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
     SetBuildTableFlag(false);
     SetSecondaryParticle(G4Electron::Electron());
     if(!Model()) SetModel(new G4PEEffectModel);
+    if(!Model()) SetModel(new G4PEEffectModel());
     Model()->SetLowEnergyLimit(MinKinEnergy());
     Model()->SetHighEnergyLimit(MaxKinEnergy());
 …
 void G4PhotoElectricEffect::PrintInfo()
+{
+  G4cout
+    << " Total cross sections from Sandia parametrisation. "
+    << "\n      Sampling according " << Model()->GetName() << " model"
+    << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc

-              r819
+              r961
 //
 //
 // $Id: G4PolarizedComptonScattering.cc,v 1.16 2006/06/29 19:53:30 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PolarizedComptonScattering.cc,v 1.18 2008/10/15 17:53:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 using namespace std;
+G4PolarizedComptonScattering::G4PolarizedComptonScattering(
+                                                  const G4String& processName)
+: G4ComptonScattering52 (processName)
+G4PolarizedComptonScattering::G4PolarizedComptonScattering(const G4String& pname)
+  : G4ComptonScattering52 (pname)
 { }

trunk/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UniversalFluctuation.cc,v 1.15 2007/07/13 11:01:50 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4UniversalFluctuation.cc,v 1.17 2009/02/19 11:26:01 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4double G4UniversalFluctuation::SampleFluctuations(const G4Material* material,
                                                 const G4DynamicParticle* dp,
                                                       G4double& tmax,
                                                       G4double& length,
                                                       G4double& meanLoss)
+                                                    const G4DynamicParticle* dp,
+                                                    G4double& tmax,
+                                                    G4double& length,
+                                                    G4double& meanLoss)
+{
 // Calculate actual loss from the mean loss.
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void
+G4UniversalFluctuation::SetParticleAndCharge(const G4ParticleDefinition* part,
+                                             G4double q2)
+{
+  if(part != particle) {
+    particle       = part;
+    particleMass   = part->GetPDGMass();
+  }
+  chargeSquare = q2;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UrbanMscModel.cc,v 1.77.2.2 2008/04/25 00:34:55 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UrbanMscModel.cc,v 1.86 2008/10/29 14:15:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 using namespace std;
+G4UrbanMscModel::G4UrbanMscModel(G4double m_facrange, G4double m_dtrl,
+                                 G4double m_lambdalimit,
+                                 G4double m_facgeom,G4double m_skin,
+                                 G4bool m_samplez, G4MscStepLimitType m_stepAlg,
+                                 const G4String& nam)
+  : G4VEmModel(nam),
+    dtrl(m_dtrl),
+    lambdalimit(m_lambdalimit),
+    facrange(m_facrange),
+    facgeom(m_facgeom),
+    skin(m_skin),
+    steppingAlgorithm(m_stepAlg),
+    samplez(m_samplez),
+G4UrbanMscModel::G4UrbanMscModel(const G4String& nam)
+  : G4VMscModel(nam),
     isInitialized(false)
+{
 …
   tlimitminfix  = 1.e-6*mm;
   stepmin       = tlimitminfix;
-  skindepth     = skin*stepmin;
   smallstep     = 1.e10;
   currentRange  = 0. ;
 …
   geommin       = 1.e-3*mm;
   geomlimit     = geombig;
-  facsafety     = 0.25;
   presafety     = 0.*mm;
   Zeff          = 1.;
 …
   G4double eKineticEnergy = KineticEnergy;
+  if((particle->GetParticleName() != "e-") &&
+     (particle->GetParticleName() != "e+") )
+  if(mass > electron_mass_c2)
+  {
      G4double TAU = KineticEnergy/mass ;
      G4double c = mass*TAU*(TAU+2.)/(electron_mass_c2*(TAU+1.)) ;
      G4double w = c-2. ;
      G4double tau = 0.5*(w+sqrt(w*w+4.*c)) ;
      eKineticEnergy = electron_mass_c2*tau ;
+    G4double TAU = KineticEnergy/mass ;
+    G4double c = mass*TAU*(TAU+2.)/(electron_mass_c2*(TAU+1.)) ;
+    G4double w = c-2. ;
+    G4double tau = 0.5*(w+sqrt(w*w+4.*c)) ;
+    eKineticEnergy = electron_mass_c2*tau ;
+  }
 …
+{
   tPathLength = currentMinimalStep;
-  G4int stepNumber = track.GetCurrentStepNumber();
   const G4DynamicParticle* dp = track.GetDynamicParticle();
+  if(stepNumber == 1) {
+  G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
+  G4StepStatus stepStatus = sp->GetStepStatus();
+  if(stepStatus == fUndefined) {
     inside = false;
     insideskin = false;
 …
   if(tPathLength > currentRange) tPathLength = currentRange;
-  G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
   presafety = sp->GetSafety();
 …
+    }
-  G4StepStatus stepStatus = sp->GetStepStatus();
   // standard  version
   //
 …
       insideskin = false;
       if((stepStatus == fGeomBoundary) || (stepNumber == 1))
+      if((stepStatus == fGeomBoundary) || (stepStatus == fUndefined))
+        {
           if(stepNumber == 1) smallstep = 1.e10;
+          if(stepStatus == fUndefined) smallstep = 1.e10;
           else  smallstep = 1.;
 …
+        }
       if((stepStatus == fGeomBoundary) || (stepNumber == 1))
+      if((stepStatus == fGeomBoundary) || (stepStatus == fUndefined))
+        {
           // facrange scaling in lambda
 …
+{
   G4double kineticEnergy = dynParticle->GetKineticEnergy();
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix)) return;
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix) ||
+     (tPathLength/tausmall < lambda0) ) return;
   G4double cth  = SampleCosineTheta(tPathLength,kineticEnergy);
   // protection against 'bad' cth values
   if(cth > 1.)  cth =  1.;
+  if(cth < -1.) cth = -1.;
+  if(abs(cth) > 1.) return;
   G4double sth  = sqrt((1.0 - cth)*(1.0 + cth));
   G4double phi  = twopi*G4UniformRand();

trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel90.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4UrbanMscModel90.cc,v 1.1.2.2 2008/04/25 00:34:55 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UrbanMscModel90.cc,v 1.10 2008/10/29 14:15:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 using namespace std;
+G4UrbanMscModel90::G4UrbanMscModel90(G4double m_facrange, G4double m_dtrl,
+                                     G4double m_lambdalimit,
+                                     G4double m_facgeom,G4double m_skin,
+                                     G4bool m_samplez, G4MscStepLimitType m_stepAlg,
+                                     const G4String& nam)
+  : G4VEmModel(nam),
+    dtrl(m_dtrl),
+    lambdalimit(m_lambdalimit),
+    facrange(m_facrange),
+    facgeom(m_facgeom),
+    skin(m_skin),
+    steppingAlgorithm(m_stepAlg),
+    samplez(m_samplez),
+G4UrbanMscModel90::G4UrbanMscModel90(const G4String& nam)
+  : G4VMscModel(nam),
     isInitialized(false)
+{
 …
   tlimitminfix  = 1.e-6*mm;
   stepmin       = tlimitminfix;
-  skindepth     = skin*stepmin;
   smallstep     = 1.e10;
   currentRange  = 0. ;
 …
   geommin       = 1.e-3*mm;
   geomlimit     = geombig;
-  facsafety     = 0.25;
   presafety     = 0.*mm;
   Zeff          = 1.;
 …
   SetParticle(p);
   if (pParticleChange)
+  if (pParticleChange) {
    fParticleChange = reinterpret_cast<G4ParticleChangeForMSC*>(pParticleChange);
   else
+  } else {
    fParticleChange = new G4ParticleChangeForMSC();
+  }
   safetyHelper = G4TransportationManager::GetTransportationManager()
     ->GetSafetyHelper();
 …
   G4double eKineticEnergy = KineticEnergy;
+  if((particle->GetParticleName() != "e-") &&
+     (particle->GetParticleName() != "e+") )
+  if(mass > electron_mass_c2)
+  {
      G4double TAU = KineticEnergy/mass ;
      G4double c = mass*TAU*(TAU+2.)/(electron_mass_c2*(TAU+1.)) ;
      G4double w = c-2. ;
      G4double tau = 0.5*(w+sqrt(w*w+4.*c)) ;
      eKineticEnergy = electron_mass_c2*tau ;
+    G4double TAU = KineticEnergy/mass ;
+    G4double c = mass*TAU*(TAU+2.)/(electron_mass_c2*(TAU+1.)) ;
+    G4double w = c-2. ;
+    G4double tau = 0.5*(w+sqrt(w*w+4.*c)) ;
+    eKineticEnergy = electron_mass_c2*tau ;
+  }
 …
+{
   tPathLength = currentMinimalStep;
-  G4int stepNumber = track.GetCurrentStepNumber();
   const G4DynamicParticle* dp = track.GetDynamicParticle();
+  if(stepNumber == 1) {
+  G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
+  G4StepStatus stepStatus = sp->GetStepStatus();
+  if(stepStatus == fUndefined) {
     inside = false;
     insideskin = false;
 …
   if(tPathLength > currentRange) tPathLength = currentRange;
-  G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
   presafety = sp->GetSafety();
   //  G4cout << "G4UrbanMscModel90::ComputeTruePathLengthLimit tPathLength= "
   //     <<tPathLength<<" safety= " << presafety
   //     << " range= " <<currentRange<<G4endl;
+  /*
+  G4cout << "G4UrbanMscModel90::ComputeTruePathLengthLimit tPathLength= "
+         <<tPathLength<<" safety= " << presafety
+       << " range= " <<currentRange<<G4endl;
+  */
   // far from geometry boundary
   if(currentRange < presafety)
 …
       return tPathLength;
+    }
-  G4StepStatus stepStatus = sp->GetStepStatus();
   // standard  version
 …
       insideskin = false;
       if((stepStatus == fGeomBoundary) || (stepNumber == 1))
+      if((stepStatus == fGeomBoundary) || (stepStatus == fUndefined))
+        {
           if(stepNumber == 1) smallstep = 1.e10;
+          if(stepStatus == fUndefined) smallstep = 1.e10;
           else  smallstep = 1.;
 …
+        }
       if((stepStatus == fGeomBoundary) || (stepNumber == 1))
+      if((stepStatus == fGeomBoundary) || (stepStatus == fUndefined))
+        {
           // facrange scaling in lambda
 …
   //  G4cout << "tPathLength= " << tPathLength << "  geomlimit= " << geomlimit
   //     << " currentMinimalStep= " << currentMinimalStep << G4endl;
   return tPathLength ;
+}
 …
 void G4UrbanMscModel90::SampleScattering(const G4DynamicParticle* dynParticle,
                                          G4double safety)
+{
   G4double kineticEnergy = dynParticle->GetKineticEnergy();
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix)) return;
+  if((kineticEnergy <= 0.0) || (tPathLength <= tlimitminfix) ||
+     (tPathLength/tausmall < lambda0) ) return;
   G4double cth  = SampleCosineTheta(tPathLength,kineticEnergy);
   // protection against 'bad' cth values
+  if(cth > 1.)  cth =  1.;
+  if(cth < -1.) cth = -1.;
+  if(std::abs(cth) > 1.) return;
   G4double sth  = sqrt((1.0 - cth)*(1.0 + cth));

trunk/source/processes/electromagnetic/standard/src/G4WaterStopping.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4WaterStopping.cc,v 1.2 2006/06/29 19:53:40 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4WaterStopping.cc,v 1.11 2008/12/18 13:01:38 gunter Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //---------------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4WaterStopping::G4WaterStopping(G4EmCorrections* corr)
+G4WaterStopping::G4WaterStopping(G4EmCorrections* corr, G4bool splineFlag)
+{
+  spline = splineFlag;
   Initialise(corr);
+}
 …
 G4WaterStopping::~G4WaterStopping()
+{
+  int n = dedx.size();
+  for(int i=0; i<n; i++) {delete dedx[i];}
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
+{
   G4double res = 0.0;
+  if(iz < 3 || iz > 18) return res;
   G4bool b;
+  G4int idx = 0;
+  for(; idx<8; idx++) {
+    if(iz == Z[idx]) {
+      res = (dedx[idx])->GetValue(energy, b);
+      break;
+    }
+  G4int idx = iz - 3;
+  G4double scaledEnergy = energy/A[idx];
+  G4double emin = 0.025*MeV;
+  if(scaledEnergy < emin) {
+    res = (dedx[idx])->GetValue(emin, b)*std::sqrt(scaledEnergy/emin);
+  } else {
+    res = (dedx[idx])->GetValue(scaledEnergy, b);
+  }
   return res;
+ }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4WaterStopping::AddData(G4double* energy, G4double* stoppower,
+                              G4double factor)
+{
+  G4LPhysicsFreeVector* pv = new G4LPhysicsFreeVector(53,energy[0],energy[52]);
+  pv->SetSpline(spline);
+  dedx.push_back(pv);
+  for(G4int i=0;i<53;i++) {
+    pv->PutValues(i,energy[i],stoppower[i]*factor);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 void G4WaterStopping::Initialise(G4EmCorrections* corr)
 …
   G4int i;
   //..List of ions
   G4int zz[8] = {3, 4, 5, 6, 7, 8, 9, 10 };
   G4int aa[8] = {7, 9, 11, 12, 14, 16, 19, 20 };
   for(i=0; i<8; i++) {
+  G4int zz[16] = {3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18};
+  G4int aa[16] = {7, 9, 11, 12, 14, 16, 19, 20, 23, 24, 27, 28,31,32, 35,40};
+  // G4double A_Ion[16] = {6.941,9.0122,10.811,12.011,14.007,15.999,18.998,20.180,22.990,24.305,26.982,28.086,30.974,32.065,35.453,39.948};
+  for(i=0; i<16; i++) {
     Z[i] = zz[i];
     A[i] = aa[i];
+    A[i] = G4double(aa[i]);
+  }
   //..Reduced energies
+  G4double E[53] = {0.025,0.03,0.04,0.05,0.06,0.07,0.08,0.09,0.1,0.15,0.2,0.25,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.5,2,2.5,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60,70,80,90,100,150,200,250
+,300,400,500,600,700,800,900,1000};
+  G4double E[53] = {0.025,0.03,0.04,0.05,0.06,0.07,0.08,0.09,0.1,0.15,0.2,0.25,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.5,2,2.5,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60,70,80,90,100,150,200,250,300,400,500,600,700,800,900,1000};
   for(i=0; i<53; i++) {E[i] *= MeV;}
+  //..Li
+  G4double Li[53] = {2.626,2.84,3.191,3.461,3.665,3.817,3.927,4.004,4.056,4.102,3.998,3.853,3.702,3.413,3.158,2.934,2.739,2.567,2.415,2.28,1.782,1.465,1.247,1.087,0.8706,0.7299,0.631,0.5575,0.5005,0.455,0.4178,0.3004,0.2376,0.1981,0.1708,0.1354,0.1132,0.09803,0.08692,0.07842,0.07171,0.06627,0.0495,0.04085,0.03557,0.03203,0.0276,0.02498,0.02327,0.0221,0.02126,0.02064,0.02016};
+  G4LPhysicsFreeVector* pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],Li[i]*1000.*MeV/cm); }
+  G4double factor = 1000.*MeV/cm;
+  //..Be
+  G4double Be[53] = {3.272,3.565,4.061,4.463,4.79,5.052,5.258,5.419,5.542,5.803,5.787,5.675,5.529,5.215,4.912,4.634,4.381,4.152,3.944,3.756,3.026,2.533,2.179,1.913,1.542,1.296,1.122,0.9911,0.8898,0.8087,0.7423,0.5335,0.4219,0.3518,0.3034,0.2406,0.2013,0.1743,0.1545,0.1394,0.1275,0.1178,0.08805,0.07266,0.06328,0.05698,0.0491,0.04444,0.04141,0.03933,0.03783,0.03672,0.03588};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],Be[i]*1000.*MeV/cm); }
+G4double G4_WATER_Li [53]={2.626, 2.84, 3.191, 3.461, 3.665, 3.817, 3.927, 4.004, 4.056, 4.102, 3.998, 3.853, 3.702, 3.413, 3.158, 2.934, 2.739, 2.567, 2.415, 2.28, 1.782, 1.465, 1.247, 1.087, 0.8706, 0.7299, 0.631, 0.5575, 0.5005, 0.455, 0.4178, 0.3004, 0.2376, 0.1981, 0.1708, 0.1354, 0.1132, 0.09803, 0.08692, 0.07842, 0.07171, 0.06627, 0.0495, 0.04085, 0.03557, 0.03203, 0.0276, 0.02498, 0.02327, 0.0221, 0.02126, 0.02064, 0.02016, };
+AddData(E,G4_WATER_Li,factor);
+  //..B
+  G4double B[53] = {3.773,4.142,4.776,5.304,5.749,6.122,6.431,6.684,6.89,7.432,7.551,7.505,7.391,7.091,6.772,6.463,6.172,5.901,5.65,5.418,4.484,3.817,3.322,2.94,2.392,2.02,1.752,1.549,1.391,1.265,1.161,0.8332,0.6587,0.5492,0.4737,0.3757,0.3144,0.2723,0.2415,0.2179,0.1993,0.1842,0.1376,0.1136,0.09894,0.08909,0.07678,0.0695,0.06477,0.06151,0.05916,0.05743,0.05611};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],B[i]*1000.*MeV/cm); }
+G4double G4_WATER_Be [53]={3.272, 3.565, 4.061, 4.463, 4.79, 5.052, 5.258, 5.419, 5.542, 5.803, 5.787, 5.675, 5.529, 5.215, 4.912, 4.634, 4.381, 4.152, 3.944, 3.756, 3.026, 2.533, 2.179, 1.913, 1.542, 1.296, 1.122, 0.9911, 0.8898, 0.8087, 0.7423, 0.5335, 0.4219, 0.3518, 0.3034, 0.2406, 0.2013, 0.1743, 0.1545, 0.1394, 0.1275, 0.1178, 0.08805, 0.07266, 0.06328, 0.05698, 0.0491, 0.04444, 0.04141, 0.03933, 0.03783, 0.03672, 0.03588, };
+AddData(E,G4_WATER_Be,factor);
+  //..C
+  G4double C[53] = {4.154,4.593,5.358,6.009,6.568,7.049,7.46,7.809,8.103,8.968,9.262,9.311,9.25,8.994,8.68,8.358,8.045,7.747,7.465,7.199,6.093,5.269,4.636,4.137,3.403,2.891,2.516,2.23,2.004,1.823,1.673,1.2,0.9483,0.7904,0.6817,0.5406,0.4525,0.392,0.3477,0.3138,0.287,0.2653,0.1983,0.1637,0.1426,0.1284,0.1107,0.1002,0.09335,0.08865,0.08528,0.08278,0.08088};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],C[i]*1000.*MeV/cm); }
+G4double G4_WATER_B [53]={3.773, 4.142, 4.776, 5.304, 5.749, 6.122, 6.431, 6.684, 6.89, 7.432, 7.551, 7.505, 7.391, 7.091, 6.772, 6.463, 6.172, 5.901, 5.65, 5.418, 4.484, 3.817, 3.322, 2.94, 2.392, 2.02, 1.752, 1.549, 1.391, 1.265, 1.161, 0.8332, 0.6587, 0.5492, 0.4737, 0.3757, 0.3144, 0.2723, 0.2415, 0.2179, 0.1993, 0.1842, 0.1376, 0.1136, 0.09894, 0.08909, 0.07678, 0.0695, 0.06477, 0.06151, 0.05916, 0.05743, 0.05611, };
+AddData(E,G4_WATER_B,factor);
+  //..N
+  G4double N[53] = {4.49,4.984,5.86,6.616,7.276,7.854,8.36,8.799,9.179,10.39,10.89,11.07,11.08,10.9,10.61,10.3,9.974,9.66,9.357,9.068,7.823,6.859,6.097,5.484,4.56,3.9,3.408,3.029,2.727,2.482,2.28,1.636,1.291,1.076,0.9274,0.7354,0.6156,0.5333,0.4731,0.427,0.3906,0.3611,0.27,0.2229,0.1942,0.1749,0.1507,0.1365,0.1272,0.1208,0.1162,0.1128,0.1102};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],N[i]*1000.*MeV/cm); }
+G4double G4_WATER_C [53]={4.154, 4.593, 5.358, 6.009, 6.568, 7.049, 7.46, 7.809, 8.103, 8.968, 9.262, 9.311, 9.25, 8.994, 8.68, 8.358, 8.045, 7.747, 7.465, 7.199, 6.093, 5.269, 4.636, 4.137, 3.403, 2.891, 2.516, 2.23, 2.004, 1.823, 1.673, 1.2, 0.9483, 0.7904, 0.6817, 0.5406, 0.4525, 0.392, 0.3477, 0.3138, 0.287, 0.2653, 0.1983, 0.1637, 0.1426, 0.1284, 0.1107, 0.1002, 0.09335, 0.08865, 0.08528, 0.08278, 0.08088, };
+AddData(E,G4_WATER_C,factor);
+  //..O
+  G4double O[53] = {4.778,5.321,6.298,7.152,7.907,8.578,9.173,9.7,10.16,11.73,12.46,12.78,12.89,12.81,12.57,12.27,11.95,11.63,11.32,11.01,9.659,8.571,7.691,6.967,5.854,5.042,4.427,3.945,3.56,3.245,2.983,2.142,1.689,1.406,1.212,0.9602,0.8037,0.6963,0.6178,0.5577,0.5102,0.4716,0.3527,0.2913,0.2538,0.2285,0.197,0.1784,0.1663,0.1579,0.1519,0.1475,0.1441};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],O[i]*1000.*MeV/cm); }
+G4double G4_WATER_N [53]={4.49, 4.984, 5.86, 6.616, 7.276, 7.854, 8.36, 8.799, 9.179, 10.39, 10.89, 11.07, 11.08, 10.9, 10.61, 10.3, 9.974, 9.66, 9.357, 9.068, 7.823, 6.859, 6.097, 5.484, 4.56, 3.9, 3.408, 3.029, 2.727, 2.482, 2.28, 1.636, 1.291, 1.076, 0.9274, 0.7354, 0.6156, 0.5333, 0.4731, 0.427, 0.3906, 0.3611, 0.27, 0.2229, 0.1942, 0.1749, 0.1507, 0.1365, 0.1272, 0.1208, 0.1162, 0.1128, 0.1102, };
+AddData(E,G4_WATER_N,factor);
+  //..F
+  G4double F[53] = {4.992, 5.575, 6.637, 7.578, 8.418, 9.171, 9.847, 10.45, 11, 12.9, 13.88, 14.35, 14.56, 14.59, 14.4, 14.13, 13.83, 13.51, 13.19, 12.87, 11.44, 10.26, 9.279, 8.463, 7.187, 6.237, 5.506, 4.928, 4.461, 4.076, 3.753, 2.707, 2.137, 1.779, 1.533, 1.215, 1.017, 0.8809, 0.7816, 0.7056, 0.6456, 0.5969, 0.4466, 0.3688, 0.3213, 0.2894, 0.2496, 0.2259,
+.2106, 0.2, 0.1924, 0.1868, 0.1825};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],F[i]*1000.*MeV/cm); }
+G4double G4_WATER_O [53]={4.778, 5.321, 6.298, 7.152, 7.907, 8.578, 9.173, 9.7, 10.16, 11.73, 12.46, 12.78, 12.89, 12.81, 12.57, 12.27, 11.95, 11.63, 11.32, 11.01, 9.659, 8.571, 7.691, 6.967, 5.854, 5.042, 4.427, 3.945, 3.56, 3.245, 2.983, 2.142, 1.689, 1.406, 1.212, 0.9602, 0.8037, 0.6963, 0.6178, 0.5577, 0.5102, 0.4716, 0.3527, 0.2913, 0.2538, 0.2285, 0.197, 0.1784, 0.1663, 0.1579, 0.1519, 0.1475, 0.1441, };
+AddData(E,G4_WATER_O,factor);
+  //..Ne
+  G4double Ne[53] = {5.182, 5.797, 6.931, 7.948, 8.865, 9.693, 10.044, 11.12, 11.74, 13.98, 15.21, 15.85, 16.17, 16.33, 16.21, 15.98, 15.69, 15.38, 15.06, 14.74, 13.24, 11.98, 10.91, 10.01, 8.584, 7.503, 6.66, 5.986, 5.436, 4.979, 4.595, 3.332, 2.635, 2.195, 1.892, 1.499, 1.255, 1.087, 0.9646, 0.8709, 0.7969, 0.7368, 0.5514, 0.4555, 0.3969, 0.3576, 0.3083, 0.2792, 0.2602, 0.2472, 0.2378, 0.2308, 0.2255};
+  pv = new G4LPhysicsFreeVector(53,E[0],E[52]);
+  dedx.push_back(pv);
+  for(i=0; i<53; i++) { pv->PutValues(i,E[i],Ne[i]*1000.*MeV/cm); }
+G4double G4_WATER_F [53]={4.992, 5.575, 6.637, 7.578, 8.418, 9.171, 9.847, 10.45, 11, 12.9, 13.88, 14.35, 14.56, 14.59, 14.4, 14.13, 13.83, 13.51, 13.19, 12.87, 11.44, 10.26, 9.279, 8.463, 7.187, 6.237, 5.506, 4.928, 4.461, 4.076, 3.753, 2.707, 2.137, 1.779, 1.533, 1.215, 1.017, 0.8809, 0.7816, 0.7056, 0.6456, 0.5969, 0.4466, 0.3688, 0.3213, 0.2894, 0.2496, 0.2259, 0.2106, 0.2, 0.1924, 0.1868, 0.1825, };
+AddData(E,G4_WATER_F,factor);
+G4double G4_WATER_Ne [53]={5.182, 5.797, 6.931, 7.948, 8.865, 9.693, 10.44, 11.12, 11.74, 13.98, 15.21, 15.85, 16.17, 16.33, 16.21, 15.98, 15.69, 15.38, 15.06, 14.74, 13.24, 11.98, 10.91, 10.01, 8.584, 7.503, 6.66, 5.986, 5.436, 4.979, 4.595, 3.332, 2.635, 2.195, 1.892, 1.499, 1.255, 1.087, 0.9646, 0.8709, 0.7969, 0.7368, 0.5514, 0.4555, 0.3969, 0.3576, 0.3083, 0.2792, 0.2602, 0.2472, 0.2378, 0.2308, 0.2255, };
+AddData(E,G4_WATER_Ne,factor);
+G4double G4_WATER_Na [53]={5.352, 5.998, 7.203, 8.3, 9.298, 10.21, 11.04, 11.81, 12.5, 15.13, 16.68, 17.56, 18.04, 18.43, 18.44, 18.29, 18.05, 17.78, 17.48, 17.18, 15.67, 14.32, 13.15, 12.14, 10.5, 9.226, 8.218, 7.401, 6.728, 6.166, 5.69, 4.112, 3.237, 2.686, 2.307, 1.821, 1.521, 1.317, 1.168, 1.054, 0.9644, 0.8917, 0.6674, 0.5514, 0.4806, 0.4329, 0.3734, 0.3381, 0.3152, 0.2993, 0.288, 0.2796, 0.2732, };
+AddData(E,G4_WATER_Na,factor);
+G4double G4_WATER_Mg [53]={5.542, 6.193, 7.42, 8.551, 9.59, 10.54, 11.42, 12.23, 12.98, 15.85, 17.62, 18.66, 19.26, 19.76, 19.83, 19.7, 19.47, 19.2, 18.89, 18.58, 17.02, 15.62, 14.41, 13.36, 11.64, 10.3, 9.233, 8.362, 7.64, 7.033, 6.516, 4.777, 3.792, 3.162, 2.725, 2.159, 1.806, 1.565, 1.388, 1.254, 1.147, 1.061, 0.7944, 0.6565, 0.5722, 0.5156, 0.4447, 0.4027, 0.3754, 0.3566, 0.343, 0.333, 0.3254, };
+AddData(E,G4_WATER_Mg,factor);
+G4double G4_WATER_Al [53]={5.724, 6.39, 7.649, 8.82, 9.905, 10.91, 11.84, 12.71, 13.51, 16.66, 18.69, 19.93, 20.68, 21.38, 21.56, 21.5, 21.32, 21.07, 20.79, 20.48, 18.91, 17.47, 16.19, 15.08, 13.24, 11.78, 10.61, 9.641, 8.835, 8.153, 7.569, 5.583, 4.444, 3.71, 3.199, 2.534, 2.12, 1.836, 1.629, 1.471, 1.346, 1.245, 0.9325, 0.7707, 0.6719, 0.6054, 0.5223, 0.473, 0.441, 0.4189, 0.403, 0.3912, 0.3823, };
+AddData(E,G4_WATER_Al,factor);
+G4double G4_WATER_Si [53]={5.905, 6.583, 7.868, 9.073, 10.2, 11.25, 12.23, 13.14, 13.99, 17.4, 19.66, 21.1, 22.01, 22.91, 23.21, 23.22, 23.09, 22.87, 22.61, 22.32, 20.76, 19.28, 17.95, 16.78, 14.83, 13.26, 11.99, 10.94, 10.06, 9.304, 8.656, 6.43, 5.135, 4.294, 3.705, 2.938, 2.458, 2.129, 1.889, 1.706, 1.561, 1.444, 1.082, 0.8942, 0.7796, 0.7026, 0.6061, 0.549, 0.5119, 0.4862, 0.4678, 0.4542, 0.4438, };
+AddData(E,G4_WATER_Si,factor);
+G4double G4_WATER_P [53]={6.12, 6.81, 8.118, 9.352, 10.51, 11.61, 12.63, 13.58, 14.48, 18.13, 20.63, 22.28, 23.34, 24.47, 24.91, 25.02, 24.95, 24.78, 24.55, 24.28, 22.76, 21.26, 19.89, 18.67, 16.59, 14.92, 13.54, 12.39, 11.42, 10.59, 9.867, 7.367, 5.896, 4.935, 4.259, 3.376, 2.824, 2.445, 2.169, 1.959, 1.792, 1.657, 1.242, 1.027, 0.8954, 0.807, 0.6963, 0.6308, 0.5881, 0.5587, 0.5375, 0.5219, 0.51, };
+AddData(E,G4_WATER_P,factor);
+G4double G4_WATER_S [53]={6.294, 7, 8.338, 9.604, 10.8, 11.94, 13, 14, 14.94, 18.82, 21.55, 23.41, 24.65, 26.01, 26.6, 26.81, 26.81, 26.69, 26.5, 26.26, 24.79, 23.28, 21.88, 20.61, 18.43, 16.64, 15.16, 13.92, 12.86, 11.95, 11.15, 8.371, 6.715, 5.624, 4.856, 3.847, 3.217, 2.785, 2.47, 2.229, 2.04, 1.886, 1.413, 1.169, 1.019, 0.9187, 0.7929, 0.7183, 0.6697, 0.6362, 0.6122, 0.5944, 0.5808, };
+AddData(E,G4_WATER_S,factor);
+G4double G4_WATER_Cl [53]={6.522, 7.237, 8.59, 9.875, 11.1, 12.26, 13.36, 14.39, 15.37, 19.45, 22.4, 24.45, 25.86, 27.46, 28.19, 28.5, 28.57, 28.5, 28.34, 28.13, 26.72, 25.21, 23.78, 22.47, 20.2, 18.32, 16.75, 15.42, 14.28, 13.3, 12.44, 9.392, 7.557, 6.34, 5.479, 4.344, 3.633, 3.145, 2.789, 2.517, 2.303, 2.13, 1.596, 1.32, 1.151, 1.038, 0.8957, 0.8115, 0.7567, 0.7189, 0.6917, 0.6717, 0.6563, };
+AddData(E,G4_WATER_Cl,factor);
+G4double G4_WATER_Ar [53]={6.642, 7.369, 8.739, 10.04, 11.28, 12.47, 13.59, 14.66, 15.66, 19.93, 23.08, 25.32, 26.89, 28.72, 29.6, 30.01, 30.15, 30.13, 30, 29.82, 28.46, 26.94, 25.49, 24.15, 21.81, 19.86, 18.22, 16.82, 15.61, 14.57, 13.65, 10.39, 8.394, 7.063, 6.114, 4.859, 4.067, 3.522, 3.125, 2.821, 2.581, 2.387, 1.789, 1.48, 1.291, 1.164, 1.005, 0.9105, 0.8491, 0.8067, 0.7763, 0.7537, 0.7365, };
+AddData(E,G4_WATER_Ar,factor);
   if(corr) {
     for(i=0; i<8; i++) {corr->AddStoppingData(Z[i], A[i], "G4_WATER", *(dedx[i]));}
+    for(i=0; i<16; i++) {corr->AddStoppingData(Z[i], aa[i], "G4_WATER", dedx[i]);}
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlung.cc,v 1.48 2007/05/23 08:47:34 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eBremsstrahlung.cc,v 1.56 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 22-05-06 Use gammaThreshold from manager (V.Ivantchenko)
 // 15-01-07 use SetEmModel() from G4VEnergyLossProcess (mma)
+//
+//          use RelEmModel above 1GeV (AS &  VI)
+// 13-11-08 reenable LPM switch (A.Schaelicke)
 // -------------------------------------------------------------------
 //
 …
 #include "G4Gamma.hh"
 #include "G4eBremsstrahlungModel.hh"
 #include "G4UniversalFluctuation.hh"
+#include "G4eBremsstrahlungRelModel.hh"
 #include "G4UnitsTable.hh"
 #include "G4LossTableManager.hh"
 …
   G4VEnergyLossProcess(name),
   isInitialised(false)
+{}
+{
+  SetProcessSubType(fBremsstrahlung);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4eBremsstrahlung::~G4eBremsstrahlung()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4eBremsstrahlung::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Electron::Electron() || &p == G4Positron::Positron());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     SetSecondaryParticle(G4Gamma::Gamma());
     SetIonisation(false);
+    if (!EmModel()) SetEmModel(new G4eBremsstrahlungModel());
+    EmModel()->SetLowEnergyLimit (100*eV);
+    EmModel()->SetHighEnergyLimit(100*TeV);
+    if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
+    if (!EmModel(1)) SetEmModel(new G4eBremsstrahlungModel(), 1);
+    if (!EmModel(2)) SetEmModel(new G4eBremsstrahlungRelModel(), 2);
+    EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
+    EmModel(1)->SetHighEnergyLimit(EmModel(2)->LowEnergyLimit());
+    EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
+    AddEmModel(1, EmModel(), FluctModel());
+    G4VEmFluctuationModel* fm = 0;
+    AddEmModel(1, EmModel(1), fm);
+    AddEmModel(2, EmModel(2), fm);
     isInitialised = true;
+  }
   G4LossTableManager* man = G4LossTableManager::Instance();
+  dynamic_cast<G4eBremsstrahlungModel*>(EmModel())
+    ->SetEnergyThreshold(man->BremsstrahlungTh());
+  dynamic_cast<G4eBremsstrahlungModel*>(EmModel())
+    ->SetLPMflag(man->LPMFlag());
+  G4double eth = man->BremsstrahlungTh();
+  EmModel(1)->SetSecondaryThreshold(eth);
+  EmModel(2)->SetSecondaryThreshold(eth);
+  // Only high energy model LMP flag is ON/OFF
+  EmModel(1)->SetLPMFlag(false);
+  EmModel(2)->SetLPMFlag(man->LPMFlag());
+}
 …
 void G4eBremsstrahlung::PrintInfo()
+{
+  if(EmModel()) {
+    G4cout << "      Total cross sections and sampling from "
+           << EmModel()->GetName() << " model"
+           << " (based on the EEDL data library) "
+           << "\n      Good description from 1 KeV to 100 GeV, "
+           << "log scale extrapolation above 100 GeV."
+           << " LPM flag "
+           << dynamic_cast<G4eBremsstrahlungModel*>(EmModel())->LPMflag()
+           << G4endl;
+    G4double eth = dynamic_cast<G4eBremsstrahlungModel*>(EmModel())->EnergyThreshold();
+    if(eth < DBL_MIN)
+      G4cout << "      HighEnergyThreshold(GeV)= " << eth/GeV
+             << G4endl;
+  if(EmModel(1)) {
+    G4LossTableManager* man = G4LossTableManager::Instance();
+    G4double eth = man->BremsstrahlungTh();
+    G4cout << "      LPM flag: " << man->LPMFlag() << " for E > "
+           << EmModel(1)->HighEnergyLimit()/GeV << " GeV";
+    if(eth < DBL_MAX) G4cout << ",  HighEnergyThreshold(GeV)= " << eth/GeV;
+    G4cout << G4endl;
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eBremsstrahlungModel.cc,v 1.39 2007/05/23 08:47:35 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4eBremsstrahlungModel.cc,v 1.43 2008/11/13 19:28:58 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 27-03-06  Fix calculation of fl parameter at low energy (energy loss) (VI)
 // 15-02-07  correct LPMconstant by a factor 2, thanks to G. Depaola (mma)
+// 09-09-08  MigdalConstant increased in (2pi)^2 times (A.Schaelicke)
 //
 // Class Description:
 …
     isElectron(true),
     probsup(1.0),
     MigdalConstant(classic_electr_radius*electron_Compton_length*electron_Compton_length/pi),
+    MigdalConstant(classic_electr_radius*electron_Compton_length*electron_Compton_length*4.0*pi),
     LPMconstant(fine_structure_const*electron_mass_c2*electron_mass_c2/(4.*pi*hbarc)),
-    theLPMflag(true),
     isInitialised(false)
+{
 …
   theGamma = G4Gamma::Gamma();
   minThreshold = 1.0*keV;
-  highKinEnergy= 100.*TeV;
-  lowKinEnergy = 1.0*keV;
-  highEnergyTh = DBL_MAX;
+}
 …
   if(isInitialised) return;
   if(pParticleChange)
+  if(pParticleChange) {
     fParticleChange = reinterpret_cast<G4ParticleChangeForLoss*>(pParticleChange);
   else
+  } else {
     fParticleChange = new G4ParticleChangeForLoss();
+  }
   isInitialised = true;
+}
 …
     gammaEnergy = x*kineticEnergy;
     if (theLPMflag) {
+    if (LPMFlag()) {
      // take into account the supression due to the LPM effect
       if (G4UniformRand() <= SupressionFunction(material,kineticEnergy,
 …
   // stop tracking and create new secondary instead of primary
   if(gammaEnergy > highEnergyTh) {
+  if(gammaEnergy > SecondaryThreshold()) {
     fParticleChange->ProposeTrackStatus(fStopAndKill);
     fParticleChange->SetProposedKineticEnergy(0.0);
 …
   G4double supr = 1.0;
   if (theLPMflag) {
+  if (LPMFlag()) {
     G4double s2lpm = LPMEnergy*gammaEnergy/totEnergySquare;

trunk/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eCoulombScatteringModel.cc,v 1.40 2008/01/07 08:32:01 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eCoulombScatteringModel.cc,v 1.59 2008/10/22 18:39:29 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 19.08.06 V.Ivanchenko add inline function ScreeningParameter
 // 09.10.07 V.Ivanchenko reorganized methods, add cut dependence in scattering off e-
+// 09.06.08 V.Ivanchenko add SelectIsotope and sampling of the recoil ion
 //
 // Class Description:
 …
 #include "G4Positron.hh"
 #include "G4Proton.hh"
+#include "G4ParticleTable.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 using namespace std;
+G4eCoulombScatteringModel::G4eCoulombScatteringModel(
+  G4double thetaMin, G4double thetaMax, G4bool build,
+  G4double tlim, const G4String& nam)
+G4eCoulombScatteringModel::G4eCoulombScatteringModel(const G4String& nam)
   : G4VEmModel(nam),
+    cosThetaMin(cos(thetaMin)),
+    cosThetaMax(cos(thetaMax)),
+    q2Limit(tlim),
+    theCrossSectionTable(0),
+    lowKEnergy(keV),
+    highKEnergy(TeV),
+    cosThetaMin(1.0),
+    cosThetaMax(-1.0),
+    q2Limit(TeV*TeV),
     alpha2(fine_structure_const*fine_structure_const),
     faclim(100.0),
-    nbins(12),
-    nmax(100),
-    buildTable(build),
     isInitialised(false)
+{
   fNistManager = G4NistManager::Instance();
+  theParticleTable = G4ParticleTable::GetParticleTable();
   theElectron = G4Electron::Electron();
   thePositron = G4Positron::Positron();
   theProton   = G4Proton::Proton();
+  currentMaterial = 0;
+  currentElement  = 0;
   a0 = alpha2*electron_mass_c2*electron_mass_c2/(0.885*0.885);
   G4double p0 = electron_mass_c2*classic_electr_radius;
   coeff  = twopi*p0*p0;
   constn = 6.937e-6/(MeV*MeV);
   tkin = targetZ = targetA = mom2 = DBL_MIN;
+  tkin = targetZ = mom2 = DBL_MIN;
   elecXSection = nucXSection = 0.0;
+  recoilThreshold = DBL_MAX;
   ecut = DBL_MAX;
   particle = 0;
+  for(size_t j=0; j<100; j++) {index[j] = -1;}
+  currentCouple = 0;
+  for(size_t j=0; j<100; j++) {
+    FF[j] = 0.0;
+  }
+}
 …
 G4eCoulombScatteringModel::~G4eCoulombScatteringModel()
+{
+  if(theCrossSectionTable) {
+    theCrossSectionTable->clearAndDestroy();
+    delete theCrossSectionTable;
+  }
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4eCoulombScatteringModel::Initialise(const G4ParticleDefinition* p,
+                                           const G4DataVector&)
+{
+  //  G4cout << "!!! G4eCoulombScatteringModel::Initialise for "
+  // << p->GetParticleName() << "  cos(TetMin)= " << cosThetaMin
+  // << "  cos(TetMax)= " << cosThetaMax <<G4endl;
+                                           const G4DataVector& cuts)
+{
+  SetupParticle(p);
+  currentCouple = 0;
+  elecXSection = nucXSection = 0.0;
+  tkin = targetZ = mom2 = DBL_MIN;
+  ecut = etag = DBL_MAX;
+  cosThetaMin = cos(PolarAngleLimit());
+  currentCuts = &cuts;
+  //G4cout << "!!! G4eCoulombScatteringModel::Initialise for "
+  //     << p->GetParticleName() << "  cos(TetMin)= " << cosThetaMin
+  //     << "  cos(TetMax)= " << cosThetaMax <<G4endl;
   if(!isInitialised) {
     isInitialised = true;
 …
     else
       fParticleChange = new G4ParticleChangeForGamma();
+  } else {
+    return;
+  }
+  if(p->GetParticleType() == "nucleus") buildTable = false;
+  if(!buildTable) return;
+  // Compute log cross section table per atom
+  if(!theCrossSectionTable) theCrossSectionTable = new G4PhysicsTable();
+  nbins = 2*G4int(log10(highKEnergy/lowKEnergy));
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::ComputeCrossSectionPerAtom(
+                const G4ParticleDefinition* p,
+                G4double kinEnergy,
+                G4double Z, G4double A,
+                G4double cutEnergy, G4double)
+{
+  if(p == particle && kinEnergy == tkin && Z == targetZ &&
+     A == targetA && cutEnergy == ecut) return nucXSection;
+  //G4cout << "### G4eCoulombScatteringModel::ComputeCrossSectionPerAtom  for "
+  //     << p->GetParticleName() << " Z= " << Z << " A= " << A
+  //     << " e= " << kinEnergy << G4endl;
+  nucXSection = ComputeElectronXSectionPerAtom(p,kinEnergy,Z,A,cutEnergy);
+  // nuclear cross section
+  if(theCrossSectionTable) {
+    G4bool b;
+    G4int iz  = G4int(Z);
+    G4int idx = index[iz];
+    // compute table for given Z
+    if(-1 == idx) {
+      idx = theCrossSectionTable->size();
+      index[iz] = idx;
+      G4PhysicsLogVector* ptrVector
+        = new G4PhysicsLogVector(lowKEnergy, highKEnergy, nbins);
+      //  G4cout << "New vector Z= " << iz << " A= " << A << " idx= " << idx << G4endl;
+      G4double e, value;
+      for(G4int i=0; i<=nbins; i++) {
+        e     = ptrVector->GetLowEdgeEnergy( i ) ;
+        value = CalculateCrossSectionPerAtom(p, e, Z, A);
+        ptrVector->PutValue( i, log(value) );
+      }
+      theCrossSectionTable->push_back(ptrVector);
+    }
+      // take value from the table
+    nucXSection +=
+      std::exp((((*theCrossSectionTable)[idx]))->GetValue(kinEnergy, b));
+    // compute value from scratch
+  } else nucXSection += CalculateCrossSectionPerAtom(p, kinEnergy, Z, A);
+  //  G4cout << " cross(bn)= " << nucXSection/barn << G4endl;
+  if(nucXSection < 0.0) nucXSection = 0.0;
+  return nucXSection;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::ComputeElectronXSectionPerAtom(
+                const G4ParticleDefinition* p,
+                G4double kinEnergy,
+                G4double Z,
+                G4double A,
+                G4double cutEnergy)
+{
+  if(p == particle && kinEnergy == tkin && Z == targetZ &&
+     cutEnergy == ecut) return elecXSection;
+  }
+  if(mass < GeV && particle->GetParticleType() != "nucleus") {
+    InitialiseElementSelectors(p,cuts);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4eCoulombScatteringModel::ComputeMaxElectronScattering(G4double cutEnergy)
+{
   ecut = cutEnergy;
-  elecXSection = 0.0;
-  SetupParticle(p);
-  G4double ekin = std::max(keV, kinEnergy);
-  //G4double ekin = kinEnergy;
-  SetupTarget(Z, A, ekin);
   G4double tmax = tkin;
   if(p == theElectron) tmax *= 0.5;
   else if(p != thePositron) {
+  cosTetMaxElec = 1.0;
+  if(mass > MeV) {
     G4double ratio = electron_mass_c2/mass;
     G4double tau = tkin/mass;
     tmax = 2.0*electron_mass_c2*tau*(tau + 2.)/
       (1.0 + 2.0*ratio*(tau + 1.0) + ratio*ratio);
+  }
+  cosTetMaxElec = cosTetMaxNuc;
+  G4double t = std::min(cutEnergy, tmax);
+  G4double mom21 = t*(t + 2.0*electron_mass_c2);
+  G4double t1 = tkin - t;
+  if(t1 > 0.0) {
+    G4double mom22 = t1*(t1 + 2.0*mass);
+    G4double ctm = (mom2 + mom22 - mom21)*0.5/sqrt(mom2*mom22);
+    if(ctm > cosTetMaxElec && ctm <= 1.0) cosTetMaxElec = ctm;
+  }
+  if(cosTetMaxElec < cosThetaMin) {
+    G4double x1 = 1.0 - cosThetaMin  + screenZ;
+    G4double x2 = 1.0 - cosTetMaxElec + screenZ;
+    elecXSection = coeff*Z*chargeSquare*invbeta2*
+      (cosThetaMin - cosTetMaxElec)/(x1*x2*mom2);
+  }
+  //  G4cout << "cut= " << ecut << " e= " << tkin
+  // << " croosE(barn)= " << elecXSection/barn
+  // << " cosEl= " << cosTetMaxElec << " costmin= " << cosThetaMin << G4endl;
+  return elecXSection;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eCoulombScatteringModel::CalculateCrossSectionPerAtom(
+                             const G4ParticleDefinition* p,
+                             G4double kinEnergy,
+                             G4double Z, G4double A)
+{
+  G4double cross = 0.0;
+    cosTetMaxElec = 1.0 - std::min(cutEnergy, tmax)*electron_mass_c2/mom2;
+  } else {
+    if(particle == theElectron) tmax *= 0.5;
+    G4double t = std::min(cutEnergy, tmax);
+    G4double mom21 = t*(t + 2.0*electron_mass_c2);
+    G4double t1 = tkin - t;
+    //G4cout << "tkin= " << tkin << " t= " << t << " t1= " << t1 << G4endl;
+    if(t1 > 0.0) {
+      G4double mom22 = t1*(t1 + 2.0*mass);
+      G4double ctm = (mom2 + mom22 - mom21)*0.5/sqrt(mom2*mom22);
+      //G4cout << "ctm= " << ctm << G4endl;
+      if(ctm < 1.0) cosTetMaxElec = ctm;
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::ComputeCrossSectionPerAtom(
+                const G4ParticleDefinition* p,
+                G4double kinEnergy,
+                G4double Z, G4double,
+                G4double cutEnergy, G4double)
+{
+  //G4cout << "### G4eCoulombScatteringModel::ComputeCrossSectionPerAtom  for "
+  //  << p->GetParticleName()<<" Z= "<<Z<<" e(MeV)= "<< kinEnergy/MeV << G4endl;
+  G4double xsec = 0.0;
   SetupParticle(p);
+  G4double ekin = std::max(keV, kinEnergy);
+  //G4double ekin = kinEnergy;
+  SetupTarget(Z, A, ekin);
+  if(cosTetMaxNuc < cosThetaMin) {
+    G4double x1 = 1.0 - cosThetaMin;
+    G4double x2 = 1.0 - cosTetMaxNuc;
+    G4double x3 = cosThetaMin - cosTetMaxNuc;
+    G4double z1 = x1 + screenZ;
+    G4double z2 = x2 + screenZ;
+    G4double d  = 1.0/formfactA - screenZ;
+    G4double d1 = 1.0 - formfactA*screenZ;
+    G4double zn1= x1 + d;
+    G4double zn2= x2 + d;
+    cross = coeff*Z*Z*chargeSquare*invbeta2
+      *(x3/(z1*z2) + x3/(zn1*zn2) +
+.0*std::log(z1*zn2/(z2*zn1))/d) / (mom2*d1*d1);
+  }
+  G4double ekin = std::max(lowEnergyLimit, kinEnergy);
+  SetupKinematic(ekin, cutEnergy);
+  if(cosTetMaxNuc < cosTetMinNuc) {
+    SetupTarget(Z, ekin);
+    xsec = CrossSectionPerAtom();
+  }
+  /*
+  G4cout << "e(MeV)= " << ekin/MeV << "cosTetMinNuc= " << cosTetMinNuc
+         << " cosTetMaxNuc= " << cosTetMaxNuc
+         << " cosTetMaxElec= " << cosTetMaxElec
+         << " screenZ= " << screenZ
+         << " formfactA= " << formfactA
+         << " cosTetMaxHad= " << cosTetMaxHad << G4endl;
+  */
+  return xsec;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::CrossSectionPerAtom()
+{
+  // This method needs initialisation before be called
+  G4double fac = coeff*targetZ*chargeSquare*invbeta2/mom2;
+  elecXSection = 0.0;
+  nucXSection  = 0.0;
+  G4double x  = 1.0 - cosTetMinNuc;
+  G4double x1 = x + screenZ;
+  if(cosTetMaxElec2 < cosTetMinNuc) {
+    elecXSection = fac*(cosTetMinNuc - cosTetMaxElec2)/
+      (x1*(1.0 - cosTetMaxElec2 + screenZ));
+    nucXSection  = elecXSection;
+  }
+  //G4cout << "XS tkin(MeV)= " << tkin<<" xs= " <<nucXSection
+  //     << " costmax= " << cosTetMaxNuc2
+  //     << " costmin= " << cosTetMinNuc << "  Z= " << targetZ <<G4endl;
+  if(cosTetMaxNuc2 < cosTetMinNuc) {
+    G4double s  = screenZ*formfactA;
+    G4double z1 = 1.0 - cosTetMaxNuc2 + screenZ;
+    G4double d  = (1.0 - s)/formfactA;
+    //G4cout <<"x1= "<<x1<<" z1= " <<z1<<" s= "<<s << " d= " <<d <<G4endl;
+    if(d < 0.2*x1) {
+      G4double x2 = x1*x1;
+      G4double z2 = z1*z1;
+      x = (1.0/(x1*x2) - 1.0/(z1*z2) - d*1.5*(1.0/(x2*x2) - 1.0/(z2*z2)))/
+        (3.0*formfactA*formfactA);
+    } else {
+      G4double x2 = x1 + d;
+      G4double z2 = z1 + d;
+      x = (1.0 + 2.0*s)*((cosTetMinNuc - cosTetMaxNuc2)*(1.0/(x1*z1) + 1.0/(x2*z2)) -
+.0*log(z1*x2/(z2*x1))/d);
+    }
+    nucXSection += fac*targetZ*x;
+  }
+  //G4cout<<" cross(bn)= "<<nucXSection/barn<<" xsElec(bn)= "<<elecXSection/barn
+  //    << " Asc= " << screenZ << G4endl;
+  //  G4cout << "CalculateCrossSectionPerAtom: e(MeV)= " << tkin
+  // << " cross(b)= " << cross/barn << " ctmin= " << cosThetaMin
+  // << " ctmax= " << cosTetMaxNuc << G4endl;
+  return cross;
+  return nucXSection;
+}
 …
 void G4eCoulombScatteringModel::SampleSecondaries(
                 std::vector<G4DynamicParticle*>*,
+                std::vector<G4DynamicParticle*>* fvect,
                 const G4MaterialCutsCouple* couple,
                 const G4DynamicParticle* dp,
                 G4double cutEnergy,
+                G4double maxEnergy)
+{
+  const G4Material* aMaterial = couple->GetMaterial();
+  const G4ParticleDefinition* p = dp->GetDefinition();
+                G4double)
+{
   G4double kinEnergy = dp->GetKineticEnergy();
+  // Select atom and setup
+  SetupParticle(p);
+  const G4Element* elm =
+    SelectRandomAtom(aMaterial,p,kinEnergy,cutEnergy,maxEnergy);
+  G4double Z  = elm->GetZ();
+  G4double A  = elm->GetN();
+  G4double cross =
+    ComputeCrossSectionPerAtom(p,kinEnergy,Z,A,cutEnergy,maxEnergy);
+  G4double costm = cosTetMaxNuc;
+  if(kinEnergy <= DBL_MIN) return;
+  DefineMaterial(couple);
+  SetupParticle(dp->GetDefinition());
+  G4double ekin = std::max(lowEnergyLimit, kinEnergy);
+  SetupKinematic(ekin, cutEnergy);
+  //G4cout << "G4eCoulombScatteringModel::SampleSecondaries e(MeV)= "
+  //     << kinEnergy << "  " << particle->GetParticleName() << G4endl;
+  // Choose nucleus
+  currentElement = SelectRandomAtom(couple,particle,ekin,cutEnergy,ekin);
+  SetupTarget(currentElement->GetZ(),ekin);
+  G4double cost = SampleCosineTheta();
+  G4double z1   = 1.0 - cost;
+  if(z1 < 0.0) return;
+  G4double sint = sqrt(z1*(1.0 + cost));
+  //G4cout<<"## Sampled sint= " << sint << "  Z= " << targetZ
+  //    << "  screenZ= " << screenZ << " cn= " << formfactA << G4endl;
+  G4double phi  = twopi * G4UniformRand();
+  G4ThreeVector direction = dp->GetMomentumDirection();
+  G4ThreeVector newDirection(cos(phi)*sint,sin(phi)*sint,cost);
+  newDirection.rotateUz(direction);
+  fParticleChange->ProposeMomentumDirection(newDirection);
+  // recoil sampling assuming a small recoil
+  // and first order correction to primary 4-momentum
+  if(lowEnergyLimit < kinEnergy) {
+    G4int ia = SelectIsotopeNumber(currentElement);
+    G4double Trec = z1*mom2/(amu_c2*G4double(ia));
+    G4double th =
+      std::min(recoilThreshold,
+               targetZ*currentElement->GetIonisation()->GetMeanExcitationEnergy());
+    if(Trec > th) {
+      G4int iz = G4int(targetZ);
+      G4ParticleDefinition* ion = theParticleTable->FindIon(iz, ia, 0, iz);
+      Trec = z1*mom2/ion->GetPDGMass();
+      if(Trec < kinEnergy) {
+        G4ThreeVector dir = (direction - newDirection).unit();
+        G4DynamicParticle* newdp = new G4DynamicParticle(ion, dir, Trec);
+        fvect->push_back(newdp);
+        fParticleChange->SetProposedKineticEnergy(kinEnergy - Trec);
+      }
+    }
+  }
+  return;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4eCoulombScatteringModel::SampleCosineTheta()
+{
+  G4double costm = cosTetMaxNuc2;
   G4double formf = formfactA;
+  if(G4UniformRand()*cross < elecXSection) {
+    costm = cosTetMaxElec;
+  G4double prob  = 0.0;
+  G4double xs = CrossSectionPerAtom();
+  if(xs > 0.0) prob = elecXSection/xs;
+  // scattering off e or A?
+  if(G4UniformRand() < prob) {
+    costm = cosTetMaxElec2;
     formf = 0.0;
+  }
   /*
   G4cout << "G4eCoul...SampleSecondaries: e(MeV)= " << tkin
+  G4cout << "SampleCost: e(MeV)= " << tkin
          << " ctmin= " << cosThetaMin
          << " ctmaxN= " << cosTetMaxNuc
          << " ctmax= " << costm
+         << " Z= " << Z << " A= " << A
+         << " cross= " << cross/barn << " crossE= " << elecXSection/barn
+         << " Z= " << targetZ << " A= " << targetA
          << G4endl;
   */
   if(costm >= cosThetaMin) return;
   G4double x1 = 1. - cosThetaMin + screenZ;
   G4double x2 = 1. - costm;
   G4double x3 = cosThetaMin - costm;
   G4double grej,  z, z1;
+  if(costm >= cosTetMinNuc) return 2.0;
+  G4double x1 = 1. - cosTetMinNuc + screenZ;
+  G4double x2 = 1. - costm + screenZ;
+  G4double x3 = cosTetMinNuc - costm;
+  G4double grej, z1;
   do {
+    z  = G4UniformRand()*x3;
+    z1 = (x1*x2 - screenZ*z)/(x1 + z);
+    if(z1 < 0.0) z1 = 0.0;
+    else if(z1 > 2.0) z1 = 2.0;
+    z1 = x1*x2/(x1 + G4UniformRand()*x3) - screenZ;
     grej = 1.0/(1.0 + formf*z1);
   } while ( G4UniformRand() > grej*grej );
+  G4double cost = 1.0 - z1;
+  G4double sint= sqrt(z1*(2.0 - z1));
+  /*
+  if(sint > 0.1)
+    G4cout<<"## SampleSecondaries: e(MeV)= " << kinEnergy
+          << " sint= " << sint << "  Z= " << Z << "  screenZ= " << screenZ
+          << " cn= " << formf
+          << G4endl;
+  */
+  G4double phi  = twopi * G4UniformRand();
+  G4ThreeVector direction = dp->GetMomentumDirection();
+  G4ThreeVector newDirection(cos(phi)*sint,sin(phi)*sint,cost);
+  newDirection.rotateUz(direction);
+  fParticleChange->ProposeMomentumDirection(newDirection);
+  return;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+  //G4cout << "z= " << z1 << " cross= " << nucXSection/barn
+  // << " crossE= " << elecXSection/barn << G4endl;
+  return 1.0 - z1;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4eIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eIonisation.cc,v 1.53 2007/05/22 17:34:36 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eIonisation.cc,v 1.57 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
     isInitialised(false)
+{
+  SetStepFunction(0.2, 1*mm);
+  SetIntegral(true);
+  SetVerboseLevel(1);
+  //  SetStepFunction(0.2, 1*mm);
+  // SetIntegral(true);
+  // SetVerboseLevel(1);
+  SetProcessSubType(fIonisation);
+}
 …
 G4eIonisation::~G4eIonisation()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                         const G4Material*,
+                                         G4double cut)
+{
+  G4double x = cut;
+  if(isElectron) x += cut;
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4eIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Electron::Electron() || &p == G4Positron::Positron());
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     SetSecondaryParticle(theElectron);
     if (!EmModel()) SetEmModel(new G4MollerBhabhaModel());
     EmModel()->SetLowEnergyLimit (100*eV);
     EmModel()->SetHighEnergyLimit(100*TeV);
+    EmModel()->SetLowEnergyLimit (MinKinEnergy());
+    EmModel()->SetHighEnergyLimit(MaxKinEnergy());
     if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
 …
 void G4eIonisation::PrintInfo()
+{
+  if(EmModel())
+    G4cout << "      Delta cross sections and sampling from "
+           << EmModel()->GetName() << " model"
+           << "\n      Good description from 1 KeV to 100 GeV."
+           << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc

r819	r961
25	25	//
26	26	// $Id: G4eeToTwoGammaModel.cc,v 1.14 2007/05/23 08:47:35 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

trunk/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4eplusAnnihilation.cc,v 1.27 2007/10/02 10:17:12 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4eplusAnnihilation.cc,v 1.30 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   : G4VEmProcess(name), isInitialised(false)
+{
+  SetProcessSubType(fAnnihilation);
   enableAtRestDoIt = true;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4eplusAnnihilation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (&p == G4Positron::Positron());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4eplusAnnihilation::AtRestGetPhysicalInteractionLength(
+                              const G4Track&, G4ForceCondition* condition)
+{
+  *condition = NotForced;
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4eplusAnnihilation::InitialiseProcess(const G4ParticleDefinition*)
+{
 …
     SetStartFromNullFlag(false);
     SetSecondaryParticle(G4Gamma::Gamma());
+    G4double emin = 0.1*keV;
+    G4double emax = 100.*TeV;
+    SetLambdaBinning(120);
+    SetMinKinEnergy(emin);
+    SetMaxKinEnergy(emax);
+    if(!Model()) SetModel(new G4eeToTwoGammaModel);
+    Model()->SetLowEnergyLimit(emin);
+    Model()->SetHighEnergyLimit(emax);
+    if(!Model()) SetModel(new G4eeToTwoGammaModel());
+    Model()->SetLowEnergyLimit(MinKinEnergy());
+    Model()->SetHighEnergyLimit(MaxKinEnergy());
     AddEmModel(1, Model());
+  }
 …
 void G4eplusAnnihilation::PrintInfo()
+{
+  G4cout
+    << "      Sampling according " << Model()->GetName() << " model"
+    << G4endl;
+}
+{}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hIonisation.cc,v 1.70 2008/01/14 11:59:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hIonisation.cc,v 1.82 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //          positive from pi+ and p (VI)
 // 14-01-07 use SetEmModel() and SetFluctModel() from G4VEnergyLossProcess (mma)
+// 12-09-08 Removed CorrectionsAlongStep (VI)
 //
 // -------------------------------------------------------------------
 …
 #include "G4BraggModel.hh"
 #include "G4BetheBlochModel.hh"
+#include "G4IonFluctuations.hh"
 #include "G4UniversalFluctuation.hh"
 #include "G4BohrFluctuations.hh"
 …
 #include "G4PionPlus.hh"
 #include "G4PionMinus.hh"
+#include "G4LossTableManager.hh"
+#include "G4KaonPlus.hh"
+#include "G4KaonMinus.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4hIonisation::G4hIonisation(const G4String& name)
   : G4VEnergyLossProcess(name),
     theParticle(0),
     theBaseParticle(0),
+    isInitialised(false)
+{
   SetStepFunction(0.2, 1*mm);
   SetIntegral(true);
   SetVerboseLevel(1);
+    isInitialised(false),
+    nuclearStopping(true)
+{
+  //  SetStepFunction(0.2, 1.0*mm);
+  //SetIntegral(true);
+  //SetVerboseLevel(1);
+  SetProcessSubType(fIonisation);
   mass = 0.0;
   ratio = 0.0;
-  corr = G4LossTableManager::Instance()->EmCorrections();
-  nuclearStopping = true;
+}
 …
 G4hIonisation::~G4hIonisation()
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4hIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV &&
+         !p.IsShortLived());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4hIonisation::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                         const G4Material*,
+                                         G4double cut)
+{
+  G4double x = 0.5*cut/electron_mass_c2;
+  G4double g = x*ratio + std::sqrt((1. + x)*(1. + x*ratio*ratio));
+  return mass*(g - 1.0);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
                     const G4ParticleDefinition* bpart)
+{
+  if(isInitialised) return;
+  theParticle = part;
+  G4String pname = part->GetParticleName();
+  // standard base particles
+  if(part == bpart || pname == "proton" ||
+     pname == "anti_proton" || pname == "pi+" || pname == "pi-" )
+    theBaseParticle = 0;
+  // select base particle
+  else if(bpart == 0) {
+    if(pname == "kaon+")      theBaseParticle = G4PionPlus::PionPlus();
+    else if(pname == "kaon-") theBaseParticle = G4PionMinus::PionMinus();
+    else if(part->GetPDGCharge() > 0.0) theBaseParticle = G4Proton::Proton();
+    else theBaseParticle = G4AntiProton::AntiProton();
+  } else theBaseParticle = bpart;
+  SetBaseParticle(theBaseParticle);
+  SetSecondaryParticle(G4Electron::Electron());
+  mass  = theParticle->GetPDGMass();
+  ratio = electron_mass_c2/mass;
+  massratio = 1.0;
+  if(theBaseParticle) massratio = theBaseParticle->GetPDGMass()/mass;
+  if (!EmModel(1)) SetEmModel(new G4BraggModel(),1);
+  EmModel(1)->SetLowEnergyLimit(100*eV);
+  eth = 2.0*MeV*mass/proton_mass_c2;
+  ethnuc = eth*50.0;
+  EmModel(1)->SetHighEnergyLimit(eth);
+  if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
+  AddEmModel(1, EmModel(1), FluctModel());
+  if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+  EmModel(2)->SetLowEnergyLimit(eth);
+  EmModel(2)->SetHighEnergyLimit(100*TeV);
+  AddEmModel(2, EmModel(2), FluctModel());
+  isInitialised = true;
+  if(!isInitialised) {
+    const G4ParticleDefinition* theBaseParticle = 0;
+    G4String pname = part->GetParticleName();
+    // standard base particles
+    if(part == bpart || pname == "proton" ||
+       pname == "anti_proton" ||
+       pname == "pi+" || pname == "pi-" ||
+       pname == "kaon+" || pname == "kaon-")
+      {
+        theBaseParticle = 0;
+      }
+    // select base particle
+    else if(bpart == 0) {
+      if(part->GetPDGSpin() == 0.0)
+        if(part->GetPDGCharge() > 0.0 ) {
+          theBaseParticle = G4KaonPlus::KaonPlus();
+        } else {
+          theBaseParticle = G4KaonMinus::KaonMinus();
+        }
+      else if(part->GetPDGCharge() > 0.0) {
+        theBaseParticle = G4Proton::Proton();
+      } else {
+        theBaseParticle = G4AntiProton::AntiProton();
+      }
+      // base particle defined by interface
+    } else {
+      theBaseParticle = bpart;
+    }
+    SetBaseParticle(theBaseParticle);
+    SetSecondaryParticle(G4Electron::Electron());
+    mass  = part->GetPDGMass();
+    ratio = electron_mass_c2/mass;
+    if(mass < 900.*MeV) nuclearStopping = false;
+    if (!EmModel(1)) SetEmModel(new G4BraggModel(),1);
+    EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
+    // model limit defined for protons
+    eth = (EmModel(1)->HighEnergyLimit())*mass/proton_mass_c2;
+    EmModel(1)->SetHighEnergyLimit(eth);
+    AddEmModel(1, EmModel(1), new G4IonFluctuations());
+    if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
+    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+    EmModel(2)->SetLowEnergyLimit(eth);
+    EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
+    AddEmModel(2, EmModel(2), FluctModel());
+    isInitialised = true;
+  }
+  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
+  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
+}
 …
 void G4hIonisation::PrintInfo()
+{
+  if(EmModel(1) && EmModel(2))
+    G4cout << "      Scaling relation is used from proton dE/dx and range."
+           << "\n      Delta cross sections and sampling from "
+           << EmModel(2)->GetName() << " model for scaled energy > "
+           << eth/MeV << " MeV"
+           << "\n      Parametrisation from "
+           << EmModel(1)->GetName() << " for protons below."
+           << " NuclearStopping= " << nuclearStopping
+  if(EmModel(1) && EmModel(2)) {
+    G4cout << "      NuclearStopping= " << nuclearStopping
            << G4endl;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4hIonisation::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
-                                         const G4DynamicParticle* dp,
-                                         G4double& eloss,
-                                         G4double& s)
+{
-  G4double ekin = dp->GetKineticEnergy();
-  if(nuclearStopping && ekin < ethnuc) {
-    G4double nloss = s*corr->NuclearDEDX(theParticle,couple->GetMaterial(),
-                                         ekin - eloss*0.5);
-    eloss += nloss;
-    //  G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
-    //     << " de= " << eloss << " NIEL= " << nloss << G4endl;
-    fParticleChange.ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}

trunk/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4hMultipleScattering.cc,v 1.7 2007/12/07 17:35:52 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hMultipleScattering.cc,v 1.13 2008/10/15 17:53:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
 …
   : G4VMultipleScattering(processName)
+{
+  dtrl              = 0.05;
+  lambdalimit       = 1.*mm;
+  samplez           = false ;
+  isInitialized     = false;
+  SetLateralDisplasmentFlag(true);
+  SetSkin(0.0);
+  SetRangeFactor(0.2);
+  SetGeomFactor(0.1);
+  isInitialized = false;
+  isIon         = false;
   SetStepLimitType(fMinimal);
+}
 …
   // Modification of parameters between runs
   if(isInitialized) {
     if (p->GetParticleType() != "nucleus") {
+    if (p->GetParticleType() != "nucleus" && p->GetPDGMass() < GeV) {
       mscUrban->SetStepLimitType(StepLimitType());
       mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
 …
+  }
+  // defaults for ions, which cannot be overwritten
+  if (p->GetParticleType() == "nucleus" || p->GetPDGMass() > GeV) {
+    SetStepLimitType(fMinimal);
+    SetLateralDisplasmentFlag(false);
+    SetBuildLambdaTable(false);
+    if(p->GetParticleType() == "nucleus") isIon = true;
+  }
   // initialisation of parameters
   G4String part_name = p->GetParticleName();
   mscUrban = new G4UrbanMscModel90(RangeFactor(),dtrl,lambdalimit,
+                                 GeomFactor(),Skin(),
                                  samplez,StepLimitType());
+  mscUrban = new G4UrbanMscModel90();
+  mscUrban->SetStepLimitType(StepLimitType());
   mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
+  mscUrban->SetSkin(Skin());
+  mscUrban->SetRangeFactor(RangeFactor());
+  mscUrban->SetGeomFactor(GeomFactor());
-  if (p->GetParticleType() == "nucleus") {
-    mscUrban->SetStepLimitType(fMinimal);
-    SetLateralDisplasmentFlag(false);
-    SetBuildLambdaTable(false);
-    SetSkin(0.0);
-    SetRangeFactor(0.2);
+  }
   AddEmModel(1,mscUrban);
   isInitialized = true;
 …
 void G4hMultipleScattering::PrintInfo()
+{
+  G4cout << "      Boundary/stepping algorithm is active with RangeFactor= "
+         << RangeFactor()
+         << "  Step limit type " << StepLimitType()
+  G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << ", skin= " << Skin()
+    //   << ", geomFactor= " << GeomFactor()
          << G4endl;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4hMultipleScattering::AlongStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+                             G4double,
+                             G4double currentMinimalStep,
+                             G4double& currentSafety,
+                             G4GPILSelection* selection)
+{
+  // get Step limit proposed by the process
+  valueGPILSelectionMSC = NotCandidateForSelection;
+  G4double escaled = track.GetKineticEnergy();
+  if(isIon) escaled *= track.GetDynamicParticle()->GetMass()/proton_mass_c2;
+  G4double steplength = GetMscContinuousStepLimit(track,
+                                                  escaled,
+                                                  currentMinimalStep,
+                                                  currentSafety);
+  // G4cout << "StepLimit= " << steplength << G4endl;
+  // set return value for G4GPILSelection
+  *selection = valueGPILSelectionMSC;
+  return  steplength;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/processes/electromagnetic/standard/src/G4ionGasIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionGasIonisation.cc,v 1.4 2008/01/14 11:59:45 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionGasIonisation.cc,v 1.14 2008/09/12 16:26:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4ionGasIonisation::G4ionGasIonisation(const G4String& name)
+  : G4ionIonisation(name),
+    currParticle(0),
+    baseParticle(0),
+    initialised(false)
+  : G4ionIonisation(name)
+{
-  atomXS = CLHEP::pi*CLHEP::Bohr_radius*CLHEP::Bohr_radius;
-  verboseLevel = 1;
+}
 …
 {}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4ionGasIonisation::InitialiseEnergyLossProcess(
+                      const G4ParticleDefinition* part,
+                      const G4ParticleDefinition* bpart)
+{
+  G4ionIonisation::InitialiseEnergyLossProcess(part, bpart);
+  if(initialised) return;
+  currParticle = part;
+  if(part == bpart || part == G4GenericIon::GenericIon()) baseParticle = 0;
+  else if(bpart == 0) baseParticle = G4GenericIon::GenericIon();
+  else                baseParticle = bpart;
+  if(baseParticle) basePartMass = baseParticle->GetPDGMass();
+  else             basePartMass = currParticle->GetPDGMass();
+  initialised = true;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4ionGasIonisation::PrintInfo()
+{
+  G4ionIonisation::PrintInfo();
+  G4cout << "      Version of ion process with simulation discrete ion/media change exchange."
+         << G4endl;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4ionGasIonisation::InitialiseMassCharge(const G4Track& track)
+{
+  // First step of an ion
+  if(track.GetCurrentStepNumber() == 1) {
+    currParticle = track.GetDefinition();
+    ionZ = G4int(currParticle->GetPDGCharge()/eplus + 0.5);
+    currentIonZ = G4int(track.GetDynamicParticle()->GetCharge()/eplus + 0.5);
+    currMassRatio = basePartMass/currParticle->GetPDGMass();
+  }
+  // any step
+  G4double q = eplus*currentIonZ;
+  SetDynamicMassCharge(currMassRatio, q*q);
+  preStepKinEnergy = track.GetKineticEnergy();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4ionGasIonisation::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
+                                              const G4DynamicParticle* dp,
+                                              G4double& eloss,
+                                              G4double& s)
+{
+  const G4ParticleDefinition* part = dp->GetDefinition();
+  const G4Material* mat = couple->GetMaterial();
+  // add corrections
+  if(eloss < preStepKinEnergy) {
+    // use Bethe-Bloch with corrections
+    if(preStepKinEnergy*currMassRatio > BetheBlochEnergyThreshold())
+      eloss += s*corr->HighOrderCorrections(part,mat,preStepKinEnergy);
+    // effective number of collisions
+    G4double x = mat->GetElectronDensity()*s*atomXS;
+    // equilibrium charge
+    G4double q = fParticleChange.GetProposedCharge();
+    // sample charge change during the step
+    fParticleChange.SetProposedCharge(SampleChargeAfterStep(q, x));
+  }
+  // use nuclear stopping
+  if(NuclearStoppingFlag()) {
+    G4double nloss = s*corr->NuclearDEDX(part,mat,preStepKinEnergy - eloss*0.5);
+    eloss += nloss;
+    fParticleChange.ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
+/*
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   // xeff - effective number of collisions
   // q    - current charge
+  G4double q = eplus*currentIonZ;
+  G4double q = G4double(currentIonZ);
+  if(qeff > q) {
+    if(G4UniformRand() < qeff - q) currentIonZ++;
+  } else {
+    if(G4UniformRand() < q - qeff) currentIonZ--;
+  }
+  q = eplus*currentIonZ;
   if(verboseLevel > 1) G4cout << "G4ionGasIonisation: Q1= " << currentIonZ
                               << " Qeff= " << qeff/eplus << "  Neff= " << xeff
 …
   return q;
+}
+*/
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/standard/src/G4ionIonisation.cc

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionIonisation.cc,v 1.45.2.2 2008/04/25 00:34:55 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionIonisation.cc,v 1.66 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 16-05-07 Add data for light ion stopping only for GenericIon (V.Ivantchenko)
 // 07-11-07 Fill non-ionizing energy loss (V.Ivantchenko)
+// 12-09-08 Removed InitialiseMassCharge and CorrectionsAlongStep (VI)
 //
 //
 …
 #include "G4Electron.hh"
 #include "G4Proton.hh"
+//#include "G4Alpha.hh"
 #include "G4GenericIon.hh"
 #include "G4BraggModel.hh"
 #include "G4BraggIonModel.hh"
 #include "G4BetheBlochModel.hh"
-#include "G4IonFluctuations.hh"
 #include "G4UnitsTable.hh"
 #include "G4LossTableManager.hh"
 #include "G4WaterStopping.hh"
+#include "G4EmCorrections.hh"
+#include "G4IonFluctuations.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4ionIonisation::G4ionIonisation(const G4String& name)
   : G4VEnergyLossProcess(name),
+    corr(0),
     theParticle(0),
-    theBaseParticle(0),
     isInitialised(false),
     stopDataActive(true),
 …
   SetStepFunction(0.1, 0.1*mm);
   SetIntegral(true);
+  SetVerboseLevel(1);
+  SetProcessSubType(fIonisation);
+  //  SetVerboseLevel(1);
   corr = G4LossTableManager::Instance()->EmCorrections();
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4bool G4ionIonisation::IsApplicable(const G4ParticleDefinition& p)
+{
+  return (p.GetPDGCharge() != 0.0 && !p.IsShortLived() &&
+          p.GetParticleType() == "nucleus");
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4ionIonisation::MinPrimaryEnergy(const G4ParticleDefinition* p,
+                                           const G4Material*,
+                                           G4double cut)
+{
+  return
+    p->GetPDGMass()*(std::sqrt(1. + 0.5*cut/CLHEP::electron_mass_c2) - 1.0);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4ionIonisation::InitialiseEnergyLossProcess(
                       const G4ParticleDefinition* part,
                       const G4ParticleDefinition* bpart)
+{
   if(isInitialised) return;
+  const G4ParticleDefinition* ion = G4GenericIon::GenericIon();
   theParticle = part;
+  if(!isInitialised) {
+  if(part == bpart || part == G4GenericIon::GenericIon()) theBaseParticle = 0;
+  else if(bpart == 0) theBaseParticle = G4GenericIon::GenericIon();
+  else                theBaseParticle = bpart;
+    theParticle = part;
+    //G4String pname = part->GetParticleName();
   SetBaseParticle(theBaseParticle);
   SetSecondaryParticle(G4Electron::Electron());
+    // define base particle
+    const G4ParticleDefinition* theBaseParticle = 0;
+  if(theBaseParticle) baseMass = theBaseParticle->GetPDGMass();
+  else                baseMass = theParticle->GetPDGMass();
+  if (!EmModel(1)) SetEmModel(new G4BraggIonModel(),1);
+  EmModel(1)->SetLowEnergyLimit(100*eV);
+  eth = 2.0*MeV;
+  EmModel(1)->SetHighEnergyLimit(eth);
+  if (!FluctModel()) SetFluctModel(new G4IonFluctuations());
+  AddEmModel(1, EmModel(1), FluctModel());
+    if(part == ion)     theBaseParticle = 0;
+    else if(bpart == 0) theBaseParticle = ion;
+    else                theBaseParticle = bpart;
+  if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+  EmModel(2)->SetLowEnergyLimit(eth);
+  EmModel(2)->SetHighEnergyLimit(100*TeV);
+  AddEmModel(2, EmModel(2), FluctModel());
+    SetBaseParticle(theBaseParticle);
+    SetSecondaryParticle(G4Electron::Electron());
+  // Add ion stoping tables for Generic Ion
+  if(part == G4GenericIon::GenericIon()) {
+    G4WaterStopping  ws(corr);
+    effCharge = corr->GetIonEffectiveCharge(EmModel(1));
+  } else {
+    effCharge = corr->GetIonEffectiveCharge(0);
+    if (!EmModel(1)) SetEmModel(new G4BraggIonModel(), 1);
+    EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
+    // model limit defined for protons
+    eth = (EmModel(1)->HighEnergyLimit())*part->GetPDGMass()/proton_mass_c2;
+    EmModel(1)->SetHighEnergyLimit(eth);
+    if (!FluctModel()) SetFluctModel(new G4IonFluctuations());
+    AddEmModel(1, EmModel(1), FluctModel());
+    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);
+    EmModel(2)->SetLowEnergyLimit(eth);
+    EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
+    AddEmModel(2, EmModel(2), FluctModel());
+    // Add ion stoping tables for Generic Ion
+    if(part == ion) {
+      G4WaterStopping  ws(corr);
+      corr->SetIonisationModels(EmModel(1),EmModel(2));
+    }
+    isInitialised = true;
+  }
+  isInitialised = true;
+  // reinitialisation of corrections for the new run
+  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
+  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
+  if(part == ion) corr->InitialiseForNewRun();
+}
 …
 void G4ionIonisation::PrintInfo()
+{
+  if(EmModel(1) && EmModel(2))
+    G4cout << "      Scaling relation is used from proton dE/dx and range."
+           << "\n      Delta cross sections and sampling from "
+           << EmModel(2)->GetName() << " model for scaled energy > "
+           << eth/MeV << " MeV"
+           << "\n      Parametrisation from "
+           << EmModel(1)->GetName() << " for protons below."
+           << " NuclearStopping= " << nuclearStopping
+           << G4endl;
+  if (stopDataActive)
+    G4cout << "\n      Stopping Power data for "
+  if (stopDataActive && G4GenericIon::GenericIon() == theParticle) {
+    G4cout << "      Stopping Power data for "
            << corr->GetNumberOfStoppingVectors()
            << " ion/material pairs are used."
+           << " ion/material pairs, nuclearStopping: " << nuclearStopping
            << G4endl;
+  }
+}
 …
 void G4ionIonisation::AddStoppingData(G4int Z, G4int A,
                                       const G4String& mname,
                                       G4PhysicsVector& dVector)
+                                      G4PhysicsVector* dVector)
+{
   corr->AddStoppingData(Z, A, mname, dVector);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4ionIonisation::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
-                                           const G4DynamicParticle* dp,
-                                           G4double& eloss,
-                                           G4double& s)
+{
-  const G4ParticleDefinition* part = dp->GetDefinition();
-  const G4Material* mat = couple->GetMaterial();
-  if(eloss < preKinEnergy) {
-    //    G4cout << "e= " << preKinEnergy << " ratio= " << massRatio << " eth= " << eth<<  G4endl;
-    if(preKinEnergy*massRatio > eth)
-      eloss += s*corr->HighOrderCorrections(part,mat,preKinEnergy);
-    else {
-      if(stopDataActive)
-        eloss *= corr->EffectiveChargeCorrection(part,mat,preKinEnergy);
+    }
-    fParticleChange.SetProposedCharge(effCharge->EffectiveCharge(part,
-                                      mat,preKinEnergy-eloss));
+  }
-  if(nuclearStopping && preKinEnergy*massRatio < 50.*eth*charge2) {
-    G4double nloss = s*corr->NuclearDEDX(part,mat,preKinEnergy - eloss*0.5);
-    eloss += nloss;
-    //  G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
-    //     << " de= " << eloss << " NIEL= " << nloss << G4endl;
-    fParticleChange.ProposeNonIonizingEnergyDeposit(nloss);
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/source/processes/electromagnetic/utils/History

-              r819
+              r961
 $Id: History,v 1.308.2.1 2008/04/22 15:28:12 vnivanch Exp $
+$Id: History,v 1.372 2009/02/26 11:33:33 vnivanch Exp $
 -------------------------------------------------------------------
 …
      ----------------------------------------------------------
+April 08: V.Ivant (emutils-V09-00-14)
+- G4EmCorrections - set finite size correction to zero (provides
+                    flat distribution of vertex detector response
+                    for high energy hadrons)
+- G4ionEffectiveCharge - minor change of numerical constants to provide
+                         a continuous change of charge versus energy
+February 09: V.Ivant (emutils-V09-02-03)
+G4EmConfigurator - fixed for the case if only fluctuation model is set
+                   and main model is default
+February 09: V.Ivant (emutils-V09-02-02)
+- G4VEmModel - make methods to access geometry protected, added new
+               method SetSampleZ, added geommax private member
+- G4EmCalculator - added possibility to be used by DNA processes:
+                   take into account special DNA particles
+February 09: V.Ivant (emutils-V09-02-01)
+G4VEmModel, G4VEmFluctuationModel, G4VEnegryLossProcess, G4VEmProcess,
+G4VMultipleScattering - move all virtual methods to source, update comments
+G4VEmModel - added flagDeexcitation and Get/Set methods
+G4VEnegryLossProcess, G4VEmProcess - added calls to deexcitation PostStep
+G4EmProcessOptions - added ActivateDeexcitation method
+G4EnergyLossMessenger - added /process/em/deexcitation UI command
+G4LossTableBuilder - added protection in BuildRangeTable against zero dedx
+January 09: V.Ivant (emutils-V09-02-00)
+G4VEmModel - added method SampleDeexcitationAlongStep
+G4VEnegryLossProcess - added deexcitation AlongStep per region
+G4VMscModel - added methdos: InitialiseSafetyHelper, ComputeSafety,
+              ComputeGeomLimit, ComputeDisplacement
+G4VEmProcess - added possibility to set more than 1 model
+November 08: V.Ivant (emutils-V09-01-37)
+G4EmConfigurator - fixed energy interval selection for a model
+G4VMultipleScattering - set process sub-type 10 to distinguish with
+                        single Coulomb scattering
+Novemver 08: A.Schaelicke (emutils-V09-01-36)
+G4LossTableManager - changed default LPM effect to ON again
+G4VEmModel - (VI) add LPM flag and Get/Set methods
+November 08: V.Ivant (emutils-V09-01-35)
+G4VEmModel - fixed memory leak by destruction G4EmElementSelectors
+G4EmSaturation - activate saturation for energy deposition due to
+                 photo-electric effect
+October 08: V.Ivant (emutils-V09-01-34)
+G4EmProcessSubType - moved optical processes enumeration to optical directory
+October 08: V.Ivant (emutils-V09-01-33)
+G4EnergyLossMessenger - added /process/em/applyCuts command
+October 08: V.Ivant (emutils-V09-01-32)
+G4VEnergyLossProcess, G4VEmProcess, G4VMultipleScattering set number
+   of bins for tables 7 per decade
+October 08: V.Ivant (emutils-V09-01-31)
+G4VEnergyLossProcess, G4VEmProcess, G4VMultipleScattering improved cout
+October 08: V.Ivant (emutils-V09-01-30)
+G4VEmModel - add secondaryThreshold variable and Get/Set methods
+G4EmCorrections - define the range of correction vector 25 keV - 2.5 MeV,
+                  as it is in ICRU'73 table, use 20 bins
+G4LossTableManager - set spline option "true" and flagLPM "false" by default
+G4VEnergyLossProcess, G4VEmProcess, G4VMultipleScattering set default
+                  table size 0.1 keV - 100 TeV in 60 bins
+G4EmModelManager - included G4EmProcessSubType.hh header
+G4EmTableType.hh - changed enumeration names fIonisation -> fIsIonisation,
+                   fSubIonisation -> fIsSubIonisation to avoid clash with
+                   sub-type enumeration name
+September 08: V.Ivant (emutils-V09-01-29)
+G4EmCorrections - do not compute ion corrections if for ions
+                  G4hIonisation process is used
+September 08: V.Ivant (emutils-V09-01-28)
+G4ionEffectiveCharge - remove chargeFactor - return to 01-25
+G4VEnergyLossProcess - fixed initialisation;
+September 08: V.Ivant (emutils-V09-01-27)
+G4VEmProcess - improved verbose output
+G4VEnergyLossProcess - added pointer to current G4VEmModel;
+                       removed method CorrectionsAlongStep, instead
+                       corresponding method of a model are used;
+                       improved verbose output
+G4VEmFluctuationModel - added method SetParticleAndCharge
+G4VEmModel - minor optimisations of SelectRandomAtom and SelectIsotope;
+             added methods GetParticleCharge, GetChargeSquareRatio,
+             CorrectionsAlongStep, ActivateNuclearStopping needed for
+             simulation of ion transport
+G4EmCorrections - added interfaces to effective charge
+G4ionEffectiveCharge - added variable chargeFactor to be used for He ions
+August 08: V.Ivant (emutils-V09-01-26)
+G4VEmProcess, G4VMultipleScattering, G4VEnergyLossProcess - use
+                   new DumpModelList method from G4EmModelManager
+                   in the verbosity output
+G4EmModelManager - fixed crash in destructor when verbosity > 1;
+                   fixed selection of models per energy;
+                   update printout with DumpModelList method
+August 08: V.Ivant (emutils-V09-01-25)
+G4VEmModel - add parameter kinEnergy to SetupMaterial method;
+             set pointer currentElement in ComputeCrossSectionPerAtom
+G4EmElementSelector - update usage of methods SetupMaterial and
+             ComputeCrossSectionPerAtom
+August 08: V.Ivant (emutils-V09-01-24)
+G4EmCorrections - dEdx data for ions are initialised at the start of a run for
+                  materials used in geometry; search for ion/material pairs updated
+G4EmCalculator - improved cout
+July 08: V.Ivant (emutils-V09-01-23)
+G4VEmProcess, G4VMultipleScattering, G4VEnergyLossProcess - use verbosity flag
+    for GetEmModel method
+G4VEmModel - use stl vector for cross sections instead of array
+July 08: V.Ivant (emutils-V09-01-22)
+G4VEmModel - added vector of G4ElementSelectors, in which vectors
+             of relative cross sections per elements of a compound
+             material are stored; added new methods:
+             InitialisaElementSelectors and SelectRandomAtom,
+G4LossTableBuilder - remove dependence on G4LossTableManager
+G4LossTableManager - propagated spline flag to G4LossTableBuilder
+July 08: V.Ivant (emutils-V09-01-21)
+G4EmConfigurator - a new helper class to add model per particle type,
+                   process, energy range and G4Region
+G4VEmProcess, G4VEnergyLossProcess - renamed and improved method
+                   "MicroscopicCrossSection" by "CrossSectionPerVolume"
+G4VEmModel, G4VEmProcess, G4VMultipleScattering, G4VEnergyLossProcess
+                   reodering of members of classes and improved comments:
+                   - separated members fixed at construction, defined at
+                     ininitialisation, and modified in run time
+                   - improved comments in header files
+G4LossTableManager - added register/deregister mechanism and deletion
+                   at the end of job for G4VEmModel
+G4EmModelManager - does not delete models anymore
+July 08: V.Ivant (emutils-V09-01-20)
+G4ElectronIonPair - a new helper class to sample number of primary ionisations
+                    in detectors
+July 08: V.Ivant (emutils-V09-01-19)
+G4VEmModel - added inline method ComputeCrossSectionPerAtom
+G4LossTableManager and G4EnergyLossTable - remove call to exit()
+June 08: V.Ivant (emutils-V09-01-18)
+G4ionEffectiveCharge - return back Ziegler formula for effective charge of ions;
+                       min effective charge is 1.0 (instead of 0.1)
+G4EmCorrections - a minor change of the scale for external ion data
+June 08: V.Ivant (emutils-V09-01-17)
+G4ionEffectiveCharge - use simplified formula for effective charge of ions
+May 08: V.Ivant (emutils-V09-01-16)
+G4VEmModel - added virtual method SetupForMaterial
+G4EmElementSelector - helper class to sample random G4Element in a
+                      compound material
+May 08: V.Ivant (emutils-V09-01-15)
+G4VEnergyLossProcess - fixed problem of subcutoff option for ions (ion
+                       ranges were wrong)
+G4LossableBuilder - use more precise algorith to compute range for the
+                    case, when spline is used
+May 08: V.Ivant (emutils-V09-01-14)
+- G4EmCorrections - computation of the finite size correction is moved to
+                    the Bethe-Bloch model
+May 08: V.Ivant (emutils-V09-01-13)
+- G4VMultipleScattering - make AlongStepGetPhysicalInteractionLength
+  method virtual allowing to overwrite it by a derived class -
+  needed for ion simulation
+- G4EmCalculator - fixed bug in computation for ions
+April 08: V.Ivant (emutils-V09-01-12)
+- G4VEmModel, G4VEmProcess, G4VMultipleScattering, G4EnergyLossMessenger
+  G4EmProcessOptions - introduced polarAngleLimit parameter and Get/Set
+  methods for single and multiple scattering models
+- G4ionEffectiveCharge - fixed initialisation at first event
+- G4EmCorrections - review and fix computation of high order corrections
+                    for ions
+- G4EmCalculator - updated computations for ions
+April 08: V.Ivant (emutils-V09-01-11)
+- G4VEnergyLossProcess, G4VEmProcess, G4VMultipleScattering,
+  G4LossTableBuilder - introduced spline
+March 08: V.Ivant (emutils-V09-01-10)
+- G4EmCorrections - precompute EM formfactor for corrections
+- G4VEnergyLossProcess - store bremsstrahlung cross sections
+March 08: V.Ivant (emutils-V09-01-09)
+- G4EmCorrections - added cut dependence into finite size correction
+- G4VEnergyLossProcess - added cout of linLossLimit
+March 08: V.Ivant (emutils-V09-01-08)
+- G4EmSaturation - added interface with G4Step
+March 08: mma (emutils-V09-01-07)
+- modifs in G4EmSaturation
+March 08: V.Ivant (emutils-V09-01-06)
+- G4EmSaturation - added computation of the average recoil mass,
+                   use Birks coefficient from G4Material
+- G4LossTableManager - fixed logic in compute dedx table for an
+                       inactive process
+March 08: V.Ivant (emutils-V09-01-05)
+- G4LossTableManager, G4EmProcessOptions - added Set/Get spline flag
+- G4EnergyLossMessenger - added a command "/process/em/spline"
+- G4VMultipleScattering - SetSkin method does not change
+                          StepLimitType anymore
+- G4VMscModel - new class to define general msc parameters
+February 08: V.Ivant (emutils-V09-01-04)
+- G4EmSaturation - fixed initialisation problem
+February 08: V.Ivant (emutils-V09-01-03)
+- G4EmCorrections - added correction on effective charge for NIST
+  materials in the IonHighOrderCorrections method
+- G4EmSaturation - new helper class
+- G4LossTableManager - added GetEmSaturation method
+February 08: V.Ivant (emutils-V09-01-02)
+- G4EmCorrections - added IonBarkasCorrection, IonHighOrderCorrections
+  and ComputeIonCorrections methods in order to provide a smooth transition
+  between low-energy parameterization and Bethe-Bloch model
+- G4ionEffectiveCharge - use precomputed Z^1/3 values, use expantions
+  of exp and pow functions, do not perform recomputation if arguments
+  of methods unchanged
+February 08: V.Ivant (emutils-V09-01-01)
+- G4VEnergyLossProcess - fixed computation of NIEL at the last step
+  of a particle
 January 08: V.Ivant (emutils-V09-01-00)
 - G4EmCorrections - improve CPU by usage expansions and precalculated
 …
 November 07: V.Ivant (emutils-V09-00-13)
 - G4VMultipleScattering - set at initialisation that scattering may be
                           off electrons (needed for single scattering)
+                          off lectrons (needed for single scattering)
 - G4EmModelmanager - add pointers to G4Gamma and G4Positron at
                      initialisation
 …
 November 07: V.Ivant (emutils-V09-00-12)
 - G4VEnergyLossProcess - simplify logic to switch on/off fluctuations
 - G4EmProcessOptions - add forgotten initialisation of G4LossTableManager
+- G4EmProcessOptions - add forgoten initialisation of G4LossTableManager
                        parameters together with parameters of concrete
                        processes (fixed initialisation when options
                        defined before processes are instantiated)
+                       defined before proceeses are instantiated)
 October 07: V.Ivant (emutils-V09-00-11)
 …
 - G4VEnergyLossProcess and G4VEmProcess - fixed handling zero cross
   section in PostStepGetPhysicalInteractionLength method to avoid problem
   happens in FanoCavity example when cross section inside cavity is zero
+  happans in FanoCavity example when cross section inside cavity is zero
 - G4VEmModel - compare cross section with DBL_MIN instead of zero
 …
   void, extra parameter std::vector<G4DynamicParticle*>*, this vector
   is now a member of base class G4VEnergyLossProcess, G4VEmProcess,
   no new and delete of the vector in the run time. About 5% speedup
+  no new and delete of the vector in the run time. About 5% speadup
   of EM shower simulation
 - G4VEnergyLossProcess, G4VEmProcess, G4VMultipleScattering modified

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

r819	r961
25	25	//
26	26	// $Id: G4DummyModel.hh,v 1.3 2007/05/22 17:31:57 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

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

r819	r961
25	25	//
26	26	// $Id: G4EmCalculator.hh,v 1.18 2007/03/15 12:34:46 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	//

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmCorrections.hh,v 1.10 2008/01/11 19:55:29 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EmCorrections.hh,v 1.24 2008/09/12 14:44:48 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 28.04.2006 General cleanup, add finite size corrections (V.Ivanchenko)
 // 13.05.2006 Add corrections for ion stopping (V.Ivanhcenko)
+// 20.05.2008 Removed Finite Size correction (V.Ivanchenko)
+// 12.09.2008 Added inlined interfaces to effective charge (V.Ivanchenko)
 //
 // Class Description:
 …
 #include "G4Material.hh"
 #include "G4ParticleDefinition.hh"
+#include "G4NistManager.hh"
 class G4VEmModel;
 class G4PhysicsVector;
 class G4IonTable;
 class G4NistManager;
+class G4MaterialCutsCouple;
 class G4EmCorrections
 …
   virtual ~G4EmCorrections();
+  G4double HighOrderCorrections(const G4ParticleDefinition* p,
+                                const G4Material* material,
+                                      G4double kineticEnergy);
+  G4double Bethe(const G4ParticleDefinition* p,
+                 const G4Material* material,
+  G4double HighOrderCorrections(const G4ParticleDefinition*,
+                                const G4Material*,
+                                G4double kineticEnergy,
+                                G4double cutEnergy);
+  G4double IonHighOrderCorrections(const G4ParticleDefinition*,
+                                   const G4MaterialCutsCouple*,
+                                   G4double kineticEnergy);
+  G4double ComputeIonCorrections(const G4ParticleDefinition*,
+                                 const G4Material*,
+                                 G4double kineticEnergy);
+  G4double IonBarkasCorrection(const G4ParticleDefinition*,
+                               const G4Material*,
+                               G4double kineticEnergy);
+  G4double Bethe(const G4ParticleDefinition*,
+                 const G4Material*,
                  G4double kineticEnergy);
   G4double SpinCorrection(const G4ParticleDefinition* p,
                           const G4Material* material,
+  G4double SpinCorrection(const G4ParticleDefinition*,
+                          const G4Material*,
                           G4double kineticEnergy);
   G4double KShellCorrection(const G4ParticleDefinition* p,
                             const G4Material* material,
+  G4double KShellCorrection(const G4ParticleDefinition*,
+                            const G4Material*,
                             G4double kineticEnergy);
   G4double LShellCorrection(const G4ParticleDefinition* p,
                             const G4Material* material,
+  G4double LShellCorrection(const G4ParticleDefinition*,
+                            const G4Material*,
                             G4double kineticEnergy);
   G4double ShellCorrection(const G4ParticleDefinition* p,
                            const G4Material* material,
+  G4double ShellCorrection(const G4ParticleDefinition*,
+                           const G4Material*,
                            G4double kineticEnergy);
   G4double ShellCorrectionSTD(const G4ParticleDefinition* p,
                               const G4Material* material,
+  G4double ShellCorrectionSTD(const G4ParticleDefinition*,
+                              const G4Material*,
                               G4double kineticEnergy);
   G4double DensityCorrection(const G4ParticleDefinition* p,
                              const G4Material* material,
+  G4double DensityCorrection(const G4ParticleDefinition*,
+                             const G4Material*,
                              G4double kineticEnergy);
   G4double BarkasCorrection(const G4ParticleDefinition* p,
                             const G4Material* material,
+  G4double BarkasCorrection(const G4ParticleDefinition*,
+                            const G4Material*,
                             G4double kineticEnergy);
   G4double BlochCorrection(const G4ParticleDefinition* p,
                            const G4Material* material,
+  G4double BlochCorrection(const G4ParticleDefinition*,
+                           const G4Material*,
                            G4double kineticEnergy);
   G4double MottCorrection(const G4ParticleDefinition* p,
                           const G4Material* material,
+  G4double MottCorrection(const G4ParticleDefinition*,
+                          const G4Material*,
                           G4double kineticEnergy);
+  G4double FiniteSizeCorrection(const G4ParticleDefinition* p,
+                                const G4Material* material,
+                                G4double kineticEnergy);
+  G4double NuclearDEDX(const G4ParticleDefinition* p,
+                       const G4Material* material,
+  G4double NuclearDEDX(const G4ParticleDefinition*,
+                       const G4Material*,
                        G4double kineticEnergy,
                        G4bool fluct = true);
   void AddStoppingData(G4int Z, G4int A, const G4String& materialName,
+                       G4PhysicsVector& dVector);
+                       G4PhysicsVector* dVector);
+  void InitialiseForNewRun();
+  // effective charge correction using stopping power data
   G4double EffectiveChargeCorrection(const G4ParticleDefinition*,
                                      const G4Material*,
+                                     G4double);
+  G4ionEffectiveCharge* GetIonEffectiveCharge(G4VEmModel* m = 0);
+  G4int GetNumberOfStoppingVectors();
+                                     G4double kineticEnergy);
+  // effective charge of an ion
+  inline G4double GetParticleCharge(const G4ParticleDefinition*,
+                                    const G4Material*,
+                                    G4double kineticEnergy);
+  inline
+  G4double EffectiveChargeSquareRatio(const G4ParticleDefinition*,
+                                      const G4Material*,
+                                      G4double kineticEnergy);
+  // ionisation models for ions
+  inline void SetIonisationModels(G4VEmModel* m1 = 0, G4VEmModel* m2 = 0);
+  inline G4int GetNumberOfStoppingVectors();
 private:
 …
   void Initialise();
   G4PhysicsVector* InitialiseMaterial(const G4Material* mat);
   void SetupKinematics(const G4ParticleDefinition* p,
                        const G4Material* material,
+  void BuildCorrectionVector();
+  void SetupKinematics(const G4ParticleDefinition*,
+                       const G4Material*,
                        G4double kineticEnergy);
 …
   G4double     Z23[100];
+  std::vector<const G4Material*> currmat;
+  std::vector<G4double>          thcorr[100];
+  size_t        ncouples;
   const G4ParticleDefinition* particle;
   const G4ParticleDefinition* curParticle;
 …
   G4double  mass;
   G4double  massFactor;
+  G4double  formfact;
+  G4double  eth;
   G4double  tau;
   G4double  gamma;
 …
   G4double  ba2;
   G4double  tmax;
-  G4double  tmax0;
   G4double  charge;
   G4double  q2;
+  G4double  eCorrMin;
+  G4double  eCorrMax;
+  G4int     nbinCorr;
   G4AtomicShells        shells;
 …
   G4NistManager*        nist;
   const G4IonTable*     ionTable;
+  G4VEmModel*           ionModel;
+  G4VEmModel*           ionLEModel;
+  G4VEmModel*           ionHEModel;
   // Ion stopping data
   G4int                       nIons;
   G4int                       idx;
+  G4int                       currentZ;
   std::vector<G4int>          Zion;
   std::vector<G4int>          Aion;
   std::vector<G4String>       materialName;
+  std::vector<const G4ParticleDefinition*> ionList;
   std::vector<const G4Material*> materialList;
 …
                z21*((xv-x1)*(y2-yv)+(yv-y1)*(x2-xv))))
          / ((x2-x1)*(y2-y1));
+}
+inline
+void G4EmCorrections::SetIonisationModels(G4VEmModel* m1, G4VEmModel* m2)
+{
+  if(m1) ionLEModel = m1;
+  if(m2) ionHEModel = m2;
+}
+inline G4int G4EmCorrections::GetNumberOfStoppingVectors()
+{
+  return nIons;
+}
+inline G4double
+G4EmCorrections::GetParticleCharge(const G4ParticleDefinition* p,
+                                   const G4Material* mat,
+                                   G4double kineticEnergy)
+{
+  return effCharge.EffectiveCharge(p,mat,kineticEnergy);
+}
+inline G4double
+G4EmCorrections::EffectiveChargeSquareRatio(const G4ParticleDefinition* p,
+                                            const G4Material* mat,
+                                            G4double kineticEnergy)
+{
+  return effCharge.EffectiveChargeSquareRatio(p,mat,kineticEnergy);
+}
 …
     G4double ratio = electron_mass_c2/mass;
     tmax  = 2.0*electron_mass_c2*bg2 /(1. + 2.0*gamma*ratio + ratio*ratio);
-    tmax0 = tmax;
     charge  = p->GetPDGCharge()/eplus;
     if(charge < 1.5)  q2 = charge*charge;
+    if(charge < 1.5)  {q2 = charge*charge;}
     else {
       q2 = effCharge.EffectiveChargeSquareRatio(p,mat,kinEnergy);
       charge = std::sqrt(q2);
+    }
-    if(mass > 120.*MeV)
-      tmax = std::min(tmax,51200.*electron_mass_c2*std::pow(proton_mass_c2/mass,0.666667));
+  }
   if(mat != material) {

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmModelManager.hh,v 1.22 2007/11/09 11:35:54 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EmModelManager.hh,v 1.25 2008/10/13 14:56:56 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4DataVector.hh"
 #include "G4EmTableType.hh"
+#include "G4EmProcessSubType.hh"
+#include "G4Region.hh"
 class G4RegionModels
 …
 private:
+  G4RegionModels(G4int nMod, std::vector<G4int>& list, G4DataVector& lowE);
+  G4RegionModels(G4int nMod, std::vector<G4int>& indx,
+                 G4DataVector& lowE, const G4Region* reg);
   ~G4RegionModels();
 …
   };
+  G4double LowEdgeEnergy(G4int n) const {
+    return lowKineticEnergy[n];
+  };
+  const G4Region* Region() const {
+    return theRegion;
+  };
+  const G4Region*    theRegion;
   G4int              nModelsForRegion;
   G4int*             theListOfModelIndexes;
 …
   G4VEmModel* SelectModel(G4double& energy, size_t& index);
   G4VEmModel* GetModel(G4int);
+  G4VEmModel* GetModel(G4int, G4bool ver = false);
   G4int NumberOfModels() const;
 …
   void UpdateEmModel(const G4String&, G4double, G4double);
+  void DumpModelList(G4int verb);
 private:
 …
   std::vector<const G4Region*>            regions;
   std::vector<G4int>                      orderOfModels;
-  G4DataVector                            upperEkin;
   G4int                       nEmModels;

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

r819	r961
25	25	//
26	26	// $Id: G4EmMultiModel.hh,v 1.6 2007/05/22 17:31:57 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmProcessOptions.hh,v 1.12 2007/05/18 18:39:54 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EmProcessOptions.hh,v 1.15 2009/02/18 14:40:10 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
   void SetLinearLossLimit(G4double val);
+  void ActivateDeexcitation(G4bool val, const G4Region* r = 0);
+  void ActivateDeexcitation(const G4String& proc, G4bool val,
+                            const G4String& reg = "");
   void SetMscStepLimitation(G4MscStepLimitType val);
 …
   void SetLPMFlag(G4bool val);
+  void SetSplineFlag(G4bool val);
   void SetBremsstrahlungTh(G4double val);
+  void SetPolarAngleLimit(G4double val);
 private:

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

-              r819
+              r961
 //
 //
 // $Id: G4EmTableType.hh,v 1.3 2007/01/15 17:27:40 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EmTableType.hh,v 1.4 2008/10/13 14:56:56 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------
 …
   fRestricted,
   fSubRestricted,
   fIonisation,
   fSubIonisation
+  fIsIonisation,
+  fIsSubIonisation
 };
 #endif

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

-              r819
+              r961
 //
 //
 // $Id: G4EnergyLossMessenger.hh,v 1.18 2007/05/18 18:39:54 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EnergyLossMessenger.hh,v 1.23 2009/02/18 14:40:10 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 16-03-07 modify /process/eLoss/minsubsec command (V.Ivanchenko)
 // 18-05-07 add /process/msc directory and commands (V.Ivanchenko)
+// 11-03-08 add /process/em directory and commands (V.Ivanchenko)
 //
 // -------------------------------------------------------------------
 …
   G4UIdirectory*             eLossDirectory;
   G4UIdirectory*             mscDirectory;
+  G4UIdirectory*             emDirectory;
   G4UIcmdWithABool*          RndmStepCmd;
   G4UIcmdWithABool*          EnlossFlucCmd;
 …
   G4UIcmdWithADouble*        MinSubSecCmd;
   G4UIcommand*               StepFuncCmd;
+  G4UIcommand*               deexCmd;
   G4UIcmdWithAString*        mscCmd;
   G4UIcmdWithADoubleAndUnit* MinEnCmd;
 …
   G4UIcmdWithABool*          lpmCmd;
   G4UIcmdWithABool*          latCmd;
+  G4UIcmdWithABool*          splCmd;
+  G4UIcmdWithABool*          aplCmd;
   G4UIcmdWithAnInteger*      verCmd;
+  G4UIcmdWithAnInteger*      ver1Cmd;
   G4UIcmdWithAnInteger*      dedxCmd;
   G4UIcmdWithAnInteger*      lamCmd;
 …
   G4UIcmdWithADouble*        frCmd;
   G4UIcmdWithADouble*        fgCmd;
+  G4UIcmdWithADoubleAndUnit* angCmd;
 };

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

r819	r961
26	26	//
27	27	// $Id: G4EnergyLossTables.hh,v 1.19 2006/06/29 19:54:35 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// $Id:

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LossTableBuilder.hh,v 1.7 2006/06/29 19:54:37 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4LossTableBuilder.hh,v 1.8 2008/07/22 15:55:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 //
 // Modifications:
 // 08-11-04 Migration to new interface of Store/Retrieve tables (V.Ivantchenko)
 //
+// 08-11-04 Migration to new interface of Store/Retrieve tables (V.Ivanchenko)
+// 17-07-08 Added splineFlag (V.Ivanchenko)
 //
 // Class Description:
 …
 #include "globals.hh"
 #include "G4PhysicsTable.hh"
 class G4LossTableBuilder
 …
                               G4PhysicsTable* invRangeTable,
                               G4bool isIonisation = false);
+  inline void SetSplineFlag(G4bool flag);
 private:
 …
   G4LossTableBuilder(const  G4LossTableBuilder&);
+  G4bool splineFlag;
 };
+inline void G4LossTableBuilder::SetSplineFlag(G4bool flag)
+{
+  splineFlag = flag;
+}
 //....oooOO0OOooo.......oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LossTableManager.hh,v 1.48 2007/11/07 18:38:49 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4LossTableManager.hh,v 1.53 2008/07/15 16:56:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 #define G4LossTableManager_h 1
 #include <map>
 #include <vector>
 …
 class G4VEmProcess;
 class G4EmCorrections;
+class G4EmSaturation;
 class G4LossTableBuilder;
 …
   void DeRegister(G4VEmProcess* p);
+  void Register(G4VEmModel* p);
+  void DeRegister(G4VEmModel* p);
+  void Register(G4VEmFluctuationModel* p);
+  void DeRegister(G4VEmFluctuationModel* p);
   void EnergyLossProcessIsInitialised(const G4ParticleDefinition* aParticle,
 …
   void SetLPMFlag(G4bool val);
+  void SetSplineFlag(G4bool val);
   void SetLinearLossLimit(G4double val);
 …
   G4bool LPMFlag() const;
+  G4bool SplineFlag() const;
   G4double BremsstrahlungTh() const;
 …
   inline G4VEnergyLossProcess* GetEnergyLossProcess(const G4ParticleDefinition*);
+  inline G4EmCorrections* EmCorrections();
+  G4EmCorrections* EmCorrections();
+  G4EmSaturation* EmSaturation();
 private:
 …
   std::vector<G4VMultipleScattering*> msc_vector;
   std::vector<G4VEmProcess*> emp_vector;
+  std::vector<G4VEmModel*> mod_vector;
+  std::vector<G4VEmFluctuationModel*> fmod_vector;
   // cash
 …
   G4bool stepFunctionActive;
   G4bool flagLPM;
+  G4bool splineFlag;
   G4double minSubRange;
 …
   G4EnergyLossMessenger*      theMessenger;
   G4EmCorrections*            emCorrections;
+  G4EmSaturation*             emSaturation;
   const G4ParticleDefinition* firstParticle;
   G4int verbose;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4EmCorrections* G4LossTableManager::EmCorrections()
+{
-  return emCorrections;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #endif

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

r819	r961
26	26	//
27	27	// $Id: G4MscStepLimitType.hh,v 1.2 2007/06/11 14:56:51 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//---------------------------------------------------------------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmFluctuationModel.hh,v 1.10 2006/06/29 19:54:41 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4VEmFluctuationModel.hh,v 1.12 2009/02/19 11:25:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
   virtual void InitialiseMe(const G4ParticleDefinition*);
+  virtual void SetParticleAndCharge(const G4ParticleDefinition*, G4double q2);
   //------------------------------------------------------------------------
   // Generic methods common to all models
   //------------------------------------------------------------------------
   G4String GetName() const;
+  inline G4String GetName() const;
 private:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEmFluctuationModel::InitialiseMe(const G4ParticleDefinition*)
-{}
 inline G4String G4VEmFluctuationModel::GetName() const
+{

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmModel.hh,v 1.48 2007/10/29 08:38:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEmModel.hh,v 1.66 2009/02/19 09:57:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 29-06-06 Add member currentElement and Get/Set methods (V.Ivanchenko)
 // 29-10-07 Added SampleScattering (V.Ivanchenko)
+// 15-07-08 Reorder class members and improve comments (VI)
+// 21-07-08 Added vector of G4ElementSelector and methods to use it (VI)
+// 12-09-08 Added methods GetParticleCharge, GetChargeSquareRatio,
+//          CorrectionsAlongStep, ActivateNuclearStopping (VI)
+// 16-02-09 Move implementations of virtual methods to source (VI)
 //
 // Class Description:
 …
 #include "G4DataVector.hh"
 #include "G4VEmFluctuationModel.hh"
+#include "G4EmElementSelector.hh"
 #include "Randomize.hh"
+#include <vector>
 class G4PhysicsTable;
 …
   //------------------------------------------------------------------------
   // Virtual methods to be implemented for the concrete model
   //------------------------------------------------------------------------
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&) = 0;
+  // Virtual methods to be implemented for any concrete model
+  //------------------------------------------------------------------------
+  virtual void Initialise(const G4ParticleDefinition*,
+                          const G4DataVector&) = 0;
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
 …
   //------------------------------------------------------------------------
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                        const G4MaterialCutsCouple*);
+  virtual G4double ComputeDEDX(const G4MaterialCutsCouple*,
+                               const G4ParticleDefinition*,
+                               G4double kineticEnergy,
+                               G4double cutEnergy = DBL_MAX);
+  virtual G4double CrossSection(const G4MaterialCutsCouple*,
+                                const G4ParticleDefinition*,
+                                G4double kineticEnergy,
+                                G4double cutEnergy = 0.0,
+                                G4double maxEnergy = DBL_MAX);
+  // main method to compute dEdx
   virtual G4double ComputeDEDXPerVolume(const G4Material*,
                                         const G4ParticleDefinition*,
 …
                                         G4double cutEnergy = DBL_MAX);
+  virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                              G4double kinEnergy,
+                                              G4double Z,
+                                              G4double A = 0.,
+                                              G4double cutEnergy = 0.0,
+                                              G4double maxEnergy = DBL_MAX);
+  virtual G4double ComputeMeanFreePath(const G4ParticleDefinition*,
+                                       G4double kineticEnergy,
+                                       const G4Material*,
+                                       G4double cutEnergy = 0.0,
+                                       G4double maxEnergy = DBL_MAX);
+  // main method to compute cross section per Volume
   virtual G4double CrossSectionPerVolume(const G4Material*,
                                          const G4ParticleDefinition*,
 …
                                          G4double maxEnergy = DBL_MAX);
+  // main method to compute cross section depending on atom
+  virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                              G4double kinEnergy,
+                                              G4double Z,
+                                              G4double A = 0., /* amu */
+                                              G4double cutEnergy = 0.0,
+                                              G4double maxEnergy = DBL_MAX);
+  // min cut in kinetic energy allowed by the model
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
+  // Compute effective ion charge square
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
+                                        const G4Material*,
+                                        G4double kineticEnergy);
+  // Compute ion charge
+  virtual G4double GetParticleCharge(const G4ParticleDefinition*,
+                                     const G4Material*,
+                                     G4double kineticEnergy);
+  // add correction to energy loss and ompute non-ionizing energy loss
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
+  // sample PIXE deexcitation
+  virtual void SampleDeexcitationAlongStep(const G4Material*,
+                                           const G4Track&,
+                                           G4double& eloss);
 protected:
+  // kinematically allowed max kinetic energy of a secondary
   virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
                                       G4double kineticEnergy);
 …
   virtual void DefineForRegion(const G4Region*);
+  virtual void SetupForMaterial(const G4ParticleDefinition*,
+                                const G4Material*,
+                                G4double kineticEnergy);
   //------------------------------------------------------------------------
   // Generic methods common to all models
   //------------------------------------------------------------------------
+  void SetParticleChange(G4VParticleChange*, G4VEmFluctuationModel*);
+  G4VEmFluctuationModel* GetModelOfFluctuations();
+  G4double HighEnergyLimit();
+  G4double LowEnergyLimit();
+  void SetHighEnergyLimit(G4double);
+  void SetLowEnergyLimit(G4double);
+  G4double MaxSecondaryKinEnergy(const G4DynamicParticle* dynParticle);
+  const G4Element* SelectRandomAtom(const G4Material*,
+                                    const G4ParticleDefinition*,
+                                    G4double kineticEnergy,
+                                    G4double cutEnergy = 0.0,
+                                    G4double maxEnergy = DBL_MAX);
+  const G4String& GetName() const;
+  // should be called at initialisation to build element selectors
+  void InitialiseElementSelectors(const G4ParticleDefinition*,
+                                  const G4DataVector&);
+  // dEdx per unit length
+  inline G4double ComputeDEDX(const G4MaterialCutsCouple*,
+                              const G4ParticleDefinition*,
+                              G4double kineticEnergy,
+                              G4double cutEnergy = DBL_MAX);
+  // cross section per volume
+  inline G4double CrossSection(const G4MaterialCutsCouple*,
+                                const G4ParticleDefinition*,
+                                G4double kineticEnergy,
+                                G4double cutEnergy = 0.0,
+                                G4double maxEnergy = DBL_MAX);
+  // compute mean free path via cross section per volume
+  inline G4double ComputeMeanFreePath(const G4ParticleDefinition*,
+                                      G4double kineticEnergy,
+                                      const G4Material*,
+                                      G4double cutEnergy = 0.0,
+                                      G4double maxEnergy = DBL_MAX);
+  // generic cross section per element
+  inline G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                             const G4Element*,
+                                             G4double kinEnergy,
+                                             G4double cutEnergy = 0.0,
+                                             G4double maxEnergy = DBL_MAX);
+  // atom can be selected effitiantly if element selectors are initialised
+  inline const G4Element* SelectRandomAtom(const G4MaterialCutsCouple*,
+                                           const G4ParticleDefinition*,
+                                           G4double kineticEnergy,
+                                           G4double cutEnergy = 0.0,
+                                           G4double maxEnergy = DBL_MAX);
+  // to select atom cross section per volume is recomputed for each element
+  inline const G4Element* SelectRandomAtom(const G4Material*,
+                                           const G4ParticleDefinition*,
+                                           G4double kineticEnergy,
+                                           G4double cutEnergy = 0.0,
+                                           G4double maxEnergy = DBL_MAX);
+  // select isotope in order to have precise mass of the nucleus
+  inline G4int SelectIsotopeNumber(const G4Element*);
+  //------------------------------------------------------------------------
+  // Get/Set methods
+  //------------------------------------------------------------------------
+  inline G4VEmFluctuationModel* GetModelOfFluctuations();
+  inline G4double HighEnergyLimit() const;
+  inline G4double LowEnergyLimit() const;
+  inline G4double PolarAngleLimit() const;
+  inline G4double SecondaryThreshold() const;
+  inline G4bool LPMFlag() const;
+  inline G4bool DeexcitationFlag() const;
+  inline void SetHighEnergyLimit(G4double);
+  inline void SetLowEnergyLimit(G4double);
+  inline void SetPolarAngleLimit(G4double);
+  inline void SetSecondaryThreshold(G4double);
+  inline void SetLPMFlag(G4bool val);
+  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*);
 protected:
+  const G4Element* GetCurrentElement() const;
+  void SetCurrentElement(const G4Element*);
+  inline const G4MaterialCutsCouple* CurrentCouple() const;
+  inline void SetCurrentElement(const G4Element*);
+  inline const G4Element* GetCurrentElement() const;
 private:
 …
   G4VEmModel(const  G4VEmModel&);
+  // ======== Parameters of the class fixed at construction =========
+  G4VEmFluctuationModel* fluc;
+  const G4String   name;
+  // ======== Parameters of the class fixed at initialisation =======
   G4double        lowLimit;
   G4double        highLimit;
   G4double        xsec[40];
   G4VEmFluctuationModel* fluc;
   const G4String   name;
   const G4Element* currentElement;
+  G4double        polarAngleLimit;
+  G4double        secondaryThreshold;
+  G4bool          theLPMflag;
+  G4int           nSelectors;
+  std::vector<G4EmElementSelector*> elmSelectors;
 protected:
   G4VParticleChange*  pParticleChange;
+  G4bool              nuclearStopping;
+  // ======== Cashed values - may be state dependent ================
+private:
+  const G4MaterialCutsCouple* currentCouple;
+  const G4Element*            currentElement;
+  G4int                  nsec;
+  G4bool                 flagDeexcitation;
+  std::vector<G4double>  xsec;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::HighEnergyLimit()
+{
-  return highLimit;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::LowEnergyLimit()
+{
-  return lowLimit;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4VEmModel::SetHighEnergyLimit(G4double val)
+{
-  highLimit = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4VEmModel::SetLowEnergyLimit(G4double val)
+{
-  lowLimit = val;
+}
-//....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......
-inline G4VEmFluctuationModel* G4VEmModel::GetModelOfFluctuations()
+{
-  return fluc;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::MinEnergyCut(const G4ParticleDefinition*,
-                                         const G4MaterialCutsCouple*)
+{
-  return 0.0;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::ComputeDEDXPerVolume(
-                                        const G4Material*,
-                                        const G4ParticleDefinition*,
-                                        G4double,
-                                        G4double)
+{
-  return 0.0;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
                                         G4double cutEnergy)
+{
+  currentCouple = c;
   return ComputeDEDXPerVolume(c->GetMaterial(),p,kinEnergy,cutEnergy);
+}
 …
                                          G4double maxEnergy)
+{
+  return
+    CrossSectionPerVolume(c->GetMaterial(),p,kinEnergy,cutEnergy,maxEnergy);
+  currentCouple = c;
+  return CrossSectionPerVolume(c->GetMaterial(),p,kinEnergy,cutEnergy,maxEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4VEmModel::ComputeMeanFreePath(const G4ParticleDefinition* p,
+                                                G4double ekin,
+                                                const G4Material* material,
+                                                G4double emin,
+                                                G4double emax)
+{
+  G4double mfp = DBL_MAX;
+  G4double cross = CrossSectionPerVolume(material,p,ekin,emin,emax);
+  if (cross > DBL_MIN) mfp = 1./cross;
+  return mfp;
+}
 …
 inline G4double G4VEmModel::ComputeCrossSectionPerAtom(
+                                         const G4ParticleDefinition*,
+                                         G4double, G4double, G4double,
+                                         G4double, G4double)
+{
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline const G4Element* G4VEmModel::SelectRandomAtom(
+                                         const G4Material* material,
+                                         const G4ParticleDefinition* pd,
+                                         G4double kinEnergy,
+                                         G4double tcut,
+                                         G4double tmax)
+                const G4ParticleDefinition* part,
+                const G4Element* elm,
+                G4double kinEnergy,
+                G4double cutEnergy,
+                G4double maxEnergy)
+{
+  currentElement = elm;
+  return ComputeCrossSectionPerAtom(part,kinEnergy,elm->GetZ(),elm->GetN(),
+                                    cutEnergy,maxEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline
+const G4Element* G4VEmModel::SelectRandomAtom(const G4MaterialCutsCouple* couple,
+                                              const G4ParticleDefinition* p,
+                                              G4double kinEnergy,
+                                              G4double cutEnergy,
+                                              G4double maxEnergy)
+{
+  currentCouple = couple;
+  if(nSelectors > 0) {
+    currentElement =
+      elmSelectors[couple->GetIndex()]->SelectRandomAtom(kinEnergy);
+  } else {
+    currentElement = SelectRandomAtom(couple->GetMaterial(),p,kinEnergy,
+                                      cutEnergy,maxEnergy);
+  }
+  return currentElement;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline
+const G4Element* G4VEmModel::SelectRandomAtom(const G4Material* material,
+                                              const G4ParticleDefinition* pd,
+                                              G4double kinEnergy,
+                                              G4double tcut,
+                                              G4double tmax)
+{
   const G4ElementVector* theElementVector = material->GetElementVector();
   G4int nelm = material->GetNumberOfElements();
   currentElement = (*theElementVector)[nelm-1];
   if (nelm > 1) {
+  G4int n = material->GetNumberOfElements() - 1;
+  currentElement = (*theElementVector)[n];
+  if (n > 0) {
     G4double x = G4UniformRand()*
                  CrossSectionPerVolume(material,pd,kinEnergy,tcut,tmax);
     for(G4int i=0; i<nelm; i++) {
+                 G4VEmModel::CrossSectionPerVolume(material,pd,kinEnergy,tcut,tmax);
+    for(G4int i=0; i<n; i++) {
       if (x <= xsec[i]) {
         currentElement = (*theElementVector)[i];
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4int G4VEmModel::SelectIsotopeNumber(const G4Element* elm)
+{
+  G4int N = G4int(elm->GetN() + 0.5);
+  G4int ni = elm->GetNumberOfIsotopes();
+  if(ni > 0) {
+    G4int idx = 0;
+    if(ni > 1) {
+      G4double* ab = currentElement->GetRelativeAbundanceVector();
+      G4double x = G4UniformRand();
+      for(; idx<ni; idx++) {
+        x -= ab[idx];
+        if (x <= 0.0) break;
+      }
+      if(idx >= ni) idx = ni - 1;
+    }
+    N = elm->GetIsotope(idx)->GetN();
+  }
+  return N;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4VEmFluctuationModel* G4VEmModel::GetModelOfFluctuations()
+{
+  return fluc;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4VEmModel::HighEnergyLimit() const
+{
+  return highLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4VEmModel::LowEnergyLimit() const
+{
+  return lowLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4VEmModel::PolarAngleLimit() const
+{
+  return polarAngleLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline G4double G4VEmModel::SecondaryThreshold() const
+{
+  return secondaryThreshold;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEmModel::LPMFlag() const
+{
+  return theLPMflag;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEmModel::DeexcitationFlag() const
+{
+  return flagDeexcitation;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4VEmModel::SetHighEnergyLimit(G4double val)
+{
+  highLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4VEmModel::SetLowEnergyLimit(G4double val)
+{
+  lowLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4VEmModel::SetPolarAngleLimit(G4double val)
+{
+  polarAngleLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4VEmModel::SetSecondaryThreshold(G4double val)
+{
+  secondaryThreshold = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmModel::SetLPMFlag(G4bool val)
+{
+  theLPMflag = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmModel::SetDeexcitationFlag(G4bool val)
+{
+  flagDeexcitation = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmModel::ActivateNuclearStopping(G4bool val)
+{
+  nuclearStopping = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline
+G4double G4VEmModel::MaxSecondaryKinEnergy(const G4DynamicParticle* dynPart)
+{
+  return MaxSecondaryEnergy(dynPart->GetDefinition(),
+                            dynPart->GetKineticEnergy());
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline const G4String& G4VEmModel::GetName() const
+{
+  return name;
+}
+//....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......
+inline void G4VEmModel::SetCurrentCouple(const G4MaterialCutsCouple* p)
+{
+  currentCouple = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline const G4MaterialCutsCouple* G4VEmModel::CurrentCouple() const
+{
+  return currentCouple;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+inline void G4VEmModel::SetCurrentElement(const G4Element* elm)
+{
+  currentElement = elm;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 inline const G4Element* G4VEmModel::GetCurrentElement() const
+{
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4VEmModel::SetCurrentElement(const G4Element* elm)
+{
-  currentElement = elm;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::MaxSecondaryKinEnergy(
-                                          const G4DynamicParticle* dynParticle)
+{
-  return MaxSecondaryEnergy(dynParticle->GetDefinition(),
-                            dynParticle->GetKineticEnergy());
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                               G4double kineticEnergy)
+{
-  return kineticEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline const G4String& G4VEmModel::GetName() const
+{
-  return name;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-// Methods for msc simulation
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4VEmModel::SampleScattering(const G4DynamicParticle*, G4double)
-{}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::ComputeTruePathLengthLimit(
-                                const G4Track&,
-                                G4PhysicsTable*,
-                                G4double)
+{
-  return DBL_MAX;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::ComputeGeomPathLength(G4double truePathLength)
+{
-  return truePathLength;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline G4double G4VEmModel::ComputeTrueStepLength(G4double geomPathLength)
+{
-  return geomPathLength;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-inline void G4VEmModel::DefineForRegion(const G4Region*)
-{}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmProcess.hh,v 1.43 2007/10/29 08:38:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEmProcess.hh,v 1.50 2009/02/19 09:57:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //          PostStepGetPhysicalInteractionLength (V.Ivanchenko)
 // 27-10-07 Virtual functions moved to source (V.Ivanchenko)
+// 15-07-08 Reorder class members for further multi-thread development (VI)
 //
 // Class Description:
 …
   G4VEmProcess(const G4String& name,
                      G4ProcessType type = fElectromagnetic);
+               G4ProcessType type = fElectromagnetic);
   virtual ~G4VEmProcess();
 …
   //------------------------------------------------------------------------
+  // Methods with standard implementation; may be overwritten if needed
+  //------------------------------------------------------------------------
+  inline G4double RecalculateLambda(G4double kinEnergy,
+                                    const G4MaterialCutsCouple* couple);
+  //------------------------------------------------------------------------
+  // Generic methods common to all Discrete processes
+  // Implementation of virtual methods common to all Discrete processes
   //------------------------------------------------------------------------
 public:
+  // Initialise for build of tables
+  void PreparePhysicsTable(const G4ParticleDefinition&);
+  // Build physics table during initialisation
+  void BuildPhysicsTable(const G4ParticleDefinition&);
   void PrintInfoDefinition();
+  G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
+  void PreparePhysicsTable(const G4ParticleDefinition&);
+  // Initialise for build of tables
+  void BuildPhysicsTable(const G4ParticleDefinition&);
+  // Build physics table during initialisation
+  G4bool StorePhysicsTable(const G4ParticleDefinition*,
+                           const G4String& directory,
+                           G4bool ascii = false);
+  // Store PhysicsTable in a file.
+  // Return false in case of failure at I/O
+  G4bool RetrievePhysicsTable(const G4ParticleDefinition*,
+                              const G4String& directory,
+                              G4bool ascii);
+    // Retrieve Physics from a file.
+    // (return true if the Physics Table can be build by using file)
+    // (return false if the process has no functionality or in case of failure)
+    // File name should is constructed as processName+particleName and the
+    // should be placed under the directory specifed by the argument.
+  //------------------------------------------------------------------------
+  // Specific methods for Discrete EM post step simulation
+  //------------------------------------------------------------------------
+  inline G4double MicroscopicCrossSection(G4double kineticEnergy,
+                                          const G4MaterialCutsCouple* couple);
+  // It returns the cross section of the process for energy/ material
+  inline G4double ComputeCrossSectionPerAtom(G4double kineticEnergy,
+                                             G4double Z, G4double A=0.,
+                                             G4double cut=0.0);
+  // It returns the cross section of the process per atom
+  inline G4double MeanFreePath(const G4Track& track);
+  virtual G4double PostStepGetPhysicalInteractionLength(
+  // implementation of virtual method, specific for G4VEmProcess
+  G4double PostStepGetPhysicalInteractionLength(
                              const G4Track& track,
                              G4double   previousStepSize,
 …
                             );
+  // implementation of virtual method, specific for G4VEmProcess
+  G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
+  // Store PhysicsTable in a file.
+  // Return false in case of failure at I/O
+  G4bool StorePhysicsTable(const G4ParticleDefinition*,
+                           const G4String& directory,
+                           G4bool ascii = false);
+  // Retrieve Physics from a file.
+  // (return true if the Physics Table can be build by using file)
+  // (return false if the process has no functionality or in case of failure)
+  // File name should is constructed as processName+particleName and the
+  // should be placed under the directory specifed by the argument.
+  G4bool RetrievePhysicsTable(const G4ParticleDefinition*,
+                              const G4String& directory,
+                              G4bool ascii);
+  // deexcitation activated per G4Region
+  void ActivateDeexcitation(G4bool, const G4Region* r = 0);
+  //------------------------------------------------------------------------
+  // Specific methods for Discrete EM post step simulation
+  //------------------------------------------------------------------------
+  // It returns the cross section per volume for energy/ material
+  G4double CrossSectionPerVolume(G4double kineticEnergy,
+                                 const G4MaterialCutsCouple* couple);
+  // It returns the cross section of the process per atom
+  inline G4double ComputeCrossSectionPerAtom(G4double kineticEnergy,
+                                             G4double Z, G4double A=0.,
+                                             G4double cut=0.0);
+  inline G4double MeanFreePath(const G4Track& track);
+  // It returns cross section per volume
+  inline G4double GetLambda(G4double& kinEnergy,
+                            const G4MaterialCutsCouple* couple);
+  //------------------------------------------------------------------------
+  // Specific methods to build and access Physics Tables
+  //------------------------------------------------------------------------
+  // Binning for lambda table
+  inline void SetLambdaBinning(G4int nbins);
+  inline G4int LambdaBinning() const;
+  // Min kinetic energy for tables
+  inline void SetMinKinEnergy(G4double e);
+  inline G4double MinKinEnergy() const;
+  // Max kinetic energy for tables
+  inline void SetMaxKinEnergy(G4double e);
+  inline G4double MaxKinEnergy() const;
+  inline void SetPolarAngleLimit(G4double a);
+  inline G4double PolarAngleLimit() const;
+  inline const G4PhysicsTable* LambdaTable() const;
+  //------------------------------------------------------------------------
+  // Define and access particle type
+  //------------------------------------------------------------------------
+  inline const G4ParticleDefinition* Particle() const;
+  inline const G4ParticleDefinition* SecondaryParticle() const;
+  //------------------------------------------------------------------------
+  // Specific methods to set, access, modify models and basic parameters
+  //------------------------------------------------------------------------
+protected:
+  // Select model in run time
+  inline void SelectModel(G4double& kinEnergy);
+public:
+  // Select model by energy and region index
   inline G4VEmModel* SelectModelForMaterial(G4double kinEnergy,
                                             size_t& idxRegion) const;
+  inline G4double GetLambda(G4double& kinEnergy,
+                            const G4MaterialCutsCouple* couple);
+  // It returns the Lambda of the process
+  //------------------------------------------------------------------------
+  // Specific methods to build and access Physics Tables
+  //------------------------------------------------------------------------
+  inline void SetLambdaBinning(G4int nbins);
+  inline G4int LambdaBinning() const;
+  // Binning for lambda table
+  inline void SetMinKinEnergy(G4double e);
+  inline G4double MinKinEnergy() const;
+  // Min kinetic energy for tables
+  inline void SetMaxKinEnergy(G4double e);
+  inline G4double MaxKinEnergy() const;
+  // Max kinetic energy for tables
+  inline const G4PhysicsTable* LambdaTable() const;
+  //------------------------------------------------------------------------
+  // Define and access particle type
+  //------------------------------------------------------------------------
+  inline const G4ParticleDefinition* Particle() const;
+  inline const G4ParticleDefinition* SecondaryParticle() const;
+  //------------------------------------------------------------------------
+  // Specific methods to set, access, modify models
+  //------------------------------------------------------------------------
+  // Add model for region, smaller value of order defines which
+  // model will be selected for a given energy interval
   inline void AddEmModel(G4int, G4VEmModel*, const G4Region* region = 0);
+  // Add EM model coupled for the region
+  inline void SetModel(G4VEmModel*);
   // Assign a model to a process
+  inline void SetModel(G4VEmModel*, G4int index = 1);
-  inline G4VEmModel* Model();
   // return the assigned model
+  inline G4VEmModel* Model(G4int index = 1);
+  // Define new energy range for the model identified by the name
   inline void UpdateEmModel(const G4String&, G4double, G4double);
-  // Define new energy range for the model identified by the name
   // Access to models
+  inline G4VEmModel* GetModelByIndex(G4int idx = 0);
+  //------------------------------------------------------------------------
+  // Get/set parameters used for simulation of energy loss
+  //------------------------------------------------------------------------
+  inline void ActivateDeexcitation(G4bool, const G4Region* r = 0);
+  inline G4VEmModel* GetModelByIndex(G4int idx = 0, G4bool ver = false);
   inline void SetLambdaFactor(G4double val);
 …
   inline void SetApplyCuts(G4bool val);
+  //------------------------------------------------------------------------
+  // Other generic methods
+  //------------------------------------------------------------------------
 protected:
 …
   G4PhysicsVector* LambdaPhysicsVector(const G4MaterialCutsCouple*);
+  inline G4double RecalculateLambda(G4double kinEnergy,
+                                    const G4MaterialCutsCouple* couple);
+  inline G4ParticleChangeForGamma* GetParticleChange();
   inline void SetParticle(const G4ParticleDefinition* p);
   inline void SetSecondaryParticle(const G4ParticleDefinition* p);
-  inline G4VEmModel* SelectModel(G4double& kinEnergy);
   inline size_t CurrentMaterialCutsCoupleIndex() const;
 …
   inline G4double ComputeCurrentLambda(G4double kinEnergy);
+  // hide  assignment operator
+  // copy constructor and hide assignment operator
   G4VEmProcess(G4VEmProcess &);
   G4VEmProcess & operator=(const G4VEmProcess &right);
+// =====================================================================
+protected:
+  G4ParticleChangeForGamma     fParticleChange;
+private:
+  std::vector<G4DynamicParticle*> secParticles;
+  // ======== Parameters of the class fixed at construction =========
   G4EmModelManager*            modelManager;
+  G4VEmModel*                  selectedModel;
+  const G4ParticleDefinition*  theGamma;
+  const G4ParticleDefinition*  theElectron;
+  const G4ParticleDefinition*  thePositron;
+  const G4ParticleDefinition*  secondaryParticle;
+  G4bool                       buildLambdaTable;
+  // ======== Parameters of the class fixed at initialisation =======
+  std::vector<G4VEmModel*>     emModels;
   // tables and vectors
 …
   G4double*                    theCrossSectionMax;
-  const G4ParticleDefinition*  particle;
-  const G4ParticleDefinition*  secondaryParticle;
-  const G4ParticleDefinition*  theGamma;
-  const G4ParticleDefinition*  theElectron;
-  const G4ParticleDefinition*  thePositron;
   const std::vector<G4double>* theCuts;
   const std::vector<G4double>* theCutsGamma;
 …
   G4double                     maxKinEnergy;
   G4double                     lambdaFactor;
+  G4double                     polarAngleLimit;
+  G4bool                       integral;
+  G4bool                       applyCuts;
+  G4bool                       startFromNull;
+  G4bool                       useDeexcitation;
+  G4int                        nDERegions;
+  std::vector<const G4Region*> deRegions;
+  G4bool*                      idxDERegions;
+  // ======== Cashed values - may be state dependent ================
+protected:
+  G4ParticleChangeForGamma     fParticleChange;
+private:
+  std::vector<G4DynamicParticle*> secParticles;
+  G4VEmModel*                  currentModel;
+  const G4ParticleDefinition*  particle;
   // cash
 …
   G4double                     preStepLambda;
-  G4bool                       integral;
-  G4bool                       buildLambdaTable;
-  G4bool                       applyCuts;
-  G4bool                       startFromNull;
-  G4int                        nRegions;
-  std::vector<G4Region*>       regions;
-  std::vector<G4bool>          flagsDeexcitation;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::ComputeCrossSectionPerAtom(
+                 G4double kineticEnergy, G4double Z, G4double A, G4double cut)
+{
+  SelectModel(kineticEnergy);
+  G4double x = 0.0;
+  if(currentModel) {
+   x = currentModel->ComputeCrossSectionPerAtom(particle,kineticEnergy,
+                                                 Z,A,cut);
+  }
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MeanFreePath(const G4Track& track)
+{
+  DefineMaterial(track.GetMaterialCutsCouple());
+  preStepLambda = GetCurrentLambda(track.GetKineticEnergy());
+  G4double x = DBL_MAX;
+  if(DBL_MIN < preStepLambda) x = 1.0/preStepLambda;
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetLambda(G4double& kineticEnergy,
+                                        const G4MaterialCutsCouple* couple)
+{
+  DefineMaterial(couple);
+  return GetCurrentLambda(kineticEnergy);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetLambdaBinning(G4int nbins)
+{
+  nLambdaBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VEmProcess::LambdaBinning() const
+{
+  return nLambdaBins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetMinKinEnergy(G4double e)
+{
+  minKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MinKinEnergy() const
+{
+  return minKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetMaxKinEnergy(G4double e)
+{
+  maxKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MaxKinEnergy() const
+{
+  return maxKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetPolarAngleLimit(G4double val)
+{
+  if(val < 0.0)     polarAngleLimit = 0.0;
+  else if(val > pi) polarAngleLimit = pi;
+  else              polarAngleLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::PolarAngleLimit() const
+{
+  return polarAngleLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4PhysicsTable* G4VEmProcess::LambdaTable() const
+{
+  return theLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEmProcess::Particle() const
+{
+  return particle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEmProcess::SecondaryParticle() const
+{
+  return secondaryParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SelectModel(G4double& kinEnergy)
+{
+  currentModel = modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+  currentModel->SetCurrentCouple(currentCouple);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::SelectModelForMaterial(
+                                   G4double kinEnergy, size_t& idxRegion) const
+{
+  return modelManager->SelectModel(kinEnergy, idxRegion);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::AddEmModel(G4int order, G4VEmModel* p,
+                                     const G4Region* region)
+{
+  G4VEmFluctuationModel* fm = 0;
+  modelManager->AddEmModel(order, p, fm, region);
+  if(p) p->SetParticleChange(pParticleChange);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetModel(G4VEmModel* p, G4int index)
+{
+  G4int n = emModels.size();
+  if(index >= n) for(G4int i=n; i<index+1; i++) {emModels.push_back(0);}
+  emModels[index] = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::Model(G4int index)
+{
+  G4VEmModel* p = 0;
+  if(index >= 0 && index <  G4int(emModels.size())) p = emModels[index];
+  return p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::UpdateEmModel(const G4String& nam,
+                                        G4double emin, G4double emax)
+{
+  modelManager->UpdateEmModel(nam, emin, emax);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::GetModelByIndex(G4int idx, G4bool ver)
+{
+  return modelManager->GetModel(idx, ver);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetLambdaFactor(G4double val)
+{
+  if(val > 0.0 && val <= 1.0) lambdaFactor = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetIntegral(G4bool val)
+{
+  if(particle && particle != theGamma) integral = val;
+  if(integral) buildLambdaTable = true;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEmProcess::IsIntegral() const
+{
+  return integral;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetApplyCuts(G4bool val)
+{
+  applyCuts = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::RecalculateLambda(G4double e,
+                                                const G4MaterialCutsCouple* couple)
+{
+  DefineMaterial(couple);
+  return ComputeCurrentLambda(e);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4ParticleChangeForGamma* G4VEmProcess::GetParticleChange()
+{
+  return &fParticleChange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetParticle(const G4ParticleDefinition* p)
+{
+  particle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetSecondaryParticle(const G4ParticleDefinition* p)
+{
+  secondaryParticle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline size_t G4VEmProcess::CurrentMaterialCutsCoupleIndex() const
+{
+  return currentMaterialIndex;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetGammaEnergyCut()
+{
+  return (*theCutsGamma)[currentMaterialIndex];
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetElectronEnergyCut()
+{
+  return (*theCutsElectron)[currentMaterialIndex];
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetBuildTableFlag(G4bool val)
+{
+  buildLambdaTable = val;
+  if(!val) integral = false;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetStartFromNullFlag(G4bool val)
+{
+  startFromNull = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::InitialiseStep(const G4Track& track)
+{
+  preStepKinEnergy = track.GetKineticEnergy();
+  DefineMaterial(track.GetMaterialCutsCouple());
+  if (theNumberOfInteractionLengthLeft < 0.0) mfpKinEnergy = DBL_MAX;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
     mfpKinEnergy = DBL_MAX;
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEmProcess::InitialiseStep(const G4Track& track)
+{
-  preStepKinEnergy = track.GetKineticEnergy();
-  DefineMaterial(track.GetMaterialCutsCouple());
-  if (theNumberOfInteractionLengthLeft < 0.0) mfpKinEnergy = DBL_MAX;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEmProcess::GetLambda(G4double& kineticEnergy,
-                                  const G4MaterialCutsCouple* couple)
+{
-  DefineMaterial(couple);
-  return GetCurrentLambda(kineticEnergy);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEmProcess::GetCurrentLambda(G4double e)
+{
-  G4double x = 0.0;
-  if(theLambdaTable) x = GetLambdaFromTable(e);
-  else               x = ComputeCurrentLambda(e);
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEmProcess::RecalculateLambda(G4double e,
-                                                const G4MaterialCutsCouple* couple)
+{
-  DefineMaterial(couple);
-  return ComputeCurrentLambda(e);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEmProcess::ComputeCurrentLambda(G4double e)
+{
-  G4VEmModel* currentModel = SelectModel(e);
-  G4double x = 0.0;
-  if(currentModel)
-    x = currentModel->CrossSectionPerVolume(currentMaterial,particle,
-                                            e,(*theCuts)[currentMaterialIndex]);
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEmProcess::GetLambdaFromTable(G4double e)
+{
-  G4bool b;
-  return (((*theLambdaTable)[currentMaterialIndex])->GetValue(e, b));
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MeanFreePath(const G4Track& track)
+{
+  DefineMaterial(track.GetMaterialCutsCouple());
+  preStepLambda = GetCurrentLambda(track.GetKineticEnergy());
+  G4double x = DBL_MAX;
+  if(DBL_MIN < preStepLambda) x = 1.0/preStepLambda;
+inline G4double G4VEmProcess::GetLambdaFromTable(G4double e)
+{
+  G4bool b;
+  return (((*theLambdaTable)[currentMaterialIndex])->GetValue(e, b));
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetCurrentLambda(G4double e)
+{
+  G4double x = 0.0;
+  if(theLambdaTable) x = GetLambdaFromTable(e);
+  else               x = ComputeCurrentLambda(e);
   return x;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::SelectModel(G4double& kinEnergy)
+{
+  return modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::SelectModelForMaterial(
+                                   G4double kinEnergy, size_t& idxRegion) const
+{
+  return modelManager->SelectModel(kinEnergy, idxRegion);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEmProcess::Particle() const
+{
+  return particle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEmProcess::SecondaryParticle() const
+{
+  return secondaryParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetGammaEnergyCut()
+{
+  return (*theCutsGamma)[currentMaterialIndex];
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::GetElectronEnergyCut()
+{
+  return (*theCutsElectron)[currentMaterialIndex];
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetLambdaFactor(G4double val)
+{
+  if(val > 0.0 && val <= 1.0) lambdaFactor = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::GetModelByIndex(G4int idx)
+{
+  return modelManager->GetModel(idx);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetParticle(const G4ParticleDefinition* p)
+{
+  particle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetSecondaryParticle(const G4ParticleDefinition* p)
+{
+  secondaryParticle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::AddEmModel(G4int order, G4VEmModel* p,
+                                     const G4Region* region)
+{
+  G4VEmFluctuationModel* fm = 0;
+  modelManager->AddEmModel(order, p, fm, region);
+  if(p) p->SetParticleChange(pParticleChange);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetModel(G4VEmModel* model)
+{
+  selectedModel = model;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEmProcess::Model()
+{
+  return selectedModel;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::UpdateEmModel(const G4String& nam,
+                                        G4double emin, G4double emax)
+{
+  modelManager->UpdateEmModel(nam, emin, emax);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::ComputeCrossSectionPerAtom(
+                 G4double kineticEnergy, G4double Z, G4double A, G4double cut)
+{
+  G4VEmModel* model = SelectModel(kineticEnergy);
+  return model->ComputeCrossSectionPerAtom(particle,kineticEnergy,Z,A,cut);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetLambdaBinning(G4int nbins)
+{
+  nLambdaBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VEmProcess::LambdaBinning() const
+{
+  return nLambdaBins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetMinKinEnergy(G4double e)
+{
+  minKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MinKinEnergy() const
+{
+  return minKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetMaxKinEnergy(G4double e)
+{
+  maxKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEmProcess::MaxKinEnergy() const
+{
+  return maxKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::ActivateDeexcitation(G4bool, const G4Region*)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4PhysicsTable* G4VEmProcess::LambdaTable() const
+{
+  return theLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetIntegral(G4bool val)
+{
+  if(particle && particle != theGamma) integral = val;
+  if(integral) buildLambdaTable = true;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEmProcess::IsIntegral() const
+{
+  return integral;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetBuildTableFlag(G4bool val)
+{
+  buildLambdaTable = val;
+  if(!val) integral = false;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetStartFromNullFlag(G4bool val)
+{
+  startFromNull = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEmProcess::SetApplyCuts(G4bool val)
+{
+  applyCuts = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline size_t G4VEmProcess::CurrentMaterialCutsCoupleIndex() const
+{
+  return currentMaterialIndex;
+inline G4double G4VEmProcess::ComputeCurrentLambda(G4double e)
+{
+  SelectModel(e);
+  G4double x = 0.0;
+  if(currentModel) {
+    x = currentModel->CrossSectionPerVolume(currentMaterial,particle,
+                                            e,(*theCuts)[currentMaterialIndex]);
+  }
+  return x;
+}

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

r819	r961
26	26	//
27	27	// $Id: G4VEnergyLoss.hh,v 1.18 2006/06/29 19:54:47 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEnergyLossProcess.hh,v 1.76 2007/11/07 18:38:49 vnivanch Exp $
+// $Id: G4VEnergyLossProcess.hh,v 1.86 2009/02/19 09:57:36 vnivanch Exp $
 // GEANT4 tag $Name:
 //
 …
 //          PostStepGetPhysicalInteractionLength (V.Ivanchenko)
 // 27-10-07 Virtual functions moved to source (V.Ivanchenko)
+// 15-07-08 Reorder class members for further multi-thread development (VI)
 //
 // Class Description:
 …
   virtual ~G4VEnergyLossProcess();
+private:
+  // clean vectors and arrays
+  void Clean();
   //------------------------------------------------------------------------
   // Virtual methods to be implemented in concrete processes
   //------------------------------------------------------------------------
+public:
   virtual G4bool IsApplicable(const G4ParticleDefinition& p) = 0;
 …
   // Methods with standard implementation; may be overwritten if needed
   //------------------------------------------------------------------------
-protected:
   virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*,
                                     const G4Material*, G4double cut);
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& length);
+  //------------------------------------------------------------------------
+  // Generic methods common to all ContinuousDiscrete processes
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  // Virtual methods implementation common to all EM ContinuousDiscrete
+  // processes. Further inheritance is not assumed
+  //------------------------------------------------------------------------
 public:
+  // prepare all tables
+  void PreparePhysicsTable(const G4ParticleDefinition&);
+  // build all tables
+  void BuildPhysicsTable(const G4ParticleDefinition&);
+  // build a table
+  G4PhysicsTable* BuildDEDXTable(G4EmTableType tType = fRestricted);
+  // build a table
+  G4PhysicsTable* BuildLambdaTable(G4EmTableType tType = fRestricted);
+  // summary printout after initialisation
   void PrintInfoDefinition();
+  void PreparePhysicsTable(const G4ParticleDefinition&);
+  void BuildPhysicsTable(const G4ParticleDefinition&);
+  // Add subcutoff option for the region
+  void ActivateSubCutoff(G4bool val, const G4Region* region = 0);
+  // Activate deexcitation code for region
+  void ActivateDeexcitation(G4bool, const G4Region* region = 0);
+  // Step limit from AlongStep
+  G4double AlongStepGetPhysicalInteractionLength(const G4Track&,
+                                                 G4double  previousStepSize,
+                                                 G4double  currentMinimumStep,
+                                                 G4double& currentSafety,
+                                                 G4GPILSelection* selection);
+  // Step limit from cross section
+  G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
+                                                G4double   previousStepSize,
+                                                G4ForceCondition* condition);
+  // AlongStep computations
   G4VParticleChange* AlongStepDoIt(const G4Track&, const G4Step&);
+  // Sampling of secondaries in vicinity of geometrical boundary
+  void SampleSubCutSecondaries(std::vector<G4Track*>&, const G4Step&,
+                               G4VEmModel* model, G4int matIdx,
+                               G4double& extraEdep);
+  // PostStep sampling of secondaries
   G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
   // Store PhysicsTable in a file.
   // Return false in case of failure at I/O
+  // Store all PhysicsTable in files.
+  // Return false in case of any fatal failure at I/O
   G4bool StorePhysicsTable(const G4ParticleDefinition*,
                            const G4String& directory,
                            G4bool ascii = false);
+  // Retrieve Physics from a file.
+  // (return true if the Physics Table can be build by using file)
+  // (return false if the process has no functionality or in case of failure)
+  // File name should is constructed as processName+particleName and the
+  // should be placed under the directory specifed by the argument.
+  // Retrieve all Physics from a files.
+  // Return true if all the Physics Table are built.
+  // Return false if any fatal failure.
   G4bool RetrievePhysicsTable(const G4ParticleDefinition*,
                               const G4String& directory,
                               G4bool ascii);
+private:
+  // store a table
+  G4bool StoreTable(const G4ParticleDefinition* p,
+                    G4PhysicsTable*, G4bool ascii,
+                    const G4String& directory,
+                    const G4String& tname);
+  // retrieve a table
+  G4bool RetrieveTable(const G4ParticleDefinition* p,
+                       G4PhysicsTable*, G4bool ascii,
+                       const G4String& directory,
+                       const G4String& tname,
+                       G4bool mandatory);
+  //------------------------------------------------------------------------
+  // Public interface to cross section, mfp and sampling of fluctuations
+  // These methods are not used in run time
+  //------------------------------------------------------------------------
+public:
+  // access to dispersion of restricted energy loss
+  G4double GetDEDXDispersion(const G4MaterialCutsCouple *couple,
+                             const G4DynamicParticle* dp,
+                             G4double length);
+  // Access to cross section table
+  G4double CrossSectionPerVolume(G4double kineticEnergy,
+                                 const G4MaterialCutsCouple* couple);
+  // access to cross section
+  G4double MeanFreePath(const G4Track& track);
+  // access to step limit
+  G4double ContinuousStepLimit(const G4Track& track,
+                               G4double previousStepSize,
+                               G4double currentMinimumStep,
+                               G4double& currentSafety);
 protected:
+  // implementation of the pure virtual method
   G4double GetMeanFreePath(const G4Track& track,
                            G4double previousStepSize,
                            G4ForceCondition* condition);
+  // implementation of the pure virtual method
   G4double GetContinuousStepLimit(const G4Track& track,
                                   G4double previousStepSize,
 …
   //------------------------------------------------------------------------
+  // Specific methods for along/post step EM processes
+  //------------------------------------------------------------------------
+  // Run time method which may be also used by derived processes
+  //------------------------------------------------------------------------
+  // creeation of an empty vector for cross section
+  G4PhysicsVector* LambdaPhysicsVector(const G4MaterialCutsCouple*,
+                                       G4double cut);
+  inline G4ParticleChangeForLoss* GetParticleChange();
+  inline size_t CurrentMaterialCutsCoupleIndex() const;
+  inline G4double GetCurrentRange() const;
+  //------------------------------------------------------------------------
+  // Specific methods to set, access, modify models
+  //------------------------------------------------------------------------
+  // Select model in run time
+  inline void SelectModel(G4double kinEnergy);
 public:
+  // Select model by energy and region index
+  inline G4VEmModel* SelectModelForMaterial(G4double kinEnergy,
+                                            size_t& idx) const;
+  // Add EM model coupled with fluctuation model for region, smaller value
+  // of order defines which pair of models will be selected for a given
+  // energy interval
+  inline void AddEmModel(G4int, G4VEmModel*,
+                         G4VEmFluctuationModel* fluc = 0,
+                         const G4Region* region = 0);
+  // Define new energy range for the model identified by the name
+  inline void UpdateEmModel(const G4String&, G4double, G4double);
+  // Assign a model to a process
+  inline void SetEmModel(G4VEmModel*, G4int index=1);
+  // return the assigned model
+  inline G4VEmModel* EmModel(G4int index=1);
+  // Access to models
+  inline G4VEmModel* GetModelByIndex(G4int idx = 0, G4bool ver = false);
+  inline G4int NumberOfModels();
+  // Assign a fluctuation model to a process
+  inline void SetFluctModel(G4VEmFluctuationModel*);
+  // return the assigned fluctuation model
+  inline G4VEmFluctuationModel* FluctModel();
+  //------------------------------------------------------------------------
+  // Define and access particle type
+  //------------------------------------------------------------------------
+protected:
+  inline void SetParticle(const G4ParticleDefinition* p);
+  inline void SetSecondaryParticle(const G4ParticleDefinition* p);
+public:
+  inline void SetBaseParticle(const G4ParticleDefinition* p);
+  inline const G4ParticleDefinition* Particle() const;
+  inline const G4ParticleDefinition* BaseParticle() const;
+  inline const G4ParticleDefinition* SecondaryParticle() const;
+  //------------------------------------------------------------------------
+  // Get/set parameters to configure the process at initialisation time
+  //------------------------------------------------------------------------
+  // Add subcutoff process (bremsstrahlung) to sample secondary
+  // particle production in vicinity of the geometry boundary
   void AddCollaborativeProcess(G4VEnergyLossProcess*);
+  void SampleSubCutSecondaries(std::vector<G4Track*>&, const G4Step&,
+                               G4VEmModel* model, G4int matIdx,
+                               G4double& extraEdep);
+  G4double GetDEDXDispersion(const G4MaterialCutsCouple *couple,
+                             const G4DynamicParticle* dp,
+                             G4double length);
+  virtual G4double AlongStepGetPhysicalInteractionLength(
+                             const G4Track&,
+                             G4double  previousStepSize,
+                             G4double  currentMinimumStep,
+                             G4double& currentSafety,
+                             G4GPILSelection* selection
+                            );
+  virtual G4double PostStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            );
+  //------------------------------------------------------------------------
+  // Specific methods to build and access Physics Tables
+  //------------------------------------------------------------------------
+  G4double MicroscopicCrossSection(G4double kineticEnergy,
+                                   const G4MaterialCutsCouple* couple);
+  G4PhysicsTable* BuildDEDXTable(G4EmTableType tType = fRestricted);
+  G4PhysicsTable* BuildLambdaTable(G4EmTableType tType = fRestricted);
+  inline void SetLossFluctuations(G4bool val);
+  inline void SetRandomStep(G4bool val);
+  inline void SetIntegral(G4bool val);
+  inline G4bool IsIntegral() const;
+  // Set/Get flag "isIonisation"
+  inline void SetIonisation(G4bool val);
+  inline G4bool IsIonisationProcess() const;
+  // Redefine parameteters for stepping control
+  //
+  inline void SetLinearLossLimit(G4double val);
+  inline void SetMinSubRange(G4double val);
+  inline void SetLambdaFactor(G4double val);
+  inline void SetStepFunction(G4double v1, G4double v2);
+  inline G4int NumberOfSubCutoffRegions() const;
+  inline G4int NumberOfDERegions() const;
+  //------------------------------------------------------------------------
+  // Specific methods to path Physics Tables to the process
+  //------------------------------------------------------------------------
   void SetDEDXTable(G4PhysicsTable* p, G4EmTableType tType);
   void SetCSDARangeTable(G4PhysicsTable* pRange);
   void SetRangeTableForLoss(G4PhysicsTable* p);
+  void SetSecondaryRangeTable(G4PhysicsTable* p);
   void SetInverseRangeTable(G4PhysicsTable* p);
-  void SetSecondaryRangeTable(G4PhysicsTable* p);
   void SetLambdaTable(G4PhysicsTable* p);
 …
   // Max kinetic energy for tables
   inline void SetMaxKinEnergyForCSDARange(G4double e);
+  // Return values for given G4MaterialCutsCouple
+  inline G4double GetDEDX(G4double& kineticEnergy, const G4MaterialCutsCouple*);
+  inline G4double GetDEDXForSubsec(G4double& kineticEnergy,
+                                   const G4MaterialCutsCouple*);
+  inline G4double GetRange(G4double& kineticEnergy, const G4MaterialCutsCouple*);
+  inline G4double GetCSDARange(G4double& kineticEnergy, const G4MaterialCutsCouple*);
+  inline G4double GetRangeForLoss(G4double& kineticEnergy, const G4MaterialCutsCouple*);
+  inline G4double GetKineticEnergy(G4double& range, const G4MaterialCutsCouple*);
+  inline G4double GetLambda(G4double& kineticEnergy, const G4MaterialCutsCouple*);
+  inline G4bool TablesAreBuilt() const;
   // Access to specific tables
 …
   inline G4PhysicsTable* SubLambdaTable();
-  // Return values for given G4MaterialCutsCouple
-  inline G4double GetDEDX(G4double& kineticEnergy, const G4MaterialCutsCouple*);
-  inline G4double GetDEDXForSubsec(G4double& kineticEnergy,
-                                   const G4MaterialCutsCouple*);
-  inline G4double GetRange(G4double& kineticEnergy, const G4MaterialCutsCouple*);
-  inline G4double GetCSDARange(G4double& kineticEnergy, const G4MaterialCutsCouple*);
-  inline G4double GetRangeForLoss(G4double& kineticEnergy, const G4MaterialCutsCouple*);
-  inline G4double GetKineticEnergy(G4double& range, const G4MaterialCutsCouple*);
-  inline G4double GetLambda(G4double& kineticEnergy, const G4MaterialCutsCouple*);
-  inline G4bool TablesAreBuilt() const;
-  //------------------------------------------------------------------------
-  // Define and access particle type
-  //------------------------------------------------------------------------
-  inline void SetBaseParticle(const G4ParticleDefinition* p);
-  inline const G4ParticleDefinition* Particle() const;
-  inline const G4ParticleDefinition* BaseParticle() const;
-  inline const G4ParticleDefinition* SecondaryParticle() const;
-  //------------------------------------------------------------------------
-  // Specific methods to set, access, modify models
-  //------------------------------------------------------------------------
-  // Add EM model coupled with fluctuation model for the region
-  inline void AddEmModel(G4int, G4VEmModel*, G4VEmFluctuationModel* fluc = 0,
-                                const G4Region* region = 0);
-  // Assign a model to a process
-  inline void SetEmModel(G4VEmModel*, G4int index=1);
-  // return the assigned model
-  inline G4VEmModel* EmModel(G4int index=1);
-  // Assign a fluctuation model to a process
-  inline void SetFluctModel(G4VEmFluctuationModel*);
-  // return the assigned fluctuation model
-  inline G4VEmFluctuationModel* FluctModel();
-  // Define new energy range for the model identified by the name
-  inline void UpdateEmModel(const G4String&, G4double, G4double);
-  // Access to models
-  inline G4VEmModel* GetModelByIndex(G4int idx = 0);
-  inline G4int NumberOfModels();
-  //------------------------------------------------------------------------
-  // Get/set parameters used for simulation of energy loss
-  //------------------------------------------------------------------------
-  inline void SetLossFluctuations(G4bool val);
-  inline void SetRandomStep(G4bool val);
-  inline void SetIntegral(G4bool val);
-  inline G4bool IsIntegral() const;
-  // Set/Get flag "isIonisation"
-  inline void SetIonisation(G4bool val);
-  inline G4bool IsIonisationProcess() const;
-  // Redefine parameteters for stepping control
-  //
-  inline void SetLinearLossLimit(G4double val);
-  inline void SetMinSubRange(G4double val);
-  inline void SetStepFunction(G4double v1, G4double v2);
-  inline void SetLambdaFactor(G4double val);
-  // Add subcutoff option for the region
-  void ActivateSubCutoff(G4bool val, const G4Region* region = 0);
-  inline G4int NumberOfSubCutoffRegions() const;
-  // Activate deexcitation code
-  virtual void ActivateDeexcitation(G4bool, const G4Region* region = 0);
   //------------------------------------------------------------------------
   // Run time method for simulation of ionisation
   //------------------------------------------------------------------------
+  // sample range at the end of a step
   inline G4double SampleRange();
+  inline G4VEmModel* SelectModelForMaterial(G4double kinEnergy, size_t& idx) const;
+  // Set scaling parameters
+  // Set scaling parameters for ions is needed to G4EmCalculator
   inline void SetDynamicMassCharge(G4double massratio, G4double charge2ratio);
-  // Helper functions
-  inline G4double MeanFreePath(const G4Track& track);
-  inline G4double ContinuousStepLimit(const G4Track& track,
-                                      G4double previousStepSize,
-                                      G4double currentMinimumStep,
-                                      G4double& currentSafety);
-protected:
-  G4PhysicsVector* LambdaPhysicsVector(const G4MaterialCutsCouple*,
-                                       G4double cut);
-  inline virtual void InitialiseMassCharge(const G4Track&);
-  inline void SetParticle(const G4ParticleDefinition* p);
-  inline void SetSecondaryParticle(const G4ParticleDefinition* p);
-  inline G4VEmModel* SelectModel(G4double kinEnergy);
-  inline size_t CurrentMaterialCutsCoupleIndex() const;
-  inline G4double GetCurrentRange() const;
 private:
+  // Clear tables
+  void Clear();
+  inline void InitialiseStep(const G4Track&);
+  // define material and indexes
   inline void DefineMaterial(const G4MaterialCutsCouple* couple);
+  // Returnd values for scaled energy and base particles mass
+  //
+  //------------------------------------------------------------------------
+  // Compute values using scaling relation, mass and charge of based particle
+  //------------------------------------------------------------------------
   inline G4double GetDEDXForScaledEnergy(G4double scaledKinEnergy);
   inline G4double GetSubDEDXForScaledEnergy(G4double scaledKinEnergy);
 …
   inline G4double GetScaledRangeForScaledEnergy(G4double scaledKinEnergy);
   inline G4double GetLimitScaledRangeForScaledEnergy(G4double scaledKinEnergy);
+  inline G4double ScaledKinEnergyForLoss(G4double range);
   inline G4double GetLambdaForScaledEnergy(G4double scaledKinEnergy);
-  inline G4double ScaledKinEnergyForLoss(G4double range);
   inline void ComputeLambdaForScaledEnergy(G4double scaledKinEnergy);
   // hide  assignment operator
   G4VEnergyLossProcess(G4VEnergyLossProcess &);
   G4VEnergyLossProcess & operator=(const G4VEnergyLossProcess &right);
+// =====================================================================
+protected:
+  G4ParticleChangeForLoss               fParticleChange;
+private:
+  G4EmModelManager*                     modelManager;
+  // ======== Parameters of the class fixed at construction =========
+  G4EmModelManager*           modelManager;
+  G4SafetyHelper*             safetyHelper;
+  const G4ParticleDefinition* secondaryParticle;
+  const G4ParticleDefinition* theElectron;
+  const G4ParticleDefinition* thePositron;
+  const G4ParticleDefinition* theGenericIon;
+  G4PhysicsVector*            vstrag;
+  // ======== Parameters of the class fixed at initialisation =======
   std::vector<G4VEmModel*>              emModels;
   G4VEmFluctuationModel*                fluctModel;
   std::vector<const G4Region*>          scoffRegions;
+  std::vector<const G4Region*>          deRegions;
   G4int                                 nSCoffRegions;
+  G4int*                                idxSCoffRegions;
+  std::vector<G4DynamicParticle*>       secParticles;
+  std::vector<G4Track*>                 scTracks;
+  G4int                                 nDERegions;
+  G4bool*                               idxSCoffRegions;
+  G4bool*                               idxDERegions;
   std::vector<G4VEnergyLossProcess*>    scProcesses;
   G4int                                 nProcesses;
 …
   const G4DataVector*         theSubCuts;
-  G4SafetyHelper*             safetyHelper;
-  const G4ParticleDefinition* particle;
   const G4ParticleDefinition* baseParticle;
-  const G4ParticleDefinition* secondaryParticle;
-  const G4ParticleDefinition* theElectron;
-  const G4ParticleDefinition* thePositron;
-  G4PhysicsVector*            vstrag;
-  // cash
-  const G4Material*           currentMaterial;
-  const G4MaterialCutsCouple* currentCouple;
-  size_t                      currentMaterialIndex;
   G4int    nBins;
   G4int    nBinsCSDA;
-  G4int    nWarnings;
   G4double lowestKinEnergy;
 …
   G4double maxKinEnergyCSDA;
-  G4double massRatio;
-  G4double reduceFactor;
-  G4double chargeSquare;
-  G4double chargeSqRatio;
-  G4double preStepLambda;
-  G4double fRange;
-  G4double preStepKinEnergy;
-  G4double preStepScaledEnergy;
   G4double linLossLimit;
   G4double minSubRange;
 …
   G4double finalRange;
   G4double lambdaFactor;
-  G4double mfpKinEnergy;
-  G4GPILSelection  aGPILSelection;
   G4bool   lossFluctuationFlag;
 …
   G4bool   tablesAreBuilt;
   G4bool   integral;
+  G4bool   isIon;
   G4bool   isIonisation;
   G4bool   useSubCutoff;
+  G4bool   useDeexcitation;
+protected:
+  G4ParticleChangeForLoss          fParticleChange;
+  // ======== Cashed values - may be state dependent ================
+private:
+  std::vector<G4DynamicParticle*>  secParticles;
+  std::vector<G4Track*>            scTracks;
+  const G4ParticleDefinition* particle;
+  G4VEmModel*                 currentModel;
+  const G4Material*           currentMaterial;
+  const G4MaterialCutsCouple* currentCouple;
+  size_t                      currentMaterialIndex;
+  G4int    nWarnings;
+  G4double massRatio;
+  G4double reduceFactor;
+  G4double chargeSqRatio;
+  G4double preStepLambda;
+  G4double fRange;
+  G4double preStepKinEnergy;
+  G4double preStepScaledEnergy;
+  G4double mfpKinEnergy;
+  G4GPILSelection  aGPILSelection;
 };
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::DefineMaterial(
+            const G4MaterialCutsCouple* couple)
+{
+  if(couple != currentCouple) {
+    currentCouple   = couple;
+    currentMaterial = couple->GetMaterial();
+    currentMaterialIndex = couple->GetIndex();
+    mfpKinEnergy = DBL_MAX;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::InitialiseStep(const G4Track& track)
+{
+  InitialiseMassCharge(track);
+  preStepKinEnergy = track.GetKineticEnergy();
+  preStepScaledEnergy = preStepKinEnergy*massRatio;
+  DefineMaterial(track.GetMaterialCutsCouple());
+  if (theNumberOfInteractionLengthLeft < 0.0) mfpKinEnergy = DBL_MAX;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::InitialiseMassCharge(const G4Track&)
+{}
+inline G4ParticleChangeForLoss* G4VEnergyLossProcess::GetParticleChange()
+{
+  return &fParticleChange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline size_t G4VEnergyLossProcess::CurrentMaterialCutsCoupleIndex() const
+{
+  return currentMaterialIndex;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetCurrentRange() const
+{
+  return fRange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SelectModel(G4double kinEnergy)
+{
+  currentModel = modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+  currentModel->SetCurrentCouple(currentCouple);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEnergyLossProcess::SelectModelForMaterial(
+                   G4double kinEnergy, size_t& idx) const
+{
+  return modelManager->SelectModel(kinEnergy, idx);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+void G4VEnergyLossProcess::AddEmModel(G4int order, G4VEmModel* p,
+                                      G4VEmFluctuationModel* fluc,
+                                      const G4Region* region)
+{
+  modelManager->AddEmModel(order, p, fluc, region);
+  if(p) p->SetParticleChange(pParticleChange, fluc);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::UpdateEmModel(const G4String& nam,
+                                                G4double emin, G4double emax)
+{
+  modelManager->UpdateEmModel(nam, emin, emax);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetEmModel(G4VEmModel* p, G4int index)
+{
+  G4int n = emModels.size();
+  if(index >= n) for(G4int i=n; i<index+1; i++) {emModels.push_back(0);}
+  emModels[index] = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VEnergyLossProcess::EmModel(G4int index)
+{
+  G4VEmModel* p = 0;
+  if(index >= 0 && index <  G4int(emModels.size())) p = emModels[index];
+  return p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+G4VEmModel* G4VEnergyLossProcess::GetModelByIndex(G4int idx, G4bool ver)
+{
+  return modelManager->GetModel(idx, ver);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VEnergyLossProcess::NumberOfModels()
+{
+  return modelManager->NumberOfModels();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetFluctModel(G4VEmFluctuationModel* p)
+{
+  fluctModel = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmFluctuationModel* G4VEnergyLossProcess::FluctModel()
+{
+  return fluctModel;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetParticle(const G4ParticleDefinition* p)
+{
+  particle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetSecondaryParticle(const G4ParticleDefinition* p)
+{
+  secondaryParticle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetBaseParticle(const G4ParticleDefinition* p)
+{
+  baseParticle = p;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEnergyLossProcess::Particle() const
+{
+  return particle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEnergyLossProcess::BaseParticle() const
+{
+  return baseParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline const G4ParticleDefinition* G4VEnergyLossProcess::SecondaryParticle() const
+{
+  return secondaryParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetLossFluctuations(G4bool val)
+{
+  lossFluctuationFlag = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetRandomStep(G4bool val)
+{
+  rndmStepFlag = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetIntegral(G4bool val)
+{
+  integral = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEnergyLossProcess::IsIntegral() const
+{
+  return integral;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetIonisation(G4bool val)
+{
+  isIonisation = val;
+  if(val) aGPILSelection = CandidateForSelection;
+  else    aGPILSelection = NotCandidateForSelection;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEnergyLossProcess::IsIonisationProcess() const
+{
+  return isIonisation;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetLinearLossLimit(G4double val)
+{
+  linLossLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetMinSubRange(G4double val)
+{
+  minSubRange = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetLambdaFactor(G4double val)
+{
+  if(val > 0.0 && val <= 1.0) lambdaFactor = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::SetStepFunction(G4double v1, G4double v2)
+{
+  dRoverRange = v1;
+  finalRange = v2;
+  if (dRoverRange > 0.999) dRoverRange = 1.0;
+  currentCouple = 0;
+  mfpKinEnergy  = DBL_MAX;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VEnergyLossProcess::NumberOfSubCutoffRegions() const
+{
+  return nSCoffRegions;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VEnergyLossProcess::NumberOfDERegions() const
+{
+  return nDERegions;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetDEDXBinning(G4int nbins)
+{
+  nBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetLambdaBinning(G4int nbins)
+{
+  nBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetDEDXBinningForCSDARange(G4int nbins)
+{
+  nBinsCSDA = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetMinKinEnergy(G4double e)
+{
+  minKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::MinKinEnergy() const
+{
+  return minKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetMaxKinEnergy(G4double e)
+{
+  maxKinEnergy = e;
+  if(e < maxKinEnergyCSDA) maxKinEnergyCSDA = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::MaxKinEnergy() const
+{
+  return maxKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetMaxKinEnergyForCSDARange(G4double e)
+{
+  maxKinEnergyCSDA = e;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   DefineMaterial(couple);
   return GetSubDEDXForScaledEnergy(kineticEnergy*massRatio);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetDEDXForScaledEnergy(G4double e)
+{
-  G4bool b;
-  G4double x =
-    ((*theDEDXTable)[currentMaterialIndex]->GetValue(e, b))*chargeSqRatio;
-  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetSubDEDXForScaledEnergy(G4double e)
+{
-  G4bool b;
-  G4double x =
-    ((*theDEDXSubTable)[currentMaterialIndex]->GetValue(e, b))*chargeSqRatio;
-  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetIonisationForScaledEnergy(G4double e)
+{
-  G4bool b;
-  G4double x = 0.0;
-  //  if(theIonisationTable) {
-  x = ((*theIonisationTable)[currentMaterialIndex]->GetValue(e, b))
-    *chargeSqRatio;
-  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
-  //}
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline
-G4double G4VEnergyLossProcess::GetSubIonisationForScaledEnergy(G4double e)
+{
-  G4bool b;
-  G4double x = 0.0;
-  //if(theIonisationSubTable) {
-  x = ((*theIonisationSubTable)[currentMaterialIndex]->GetValue(e, b))
-    *chargeSqRatio;
-  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
-  //}
-  return x;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetRangeForLoss(
+                G4double& kineticEnergy,
+                const G4MaterialCutsCouple* couple)
+{
+  DefineMaterial(couple);
+  G4double x = DBL_MAX;
+  if(theRangeTableForLoss)
+    x = GetScaledRangeForScaledEnergy(kineticEnergy*massRatio)*reduceFactor;
+  //  G4cout << "Range from " << GetProcessName()
+  //         << "  e= " << kineticEnergy << " r= " << x << G4endl;
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetKineticEnergy(
+                G4double& range,
+                const G4MaterialCutsCouple* couple)
+{
+  DefineMaterial(couple);
+  G4double r = range/reduceFactor;
+  G4double e = ScaledKinEnergyForLoss(r)/massRatio;
+  return e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetLambda(G4double& kineticEnergy,
+                                          const G4MaterialCutsCouple* couple)
+{
+  DefineMaterial(couple);
+  G4double x = 0.0;
+  if(theLambdaTable) x = GetLambdaForScaledEnergy(kineticEnergy*massRatio);
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4bool G4VEnergyLossProcess::TablesAreBuilt() const
+{
+  return  tablesAreBuilt;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::DEDXTable() const
+{
+  return theDEDXTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::DEDXTableForSubsec() const
+{
+  return theDEDXSubTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::DEDXunRestrictedTable() const
+{
+  return theDEDXunRestrictedTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::IonisationTable() const
+{
+  G4PhysicsTable* t = theDEDXTable;
+  if(theIonisationTable) t = theIonisationTable;
+  return t;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::IonisationTableForSubsec() const
+{
+  G4PhysicsTable* t = theDEDXSubTable;
+  if(theIonisationSubTable) t = theIonisationSubTable;
+  return t;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::CSDARangeTable() const
+{
+  return theCSDARangeTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::RangeTableForLoss() const
+{
+  return theRangeTableForLoss;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::InverseRangeTable() const
+{
+  return theInverseRangeTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::LambdaTable()
+{
+  return theLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VEnergyLossProcess::SubLambdaTable()
+{
+  return theSubLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::SampleRange()
+{
+  G4double e = amu_c2*preStepKinEnergy/particle->GetPDGMass();
+  G4bool b;
+  G4double s = fRange*std::pow(10.,vstrag->GetValue(e,b));
+  G4double x = fRange + G4RandGauss::shoot(0.0,s);
+  if(x > 0.0) fRange = x;
+  return fRange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::SetDynamicMassCharge(G4double massratio,
+                                                       G4double charge2ratio)
+{
+  massRatio     = massratio;
+  chargeSqRatio = charge2ratio;
+  reduceFactor  = 1.0/(chargeSqRatio*massRatio);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VEnergyLossProcess::DefineMaterial(
+            const G4MaterialCutsCouple* couple)
+{
+  if(couple != currentCouple) {
+    currentCouple   = couple;
+    currentMaterial = couple->GetMaterial();
+    currentMaterialIndex = couple->GetIndex();
+    mfpKinEnergy = DBL_MAX;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetDEDXForScaledEnergy(G4double e)
+{
+  G4bool b;
+  G4double x =
+    ((*theDEDXTable)[currentMaterialIndex]->GetValue(e, b))*chargeSqRatio;
+  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetSubDEDXForScaledEnergy(G4double e)
+{
+  G4bool b;
+  G4double x =
+    ((*theDEDXSubTable)[currentMaterialIndex]->GetValue(e, b))*chargeSqRatio;
+  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetIonisationForScaledEnergy(G4double e)
+{
+  G4bool b;
+  G4double x = 0.0;
+  //  if(theIonisationTable) {
+  x = ((*theIonisationTable)[currentMaterialIndex]->GetValue(e, b))
+    *chargeSqRatio;
+  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
+  //}
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+G4double G4VEnergyLossProcess::GetSubIonisationForScaledEnergy(G4double e)
+{
+  G4bool b;
+  G4double x = 0.0;
+  //if(theIonisationSubTable) {
+  x = ((*theIonisationSubTable)[currentMaterialIndex]->GetValue(e, b))
+    *chargeSqRatio;
+  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
+  //}
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VEnergyLossProcess::GetScaledRangeForScaledEnergy(G4double e)
+{
+  G4bool b;
+  G4double x = ((*theRangeTableForLoss)[currentMaterialIndex])->GetValue(e, b);
+  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 inline G4double G4VEnergyLossProcess::GetLimitScaledRangeForScaledEnergy(
                 G4double e)
 …
+  }
   return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetRangeForLoss(
-                G4double& kineticEnergy,
-                const G4MaterialCutsCouple* couple)
+{
-  DefineMaterial(couple);
-  G4double x = DBL_MAX;
-  if(theRangeTableForLoss)
-    x = GetScaledRangeForScaledEnergy(kineticEnergy*massRatio)*reduceFactor;
-  //  G4cout << "Range from " << GetProcessName()
-  //         << "  e= " << kineticEnergy << " r= " << x << G4endl;
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetScaledRangeForScaledEnergy(G4double e)
+{
-  G4bool b;
-  G4double x = ((*theRangeTableForLoss)[currentMaterialIndex])->GetValue(e, b);
-  if(e < minKinEnergy) x *= std::sqrt(e/minKinEnergy);
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetKineticEnergy(
-                G4double& range,
-                const G4MaterialCutsCouple* couple)
+{
-  DefineMaterial(couple);
-  G4double r = range/reduceFactor;
-  G4double e = ScaledKinEnergyForLoss(r)/massRatio;
-  return e;
+}
 …
+  }
   return e;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetLambda(G4double& kineticEnergy,
-                                          const G4MaterialCutsCouple* couple)
+{
-  DefineMaterial(couple);
-  G4double x = 0.0;
-  if(theLambdaTable) x = GetLambdaForScaledEnergy(kineticEnergy*massRatio);
-  return x;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::ContinuousStepLimit(
-         const G4Track& track, G4double x, G4double y, G4double& z)
+{
-  G4GPILSelection sel;
-  return AlongStepGetPhysicalInteractionLength(track, x, y, z, &sel);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::SampleRange()
+{
-  G4double e = amu_c2*preStepKinEnergy/particle->GetPDGMass();
-  G4bool b;
-  G4double s = fRange*std::pow(10.,vstrag->GetValue(e,b));
-  G4double x = fRange + G4RandGauss::shoot(0.0,s);
-  if(x > 0.0) fRange = x;
-  return fRange;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::MeanFreePath(const G4Track& track)
+{
-  DefineMaterial(track.GetMaterialCutsCouple());
-  preStepLambda = GetLambdaForScaledEnergy(track.GetKineticEnergy()*massRatio);
-  G4double x = DBL_MAX;
-  if(DBL_MIN < preStepLambda) x = 1.0/preStepLambda;
-  return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::MinPrimaryEnergy(
-                const G4ParticleDefinition*, const G4Material*, G4double cut)
+{
-  return cut;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4VEmModel* G4VEnergyLossProcess::SelectModel(G4double kinEnergy)
+{
-  return modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4VEmModel* G4VEnergyLossProcess::SelectModelForMaterial(
-                   G4double kinEnergy, size_t& idx) const
+{
-  return modelManager->SelectModel(kinEnergy, idx);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline const G4ParticleDefinition* G4VEnergyLossProcess::Particle() const
+{
-  return particle;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline const G4ParticleDefinition* G4VEnergyLossProcess::BaseParticle() const
+{
-  return baseParticle;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline const G4ParticleDefinition* G4VEnergyLossProcess::SecondaryParticle() const
+{
-  return secondaryParticle;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::CorrectionsAlongStep(
-                             const G4MaterialCutsCouple*,
-                             const G4DynamicParticle*,
-                             G4double&,
-                             G4double&)
-{}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::DEDXTable() const
+{
-  return theDEDXTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::DEDXTableForSubsec() const
+{
-  return theDEDXSubTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::DEDXunRestrictedTable() const
+{
-  return theDEDXunRestrictedTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::IonisationTable() const
+{
-  G4PhysicsTable* t = theDEDXTable;
-  if(theIonisationTable) t = theIonisationTable;
-  return t;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::IonisationTableForSubsec() const
+{
-  G4PhysicsTable* t = theDEDXSubTable;
-  if(theIonisationSubTable) t = theIonisationSubTable;
-  return t;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::CSDARangeTable() const
+{
-  return theCSDARangeTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::RangeTableForLoss() const
+{
-  return theRangeTableForLoss;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::InverseRangeTable() const
+{
-  return theInverseRangeTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::LambdaTable()
+{
-  return theLambdaTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4PhysicsTable* G4VEnergyLossProcess::SubLambdaTable()
+{
-  return theSubLambdaTable;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4VEnergyLossProcess::IsIntegral() const
+{
-  return integral;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline size_t G4VEnergyLossProcess::CurrentMaterialCutsCoupleIndex() const
+{
-  return currentMaterialIndex;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetDynamicMassCharge(G4double massratio,
-                                                       G4double charge2ratio)
+{
-  massRatio     = massratio;
-  chargeSqRatio = charge2ratio;
-  chargeSquare  = charge2ratio*eplus*eplus;
-  if(chargeSqRatio > 0.0) reduceFactor  = 1.0/(chargeSqRatio*massRatio);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::GetCurrentRange() const
+{
-  return fRange;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEnergyLossProcess::AddEmModel(G4int order, G4VEmModel* p,
-                                      G4VEmFluctuationModel* fluc,
-                                      const G4Region* region)
+{
-  modelManager->AddEmModel(order, p, fluc, region);
-  if(p) p->SetParticleChange(pParticleChange, fluc);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4VEmModel* G4VEnergyLossProcess::GetModelByIndex(G4int idx)
+{
-  return modelManager->GetModel(idx);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4int G4VEnergyLossProcess::NumberOfModels()
+{
-  return modelManager->NumberOfModels();
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetEmModel(G4VEmModel* p, G4int index)
+{
-  G4int n = emModels.size();
-  if(index >= n) for(G4int i=n; i<index+1; i++) {emModels.push_back(0);}
-  emModels[index] = p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4VEmModel* G4VEnergyLossProcess::EmModel(G4int index)
+{
-  G4VEmModel* p = 0;
-  if(index >= 0 && index <  G4int(emModels.size())) p = emModels[index];
-  return p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetFluctModel(G4VEmFluctuationModel* p)
+{
-  fluctModel = p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4VEmFluctuationModel* G4VEnergyLossProcess::FluctModel()
+{
-  return fluctModel;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::UpdateEmModel(const G4String& nam,
-                                                G4double emin, G4double emax)
+{
-  modelManager->UpdateEmModel(nam, emin, emax);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetIntegral(G4bool val)
+{
-  integral = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetParticle(const G4ParticleDefinition* p)
+{
-  particle = p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetBaseParticle(const G4ParticleDefinition* p)
+{
-  baseParticle = p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetSecondaryParticle(const G4ParticleDefinition* p)
+{
-  secondaryParticle = p;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetLinearLossLimit(G4double val)
+{
-  linLossLimit = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetLossFluctuations(G4bool val)
+{
-  lossFluctuationFlag = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetRandomStep(G4bool val)
+{
-  rndmStepFlag = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetMinSubRange(G4double val)
+{
-  minSubRange = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4VEnergyLossProcess::TablesAreBuilt() const
+{
-  return  tablesAreBuilt;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4int G4VEnergyLossProcess::NumberOfSubCutoffRegions() const
+{
-  return nSCoffRegions;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetDEDXBinning(G4int nbins)
+{
-  nBins = nbins;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetLambdaBinning(G4int nbins)
+{
-  nBins = nbins;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetDEDXBinningForCSDARange(G4int nbins)
+{
-  nBinsCSDA = nbins;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::MinKinEnergy() const
+{
-  return minKinEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetMinKinEnergy(G4double e)
+{
-  minKinEnergy = e;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetMaxKinEnergy(G4double e)
+{
-  maxKinEnergy = e;
-  if(e < maxKinEnergyCSDA) maxKinEnergyCSDA = e;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetMaxKinEnergyForCSDARange(G4double e)
+{
-  maxKinEnergyCSDA = e;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VEnergyLossProcess::MaxKinEnergy() const
+{
-  return maxKinEnergy;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetLambdaFactor(G4double val)
+{
-  if(val > 0.0 && val <= 1.0) lambdaFactor = val;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VEnergyLossProcess::SetIonisation(G4bool val)
+{
-  isIonisation = val;
-  if(val) aGPILSelection = CandidateForSelection;
-  else    aGPILSelection = NotCandidateForSelection;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4bool G4VEnergyLossProcess::IsIonisationProcess() const
+{
-  return isIonisation;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEnergyLossProcess::SetStepFunction(G4double v1, G4double v2)
+{
-  dRoverRange = v1;
-  finalRange = v2;
-  if (dRoverRange > 0.999) dRoverRange = 1.0;
-  currentCouple = 0;
-  mfpKinEnergy  = DBL_MAX;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 #endif

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VMultipleScattering.hh,v 1.48 2007/10/29 08:38:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VMultipleScattering.hh,v 1.55 2009/02/18 12:19:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 12-02-07 Add get/set skin (V.Ivanchenko)
 // 27-10-07 Virtual functions moved to source (V.Ivanchenko)
+// 15-07-08 Reorder class members for further multi-thread development (VI)
 //
 …
 #include "G4VContinuousDiscreteProcess.hh"
-#include "G4LossTableManager.hh"
 #include "globals.hh"
 #include "G4Material.hh"
 …
   G4VMultipleScattering(const G4String& name = "msc",
                               G4ProcessType type = fElectromagnetic);
+                        G4ProcessType type = fElectromagnetic);
   virtual ~G4VMultipleScattering();
 …
   virtual G4bool IsApplicable(const G4ParticleDefinition& p) = 0;
-    // True for all charged particles
   virtual void PrintInfo() = 0;
 …
   virtual void InitialiseProcess(const G4ParticleDefinition*) = 0;
-  //------------------------------------------------------------------------
-  // Methods with standard implementation; may be overwritten if needed
-  //------------------------------------------------------------------------
 public:
 …
   G4bool StorePhysicsTable(const G4ParticleDefinition*,
                            const G4String& directory,
                                  G4bool ascii = false);
+                           G4bool ascii = false);
   // Retrieve Physics from a file.
 …
   G4bool RetrievePhysicsTable(const G4ParticleDefinition*,
                               const G4String& directory,
+                                    G4bool ascii);
+  //------------------------------------------------------------------------
+  // Specific methods for msc processes
+  //------------------------------------------------------------------------
+                              G4bool ascii);
   // The function overloads the corresponding function of the base
 …
   G4double AlongStepGetPhysicalInteractionLength(
                                             const G4Track&,
                                                   G4double  previousStepSize,
                                                   G4double  currentMinimalStep,
                                                   G4double& currentSafety,
                                                   G4GPILSelection* selection);
+                                            G4double  previousStepSize,
+                                            G4double  currentMinimalStep,
+                                            G4double& currentSafety,
+                                            G4GPILSelection* selection);
   // The function overloads the corresponding function of the base
 …
   inline void SetMinKinEnergy(G4double e);
   inline G4double MinKinEnergy() const;
-    // Print out of the class parameters
   inline void SetMaxKinEnergy(G4double e);
 …
   inline G4PhysicsTable* LambdaTable() const;
+  //------------------------------------------------------------------------
+  // Define and access particle type
+  //------------------------------------------------------------------------
+  // access particle type
   inline const G4ParticleDefinition* Particle() const;
-  inline void SetParticle(const G4ParticleDefinition*);
   //------------------------------------------------------------------------
 …
   //------------------------------------------------------------------------
+  inline void AddEmModel(G4int, G4VEmModel*, const G4Region* region = 0);
+protected:
+  // Select model in run time
+  inline G4VEmModel* SelectModel(G4double kinEnergy);
+public:
+  // Select model in run time
   inline G4VEmModel* SelectModelForMaterial(G4double kinEnergy,
                                             size_t& idxRegion) const;
+  // Access to models
+  inline G4VEmModel* GetModelByIndex(G4int idx = 0);
+  //------------------------------------------------------------------------
+  // Parameters for simulation of multiple scattering
+  //------------------------------------------------------------------------
+  // Add model for region, smaller value of order defines which
+  // model will be selected for a given energy interval
+  inline void AddEmModel(G4int order, G4VEmModel*, const G4Region* region = 0);
+  // Access to models by index
+  inline G4VEmModel* GetModelByIndex(G4int idx = 0, G4bool ver = false);
+  //------------------------------------------------------------------------
+  // Get/Set parameters for simulation of multiple scattering
+  //------------------------------------------------------------------------
+  inline G4bool LateralDisplasmentFlag() const;
   inline void SetLateralDisplasmentFlag(G4bool val);
+     // lateral displacement to be/not to be computed
+  inline G4double Skin() const;
   inline void SetSkin(G4double val);
+     // skin parameter
+  inline G4double RangeFactor() const;
   inline void SetRangeFactor(G4double val);
+     // FactorRange parameter
+  inline G4double GeomFactor() const;
   inline void SetGeomFactor(G4double val);
+     // FactorRange parameter
+  inline G4double PolarAngleLimit() const;
+  inline void SetPolarAngleLimit(G4double val);
+  inline G4MscStepLimitType StepLimitType() const;
   inline void SetStepLimitType(G4MscStepLimitType val);
+     // FactorRange parameter
+  //------------------------------------------------------------------------
+  // Run time methods
+  //------------------------------------------------------------------------
 protected:
 …
                            G4double,
                            G4ForceCondition* condition);
-  //------------------------------------------------------------------------
-  // Run time methods
-  //------------------------------------------------------------------------
   // This method is not used for tracking, it returns step limit
 …
                                   G4double& currentSafety);
+  inline G4double GetLambda(const G4ParticleDefinition* p, G4double& kineticEnergy);
+  inline G4double GetLambda(const G4ParticleDefinition* p,
+                            G4double& kineticEnergy);
   // This method is used for tracking, it returns step limit
   inline G4double GetMscContinuousStepLimit(const G4Track& track,
                                             G4double previousStepSize,
+                                            G4double scaledKinEnergy,
                                             G4double currentMinimalStep,
                                             G4double& currentSafety);
   inline G4VEmModel* SelectModel(G4double kinEnergy);
   // Select concrete model
+  // define current material
+  inline void DefineMaterial(const G4MaterialCutsCouple* couple);
   inline const G4MaterialCutsCouple* CurrentMaterialCutsCouple() const;
+  // Return current G4MaterialCutsCouple
+  inline void DefineMaterial(const G4MaterialCutsCouple* couple);
+  // define current material
+  //------------------------------------------------------------------------
+  // Parameters for simulation of multiple scattering
+  //------------------------------------------------------------------------
+  inline G4double Skin() const;
+  inline G4double RangeFactor() const;
+  inline G4double GeomFactor() const;
+  inline G4MscStepLimitType StepLimitType() const;
+  inline G4bool LateralDisplasmentFlag() const;
+  inline G4ParticleChangeForMSC* GetParticleChange();
 private:
   // hide  assignment operator
   G4VMultipleScattering(G4VMultipleScattering &);
   G4VMultipleScattering & operator=(const G4VMultipleScattering &right);
+  // =====================================================================
+protected:
+  G4GPILSelection             valueGPILSelectionMSC;
+  G4ParticleChangeForMSC      fParticleChange;
+private:
+  // ======== Parameters of the class fixed at construction =========
   G4EmModelManager*           modelManager;
+  G4VEmModel*                 currentModel;
+  G4bool                      buildLambdaTable;
+  // ======== Parameters of the class fixed at initialisation =======
   G4PhysicsTable*             theLambdaTable;
-  // cache
   const G4ParticleDefinition* firstParticle;
-  const G4ParticleDefinition* currentParticle;
-  const G4MaterialCutsCouple* currentCouple;
-  size_t                      currentMaterialIndex;
-  G4int                       nBins;
   G4MscStepLimitType          stepLimit;
 …
   G4double                    facrange;
   G4double                    facgeom;
+  G4double                    polarAngleLimit;
+  G4int                       nBins;
   G4bool                      latDisplasment;
+  G4bool                      buildLambdaTable;
+  // ======== Cashed values - may be state dependent ================
+protected:
+  G4GPILSelection             valueGPILSelectionMSC;
+  G4ParticleChangeForMSC      fParticleChange;
+private:
+  G4VEmModel*                 currentModel;
+  // cache
+  const G4ParticleDefinition* currentParticle;
+  const G4MaterialCutsCouple* currentCouple;
+  size_t                      currentMaterialIndex;
 };
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline void G4VMultipleScattering::DefineMaterial(const G4MaterialCutsCouple* couple)
+{
-  if(couple != currentCouple) {
-    currentCouple   = couple;
-    currentMaterialIndex = couple->GetIndex();
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-inline G4double G4VMultipleScattering::GetMscContinuousStepLimit(
-                                          const G4Track& track,
-                                                G4double,
-                                                G4double currentMinimalStep,
-                                                G4double&)
+{
-  G4double x = currentMinimalStep;
-  G4double e = track.GetKineticEnergy();
-  DefineMaterial(track.GetMaterialCutsCouple());
-  currentModel = SelectModel(e);
-  if(x > 0.0 && e > 0.0) {
-    G4double tPathLength =
-      currentModel->ComputeTruePathLengthLimit(track, theLambdaTable, x);
-    if (tPathLength < x) valueGPILSelectionMSC = CandidateForSelection;
-    x = currentModel->ComputeGeomPathLength(tPathLength);
-    //  G4cout << "tPathLength= " << tPathLength
-    //         << " stepLimit= " << x
-    //        << " currentMinimalStep= " << currentMinimalStep<< G4endl;
+  }
-  return x;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
+{
   return GetMscContinuousStepLimit(track,previousStepSize,currentMinimalStep,
+                                      currentSafety);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VMultipleScattering::GetLambda(const G4ParticleDefinition* p, G4double& e)
+                                   currentSafety);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetBinning(G4int nbins)
+{
+  nBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VMultipleScattering::Binning() const
+{
+  return nBins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetMinKinEnergy(G4double e)
+{
+  minKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VMultipleScattering::MinKinEnergy() const
+{
+  return minKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetMaxKinEnergy(G4double e)
+{
+  maxKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VMultipleScattering::MaxKinEnergy() const
+{
+  return maxKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetBuildLambdaTable(G4bool val)
+{
+  buildLambdaTable = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VMultipleScattering::LambdaTable() const
+{
+  return theLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  const G4ParticleDefinition* G4VMultipleScattering::Particle() const
+{
+  return currentParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::AddEmModel(G4int order, G4VEmModel* p,
+                                              const G4Region* region)
+{
+  G4VEmFluctuationModel* fm = 0;
+  modelManager->AddEmModel(order, p, fm, region);
+  if(p) p->SetParticleChange(pParticleChange);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VMultipleScattering::SelectModel(G4double kinEnergy)
+{
+  return modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VMultipleScattering::SelectModelForMaterial(
+                   G4double kinEnergy, size_t& idxRegion) const
+{
+  return modelManager->SelectModel(kinEnergy, idxRegion);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+G4VEmModel* G4VMultipleScattering::GetModelByIndex(G4int idx, G4bool ver)
+{
+  return modelManager->GetModel(idx, ver);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4bool G4VMultipleScattering::LateralDisplasmentFlag() const
+{
+  return latDisplasment;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetLateralDisplasmentFlag(G4bool val)
+{
+  latDisplasment = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::Skin() const
+{
+  return skin;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetSkin(G4double val)
+{
+  if(val < 1.0) skin = 0.0;
+  else          skin = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::RangeFactor() const
+{
+  return facrange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetRangeFactor(G4double val)
+{
+  if(val > 0.0) facrange = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::GeomFactor() const
+{
+  return facgeom;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetGeomFactor(G4double val)
+{
+  if(val > 0.0) facgeom = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::PolarAngleLimit() const
+{
+  return polarAngleLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetPolarAngleLimit(G4double val)
+{
+  if(val < 0.0)     polarAngleLimit = 0.0;
+  else if(val > pi) polarAngleLimit = pi;
+  else              polarAngleLimit = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4MscStepLimitType G4VMultipleScattering::StepLimitType() const
+{
+  return stepLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetStepLimitType(G4MscStepLimitType val)
+{
+  stepLimit = val;
+  if(val == fMinimal) facrange = 0.2;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+G4double G4VMultipleScattering::GetLambda(const G4ParticleDefinition* p,
+                                          G4double& e)
+{
   G4double x;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VMultipleScattering::SelectModel(G4double kinEnergy)
+{
+  return modelManager->SelectModel(kinEnergy, currentMaterialIndex);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VMultipleScattering::SelectModelForMaterial(
+                                           G4double kinEnergy, size_t& idxRegion) const
+{
+  return modelManager->SelectModel(kinEnergy, idxRegion);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetBinning(G4int nbins)
+{
+  nBins = nbins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4int G4VMultipleScattering::Binning() const
+{
+  return nBins;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetMinKinEnergy(G4double e)
+{
+  minKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VMultipleScattering::MinKinEnergy() const
+{
+  return minKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetMaxKinEnergy(G4double e)
+{
+  maxKinEnergy = e;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4double G4VMultipleScattering::MaxKinEnergy() const
+{
+  return maxKinEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4bool G4VMultipleScattering::LateralDisplasmentFlag() const
+{
+  return latDisplasment;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetLateralDisplasmentFlag(G4bool val)
+{
+  latDisplasment = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::Skin() const
+{
+  return skin;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetSkin(G4double val)
+{
+  if(val <= 0.99999) {
+    skin = 0.0;
+    stepLimit = fUseSafety;
+  } else {
+    skin = val;
+    stepLimit = fUseDistanceToBoundary;
+inline G4double G4VMultipleScattering::GetMscContinuousStepLimit(
+                                          const G4Track& track,
+                                          G4double scaledKinEnergy,
+                                          G4double currentMinimalStep,
+                                          G4double&)
+{
+  G4double x = currentMinimalStep;
+  DefineMaterial(track.GetMaterialCutsCouple());
+  currentModel = SelectModel(scaledKinEnergy);
+  if(x > 0.0 && scaledKinEnergy > 0.0) {
+    G4double tPathLength =
+      currentModel->ComputeTruePathLengthLimit(track, theLambdaTable, x);
+    if (tPathLength < x) valueGPILSelectionMSC = CandidateForSelection;
+    x = currentModel->ComputeGeomPathLength(tPathLength);
+    //  G4cout << "tPathLength= " << tPathLength
+    //         << " stepLimit= " << x
+    //        << " currentMinimalStep= " << currentMinimalStep<< G4endl;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::RangeFactor() const
+{
+  return facrange;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetRangeFactor(G4double val)
+{
+  if(val > 0.0) facrange = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  G4double G4VMultipleScattering::GeomFactor() const
+{
+  return facgeom;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetGeomFactor(G4double val)
+{
+  if(val > 0.0) facgeom = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4MscStepLimitType G4VMultipleScattering::StepLimitType() const
+{
+  return stepLimit;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::SetStepLimitType(G4MscStepLimitType val)
+{
+  stepLimit = val;
+  if(val == fMinimal) {
+    skin = 0;
+    facrange = 0.2;
+  } else if(val == fUseSafety) {
+    skin = 0;
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+void G4VMultipleScattering::DefineMaterial(const G4MaterialCutsCouple* couple)
+{
+  if(couple != currentCouple) {
+    currentCouple   = couple;
+    currentMaterialIndex = couple->GetIndex();
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  void G4VMultipleScattering::SetBuildLambdaTable(G4bool val)
+{
+   buildLambdaTable = val;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline  const G4ParticleDefinition* G4VMultipleScattering::Particle() const
+{
+  return currentParticle;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4PhysicsTable* G4VMultipleScattering::LambdaTable() const
+{
+  return theLambdaTable;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline
+const G4MaterialCutsCouple* G4VMultipleScattering::CurrentMaterialCutsCouple() const
+inline const G4MaterialCutsCouple*
+G4VMultipleScattering::CurrentMaterialCutsCouple() const
+{
   return currentCouple;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline void G4VMultipleScattering::AddEmModel(G4int order, G4VEmModel* p,
+                                              const G4Region* region)
+{
+  G4VEmFluctuationModel* fm = 0;
+  modelManager->AddEmModel(order, p, fm, region);
+  if(p)p->SetParticleChange(pParticleChange);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+inline G4VEmModel* G4VMultipleScattering::GetModelByIndex(G4int idx)
+{
+  return modelManager->GetModel(idx);
+inline G4ParticleChangeForMSC* G4VMultipleScattering::GetParticleChange()
+{
+  return &fParticleChange;
+}

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionEffectiveCharge.hh,v 1.8 2006/08/15 16:21:39 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionEffectiveCharge.hh,v 1.12 2008/09/20 19:39:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "globals.hh"
+#include "G4ParticleDefinition.hh"
 class G4Material;
 class G4ParticleDefinition;
+class G4NistManager;
 class G4ionEffectiveCharge
 …
   G4ionEffectiveCharge(const G4ionEffectiveCharge&);
+  G4NistManager*              nist;
+  const G4ParticleDefinition* lastPart;
+  const G4Material*           lastMat;
+  G4double                    lastKinEnergy;
   G4double                    chargeCorrection;
+  G4double                    effCharge;
   G4double                    energyHighLimit;
   G4double                    energyLowLimit;
 …
                                  G4double kineticEnergy)
+{
+  G4double charge = EffectiveCharge(p,material,kineticEnergy)/eplus;
+  charge *= chargeCorrection;
+  G4double charge = effCharge;
+  if( kineticEnergy != lastKinEnergy || material != lastMat || p != lastPart) {
+    charge = EffectiveCharge(p,material,kineticEnergy);
+  }
+  charge *= chargeCorrection/CLHEP::eplus;
   return charge*charge;

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

r819	r961
25	25	//
26	26	// $Id: G4DummyModel.cc,v 1.3 2007/05/22 17:31:58 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmCalculator.cc,v 1.37 2007/08/16 15:55:42 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EmCalculator.cc,v 1.46 2009/02/24 09:56:03 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //            10 keV to 1 keV (V. Ivanchenko)
 // 15.03.2007 Add ComputeEnergyCutFromRangeCut methods (V.Ivanchenko)
+// 21.04.2008 Updated computations for ions (V.Ivanchenko)
 //
 // Class Description:
 …
   if(couple && UpdateParticle(p, kinEnergy) ) {
     res = manager->GetDEDX(p, kinEnergy, couple);
+    if(isIon) {
+      G4double eth = 2.0*MeV/massRatio;
+      if(kinEnergy > eth) {
+        G4double x1 = corr->ComputeIonCorrections(p,mat,kinEnergy);
+        G4double x2 = corr->ComputeIonCorrections(p,mat,eth);
+        res += x1 - x2*eth/kinEnergy;
+        /*
+        G4cout << "### GetDEDX: E= " << kinEnergy << " res= " << res
+               << " x1= " << x1 << " x2= " << x2
+               << " del= " << x1 - x2*eth/kinEnergy << G4endl;;
+        */
+      }
+    }
     if(verbose>0) {
       G4cout << "G4EmCalculator::GetDEDX: E(MeV)= " << kinEnergy/MeV
 …
         res = currentModel->ComputeDEDXPerVolume(
               mat, baseParticle, escaled, cut) * chargeSquare;
         if(verbose > 1)
+        if(verbose > 1) {
           G4cout <<  baseParticle->GetParticleName()
                  << " Escaled(MeV)= " << escaled;
+        }
       } else {
         res = currentModel->ComputeDEDXPerVolume(mat, p, kinEnergy, cut);
         if(verbose > 1) G4cout <<  " no basePart E(MeV)= " << kinEnergy;
+      }
       if(verbose > 1)
+      if(verbose > 1) {
         G4cout << " DEDX(MeV/mm)= " << res*mm/MeV
                << " DEDX(MeV*cm^2/g)= "
                << res*gram/(MeV*cm2*mat->GetDensity())
                << G4endl;
+      if(isIon) {
+        if(currentModel->HighEnergyLimit() > 100.*MeV)
+          res += corr->HighOrderCorrections(p,mat,kinEnergy);
+        else
+          res *= corr->EffectiveChargeCorrection(p,mat,kinEnergy);
+        if(verbose > 1)
+          G4cout << "After Corrections: DEDX(MeV/mm)= " << res*mm/MeV
+                 << " DEDX(MeV*cm^2/g)= " << res*gram/(MeV*cm2*mat->GetDensity())
+                 << G4endl;
+      }
+      }
       // emulate boundary region for different parameterisations
       G4double eth = currentModel->LowEnergyLimit();
 …
           res0 = loweModel->ComputeDEDXPerVolume(mat, p, eth, cut);
+        }
         if(verbose > 1)
+        if(verbose > 1) {
           G4cout << "At boundary energy(MeV)= " << eth/MeV
                  << " DEDX(MeV/mm)= " << res1*mm/MeV
                  << G4endl;
+        if(isIon) res1 += corr->HighOrderCorrections(p,mat,eth/massRatio);
+        //G4cout << "eth= " << eth << " escaled= " << escaled
+        //  << " res0= " << res0 << " res1= "
+        //       << res1 <<  "  q2= " << chargeSquare << G4endl;
+        }
+        /*
+        G4cout << "eth= " << eth << " escaled= " << escaled
+               << " res0= " << res0 << " res1= "
+               << res1 <<  "  q2= " << chargeSquare << G4endl;
+        */
         res *= (1.0 + (res0/res1 - 1.0)*eth/escaled);
+        if(isIon) {
+          G4double ethscaled = eth/massRatio;
+          if(kinEnergy > ethscaled) {
+            G4double x1 = corr->ComputeIonCorrections(p,mat,kinEnergy);
+            G4double x2 = corr->ComputeIonCorrections(p,mat,ethscaled);
+            res += x1 - x2*ethscaled/kinEnergy;
+          }
+          if(verbose > 1) {
+            G4cout << "After Corrections: DEDX(MeV/mm)= " << res*mm/MeV
+                   << " DEDX(MeV*cm^2/g)= " << res*gram/(MeV*cm2*mat->GetDensity())
+                   << G4endl;
+          }
+        }
+      }
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EmCalculator::ComputeTotalDEDX(G4double kinEnergy, const G4ParticleDefinition* part,
+                                          const G4Material* mat, G4double cut)
+G4double G4EmCalculator::ComputeTotalDEDX(G4double kinEnergy,
+                                          const G4ParticleDefinition* part,
+                                          const G4Material* mat,
+                                          G4double cut)
+{
   G4double dedx = ComputeElectronicDEDX(kinEnergy,part,mat,cut);
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EmCalculator::ComputeTotalDEDX(G4double kinEnergy, const G4String& part,
+                                          const G4String& mat, G4double cut)
+G4double G4EmCalculator::ComputeTotalDEDX(G4double kinEnergy,
+                                          const G4String& part,
+                                          const G4String& mat,
+                                          G4double cut)
+{
   return ComputeTotalDEDX(kinEnergy,FindParticle(part),FindMaterial(mat),cut);
 …
     if(currentProcess) currentProcessName = currentProcess->GetProcessName();
+    if(p->GetParticleType() == "nucleus" &&
+       currentParticleName  != "deuteron" && currentParticleName != "triton") {
+    if(p->GetParticleType() == "nucleus"
+       && currentParticleName != "deuteron"
+       && currentParticleName != "triton"
+       && currentParticleName != "alpha+"
+       && currentParticleName != "helium"
+       && currentParticleName != "hydrogen"
+      ) {
       baseParticle = theGenericIon;
       massRatio = baseParticle->GetPDGMass()/p->GetPDGMass();
 …
   if(isIon) {
     chargeSquare =
+     ionEffCharge->EffectiveChargeSquareRatio(p, currentMaterial, kinEnergy);
+    if(currentProcess)
+     ionEffCharge->EffectiveChargeSquareRatio(p, currentMaterial, kinEnergy)
+      * corr->EffectiveChargeCorrection(p,currentMaterial,kinEnergy);
+    if(currentProcess) {
       currentProcess->SetDynamicMassCharge(massRatio,chargeSquare);
+    // G4cout << "massR= " << massRatio << "   q2= " << chargeSquare << G4endl;
+      //G4cout << "NewP: massR= " << massRatio << "   q2= " << chargeSquare << G4endl;
+    }
+  }
   return true;

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmCorrections.cc,v 1.23.2.1 2008/04/22 15:28:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EmCorrections.cc,v 1.51 2008/12/18 13:01:44 gunter Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 08.05.2007 V.Ivanchenko Use G4IonTable for ion mass instead of NistTable to avoid
 //                         division by zero
+// 29.02.2008 V.Ivanchenko use expantions for log and power function
+// 21.04.2008 Updated computations for ions (V.Ivanchenko)
+// 20.05.2008 Removed Finite Size correction (V.Ivanchenko)
 //
 //
 …
 #include "G4EmCorrections.hh"
 #include "Randomize.hh"
-#include "G4NistManager.hh"
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
 #include "G4VEmModel.hh"
 #include "G4Proton.hh"
+#include "G4GenericIon.hh"
 #include "G4LPhysicsFreeVector.hh"
+#include "G4PhysicsLogVector.hh"
+#include "G4ProductionCutsTable.hh"
+#include "G4MaterialCutsCouple.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4EmCorrections::G4EmCorrections()
+{
-  Initialise();
   particle   = 0;
   curParticle= 0;
 …
   curVector  = 0;
   kinEnergy  = 0.0;
+  ionModel   = 0;
+  ionLEModel = 0;
+  ionHEModel = 0;
   nIons      = 0;
   verbose    = 1;
+  ncouples   = 0;
   massFactor = 1.0;
+  eth        = 2.0*MeV;
+  nbinCorr   = 20;
+  eCorrMin   = 25.*keV;
+  eCorrMax   = 250.*MeV;
   nist = G4NistManager::Instance();
   ionTable = G4ParticleTable::GetParticleTable()->GetIonTable();
+  Initialise();
+}
 …
 G4double G4EmCorrections::HighOrderCorrections(const G4ParticleDefinition* p,
                                                const G4Material* mat,
                                                G4double e)
+                                               G4double e, G4double)
+{
 // . Z^3 Barkas effect in the stopping power of matter for charged particles
 …
   G4double Bloch  = BlochCorrection (p, mat, e);
   G4double Mott   = MottCorrection (p, mat, e);
+  G4double FSize  = FiniteSizeCorrection (p, mat, e);
+  G4double sum = (2.0*(Barkas + Bloch) + FSize + Mott);
+  G4double sum = (2.0*(Barkas + Bloch) + Mott);
   if(verbose > 1)
     G4cout << "EmCorrections: E(MeV)= " << e/MeV << " Barkas= " << Barkas
            << " Bloch= " << Bloch << " Mott= " << Mott << " Fsize= " << FSize
+           << " Bloch= " << Bloch << " Mott= " << Mott
            << " Sum= " << sum << G4endl;
   sum *= material->GetElectronDensity() * q2 *  twopi_mc2_rcl2 /beta2;
+  return sum;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EmCorrections::IonBarkasCorrection(const G4ParticleDefinition* p,
+                                              const G4Material* mat,
+                                              G4double e)
+{
+// . Z^3 Barkas effect in the stopping power of matter for charged particles
+//   J.C Ashley and R.H.Ritchie
+//   Physical review B Vol.5 No.7 1 April 1972 pagg. 2393-2397
+//   and ICRU49 report
+//   valid for kineticEnergy < 0.5 MeV
+  SetupKinematics(p, mat, e);
+  G4double res = 0.0;
+  if(tau > 0.0)
+    res = 2.0*BarkasCorrection(p, mat, e)*
+      material->GetElectronDensity() * q2 *  twopi_mc2_rcl2 /beta2;
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EmCorrections::ComputeIonCorrections(const G4ParticleDefinition* p,
+                                                const G4Material* mat,
+                                                G4double e)
+{
+// . Z^3 Barkas effect in the stopping power of matter for charged particles
+//   J.C Ashley and R.H.Ritchie
+//   Physical review B Vol.5 No.7 1 April 1972 pagg. 2393-2397
+//   and ICRU49 report
+//   valid for kineticEnergy < 0.5 MeV
+//   Other corrections from S.P.Ahlen Rev. Mod. Phys., Vol 52, No1, 1980
+  SetupKinematics(p, mat, e);
+  if(tau <= 0.0) return 0.0;
+  G4double Barkas = BarkasCorrection (p, mat, e);
+  G4double Bloch  = BlochCorrection (p, mat, e);
+  G4double Mott   = MottCorrection (p, mat, e);
+  G4double sum = 2.0*(Barkas*(charge - 1.0)/charge + Bloch) + Mott;
+  if(verbose > 1) {
+    G4cout << "EmCorrections: E(MeV)= " << e/MeV << " Barkas= " << Barkas
+           << " Bloch= " << Bloch << " Mott= " << Mott
+           << " Sum= " << sum << G4endl;
+  }
+  sum *= material->GetElectronDensity() * q2 *  twopi_mc2_rcl2 /beta2;
+  if(verbose > 1) G4cout << " Sum= " << sum << G4endl;
+  return sum;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4EmCorrections::IonHighOrderCorrections(const G4ParticleDefinition* p,
+                                                  const G4MaterialCutsCouple* couple,
+                                                  G4double e)
+{
+// . Z^3 Barkas effect in the stopping power of matter for charged particles
+//   J.C Ashley and R.H.Ritchie
+//   Physical review B Vol.5 No.7 1 April 1972 pagg. 2393-2397
+//   and ICRU49 report
+//   valid for kineticEnergy < 0.5 MeV
+//   Other corrections from S.P.Ahlen Rev. Mod. Phys., Vol 52, No1, 1980
+  G4double sum = 0.0;
+  if(ionHEModel) {
+    G4int Z = G4int(p->GetPDGCharge()/eplus + 0.5);
+    if(Z >= 100)   Z = 99;
+    else if(Z < 1) Z = 1;
+    // fill vector
+    if(thcorr[Z].size() == 0) {
+      thcorr[Z].resize(ncouples);
+      G4double ethscaled = eth*p->GetPDGMass()/proton_mass_c2;
+      for(size_t i=0; i<ncouples; i++) {
+        (thcorr[Z])[i] = ethscaled*ComputeIonCorrections(p, currmat[i], ethscaled);
+        //G4cout << i << ". ethscaled= " << ethscaled
+        //<< " corr= " << (thcorr[Z])[i]/ethscaled << G4endl;
+      }
+    }
+    G4double rest = (thcorr[Z])[couple->GetIndex()];
+    sum = ComputeIonCorrections(p,couple->GetMaterial(),e) - rest/e;
+    if(verbose > 1) G4cout << " Sum= " << sum << " dSum= " << rest/e << G4endl;
+  }
   return sum;
+}
 …
     G4int ieta = Index(y, Eta, nEtaK);
     corr = Value2(x, y, TheK[itet], TheK[itet+1], Eta[ieta], Eta[ieta+1],
+                  CK[itet][ieta], CK[itet+1][ieta], CK[itet][ieta+1], CK[itet+1][ieta+1]);
+                  CK[itet][ieta], CK[itet+1][ieta],
+                  CK[itet][ieta+1], CK[itet+1][ieta+1]);
     //G4cout << "   x= " <<x<<" y= "<<y<<" tet= " <<TheK[itet]
     //<<" "<< TheK[itet+1]<<" eta= "<< Eta[ieta]<<" "<< Eta[ieta+1]
 …
     else {
       G4int iw = Index(W, engBarkas, 47);
+      val = Value(W, engBarkas[iw], engBarkas[iw+1], corBarkas[iw], corBarkas[iw+1]);
+      val = Value(W, engBarkas[iw], engBarkas[iw+1],
+                  corBarkas[iw], corBarkas[iw+1]);
+    }
     //    G4cout << "i= " << i << " b= " << b << " W= " << W
 …
+{
   SetupKinematics(p, mat, e);
+  G4double mterm = pi*fine_structure_const*beta*charge;
+  /*
+  G4double mterm = 0.0;
+  if(beta > 0.0) {
+    // Estimation of mean square root of the ionisation potential
+    G4double Zeff = 0.0;
+    G4double norm = 0.0;
+    for (G4int i = 0; i<numberOfElements; i++) {
+      G4double Z = (*theElementVector)[i]->GetZ();
+      Zeff += Z*atomDensity[i];
+      norm += atomDensity[i];
+    }
+    Zeff *= (2.0/norm);
+    G4double ze1 = std::log(Zeff);
+    G4double eexc= material->GetIonisation()->GetMeanExcitationEnergy()*ze1*ze1/Zeff;
+    G4double invbeta = 1.0/beta;
+    G4double invbeta2= invbeta*invbeta;
+    G4double za  = charge*fine_structure_const;
+    G4double za2 = za*za;
+    G4double za3 = za2*za;
+    G4double x   = za*invbeta;
+    G4double cosx;
+    if(x < COSEB[13]) {
+      G4int i = Index(x,COSEB,14);
+      cosx    = Value(x,COSEB[i], COSEB[i+1],COSXI[i],COSXI[i+1]);
+    } else {
+      cosx = COSXI[13]*COSEB[13]/x;
+    }
+    mterm =
+      za*beta*(1.725 + pi*cosx*(0.52 - 2.0*std::sqrt(eexc/(2.0*electron_mass_c2*bg2))));
+      + za2*(3.246 - 0.451*beta2)
+      + za3*(1.522*beta + 0.987*invbeta)
+      + za2*za2*(4.569 - 0.494*beta2 - 2.696*invbeta2)
+      + za3*za2*(1.254*beta + 0.222*invbeta - 1.17*invbeta*invbeta2);
+  }
+*/
+  G4double mterm = CLHEP::pi*fine_structure_const*beta*charge;
   return mterm;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4EmCorrections::FiniteSizeCorrection(const G4ParticleDefinition* p,
-                                               const G4Material* mat,
-                                               G4double e)
-  // Finite size corrections are parameterized according to
-  // J.D.Jackson Phys. Rev. D59 (1998) 017301
+{
-  if(p) return 0.0;
-  SetupKinematics(p, mat, e);
-  G4double term = 0.0;
-  G4double numlim = 0.2;
-  //Leptons
-  if(p->GetLeptonNumber() != 0) {
-    G4double x =  tmax/(e + mass);
-    term = x*x;
-    // Pions and Kaons
-  } else if(p->GetPDGSpin() == 0.0 && q2 < 1.5) {
-    G4double xpi = 0.736*GeV;
-    G4double x   = 2.0*electron_mass_c2*tmax0/(xpi*xpi);
-    if(x <= numlim) term = -x*(1.0 - 0.5*x);
-    else            term = -std::log(1.0 + x);
-    // Protons and baryons
-  } else if(q2 < 1.5) {
-    G4double xp = 0.8426*GeV;
-    G4double x  = 2.0*electron_mass_c2*tmax0/(xp*xp);
-    G4double ksi2 = 2.79285*2.79285;
-    if(x <= numlim) term = -x*((1.0 + 5.0*x/6.0)/((1.0 + x)*(1 + x)) + 0.5*x);
-    else term = -x*(1.0 + 5.0*x/6.0)/((1.0 + x)*(1 + x)) - std::log(1.0 + x);
-    G4double b  = xp*0.5/mass;
-    G4double c  = xp*mass/(electron_mass_c2*(mass + e));
-    G4double lb = b*b;
-    G4double lb2= lb*lb;
-    G4double nu = 0.5*c*c;
-    G4double x1 = 1.0 + x;
-    G4double x2 = x1*x1;
-    G4double l1 = 1.0 - lb;
-    G4double l2 = l1*l1;
-    G4double lx = 1.0 + lb*x;
-    G4double ia = lb2*(lx*std::log(lx/x1)/x + l1 -
-.5*x*l2/(lb*x1) +
-                       x*(3.0 + 2.0*x)*l2*l1/(6.0*x2*lb2))/(l2*l2);
-    G4double ib = x*x*(3.0 + x)/(6.0*x2*x1);
-    term += lb*((ksi2 - 1.0)*ia + nu*ksi2*ib);
-    // G4cout << "Proton F= " << term << " ia= " << ia << " ib= " << ib << " lb= " << lb<< G4endl;
-    //ions
-  } else {
-    G4double xp = 0.8426*GeV/std::pow(mass/proton_mass_c2,-0.33333333);
-    G4double x  = 2.0*electron_mass_c2*tmax0/(xp*xp);
-    if(x <= numlim) term = -x*(1.0 - 0.5*x);
-    else            term = -std::log(1.0 + x);
-    //G4cout << "Ion F= " << term << G4endl;
+  }
-  return term;
+}
 …
   if (er >= ed[0])       nloss = a[0];
   else {
+    // the table is inverse in energy
     for (G4int i=102; i>=0; i--)
+    {
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4ionEffectiveCharge* G4EmCorrections::GetIonEffectiveCharge(G4VEmModel* m)
+{
-  if(m) ionModel = m;
-  return &effCharge;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4int G4EmCorrections::GetNumberOfStoppingVectors()
+{
-  return nIons;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4double G4EmCorrections::EffectiveChargeCorrection(const G4ParticleDefinition* p,
                                                     const G4Material* mat,
 …
+{
   G4double factor = 1.0;
+  if(p->GetPDGCharge() <= 2.5*eplus) return factor;
+  if(verbose > 1)
+    G4cout << "EffectiveChargeCorrection: " << p->GetParticleName() << " in " << mat->GetName()
+  if(p->GetPDGCharge() <= 2.5*eplus || nIons <= 0) return factor;
+  /*
+  if(verbose > 1) {
+    G4cout << "EffectiveChargeCorrection: " << p->GetParticleName()
+           << " in " << mat->GetName()
            << " ekin(MeV)= " << ekin/MeV << G4endl;
+  }
+  */
   if(p != curParticle || mat != curMaterial) {
     curParticle = p;
     curMaterial = 0;
+    curMaterial = mat;
     curVector   = 0;
+    G4int Z = p->GetAtomicNumber();
+    G4int A = p->GetAtomicMass();
+    if(verbose > 1) G4cout << "Zion= " << Z << " Aion= " << A << G4endl;
+    massFactor = proton_mass_c2/ionTable->GetIonMass(Z,A);
+    idx = 0;
+    for(; idx<nIons; idx++) {
+      if(Z == Zion[idx] && A == Aion[idx]) {
+        if(materialList[idx] == mat) {
+          curMaterial = mat;
+          curVector = stopData[idx];
+          break;
+        } else if(materialList[idx] == 0) {
+          if(materialName[idx] == mat->GetName())
+            curVector = InitialiseMaterial(mat);
+        }
+    currentZ = p->GetAtomicNumber();
+    if(verbose > 1) {
+      G4cout << "G4EmCorrections::EffectiveChargeCorrection: Zion= "
+             << currentZ << " Aion= " << p->GetPDGMass()/amu_c2 << G4endl;
+    }
+    massFactor = proton_mass_c2/p->GetPDGMass();
+    idx = -1;
+    G4int dz = 1000;
+    for(G4int i=0; i<nIons; i++) {
+      if(materialList[i] == mat) {
+        G4int delz = currentZ - Zion[i];
+        if(delz < 0) delz = -delz;
+        if(delz < dz) {
+          idx = i;
+          dz = delz;
+          if(0 == delz) break;
+        }
+      }
+    }
+    //    G4cout << " idx= " << idx << " dz= " << dz << G4endl;
+    if(idx > 0) {
+      if(!ionList[idx]) BuildCorrectionVector();
+      if(ionList[idx])  curVector = stopData[idx];
+    }
+  }
 …
     G4bool b;
     factor = curVector->GetValue(ekin*massFactor,b);
+  }
+  if(verbose > 1) G4cout << "  factor= " << factor << G4endl;
+    if(verbose > 1) {
+      G4cout << "E= " << ekin << " factor= " << factor << " massfactor= "
+             << massFactor << G4endl;
+    }
+  }
   return factor;
+}
 …
 void G4EmCorrections::AddStoppingData(G4int Z, G4int A,
                                       const G4String& mname,
+                                      G4PhysicsVector& dVector)
+{
+  idx = 0;
+  for(; idx<nIons; idx++) {
+    if(Z == Zion[idx] && A == Aion[idx] && mname == materialName[idx])
+      break;
+  }
+  if(idx == nIons) {
+                                      G4PhysicsVector* dVector)
+{
+  G4int i = 0;
+  for(; i<nIons; i++) {
+    if(Z == Zion[i] && A == Aion[i] && mname == materialName[i]) break;
+  }
+  if(i == nIons) {
     Zion.push_back(Z);
     Aion.push_back(A);
     materialName.push_back(mname);
     materialList.push_back(0);
+    stopData.push_back(0);
+    ionList.push_back(0);
+    stopData.push_back(dVector);
     nIons++;
+  } else {
+    if(stopData[idx]) delete stopData[idx];
+  }
+  size_t nbins = dVector.GetVectorLength();
+  size_t n = 0;
+  for(; n<nbins; n++) {
+    if(dVector.GetLowEdgeEnergy(n) > 2.0*MeV) break;
+  }
+  if(n < nbins) nbins = n + 1;
+  G4LPhysicsFreeVector* v =
+    new G4LPhysicsFreeVector(nbins,
+                             dVector.GetLowEdgeEnergy(0),
+                             dVector.GetLowEdgeEnergy(nbins-1));
+    if(verbose>1) {
+      G4cout << "AddStoppingData Z= " << Z << " A= " << A << " " << mname
+             << "  idx= " << i << G4endl;
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmCorrections::BuildCorrectionVector()
+{
+  if(!ionLEModel || !ionHEModel) {
+    return;
+  }
+  const G4ParticleDefinition* ion = curParticle;
+  G4int Z = Zion[idx];
+  if(currentZ != Z) {
+    ion = G4ParticleTable::GetParticleTable()->FindIon(Z, Aion[idx], 0, Z);
+  }
+  //G4cout << "BuildCorrectionVector: idx= " << idx << " Z= " << Z
+  //     << " curZ= " << currentZ << G4endl;
+  // G4double A = nist->GetAtomicMassAmu(Z);
+  G4double A = G4double(ion->GetBaryonNumber());
+  G4PhysicsVector* v = stopData[idx];
+  const G4ParticleDefinition* p = G4GenericIon::GenericIon();
+  G4double massRatio = proton_mass_c2/ion->GetPDGMass();
+  if(verbose>1) {
+    G4cout << "BuildCorrectionVector: Stopping for "
+           << curParticle->GetParticleName() << " in "
+           << materialName[idx] << " Ion Z= " << Z << " A= " << A
+           << " massRatio= " << massRatio << G4endl;
+  }
   G4bool b;
+  for(size_t i=0; i<nbins; i++) {
+    G4double e = dVector.GetLowEdgeEnergy(i);
+    G4double dedx = dVector.GetValue(e, b);
+    v->PutValues(i, e, dedx);
+  }
+  //  G4cout << *v << G4endl;
+  stopData[idx] = v;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4PhysicsVector* G4EmCorrections::InitialiseMaterial(const G4Material* mat)
+{
+  G4PhysicsVector* v = 0;
+  const G4Material* m = nist->FindOrBuildMaterial(materialName[idx],false);
+  if(m) {
+    materialList[idx] = m;
+    curMaterial = mat;
+    v = stopData[idx];
+    size_t nbins = v->GetVectorLength();
+    const G4ParticleDefinition* p = G4Proton::Proton();
+    if(verbose>1) G4cout << "G4ionIonisation::InitialiseMaterial Stooping data for "
+                         << materialName[idx] << G4endl;
+    G4bool b;
+    for(size_t i=0; i<nbins; i++) {
+      G4double e = v->GetLowEdgeEnergy(i);
+      G4double dedx = v->GetValue(e, b);
+      G4double dedx1= ionModel->ComputeDEDXPerVolume(mat, p, e, e)*
+        effCharge.EffectiveChargeSquareRatio(curParticle,mat,e/massFactor);
+      v->PutValue(i, dedx/dedx1);
+      if(verbose>1) G4cout << "  E(meV)= " << e/MeV << "   Correction= " << dedx/dedx1
+                           << "   "  << dedx << " " << dedx1 << G4endl;
+    }
+  }
+  return v;
+  G4PhysicsLogVector* vv =
+    new G4PhysicsLogVector(eCorrMin,eCorrMax,nbinCorr);
+  vv->SetSpline(true);
+  G4double e, eion, dedx, dedx1;
+  G4double eth0 = v->GetLowEdgeEnergy(0);
+  G4double escal = eth/massRatio;
+  G4double qe =
+    effCharge.EffectiveChargeSquareRatio(ion, curMaterial, escal);
+  G4double dedxt =
+    ionLEModel->ComputeDEDXPerVolume(curMaterial, p, eth, eth)*qe;
+  G4double dedx1t =
+    ionHEModel->ComputeDEDXPerVolume(curMaterial, p, eth, eth)*qe
+    + ComputeIonCorrections(curParticle, curMaterial, escal);
+  G4double rest = escal*(dedxt - dedx1t);
+  //G4cout << "Escal(MeV)= "<<escal<<" dedxt0= " <<dedxt
+  //     << " dedxt1= " << dedx1t << G4endl;
+  for(G4int i=0; i<nbinCorr; i++) {
+    e = vv->GetLowEdgeEnergy(i);
+    escal = e/massRatio;
+    eion  = escal/A;
+    if(eion <= eth0) {
+      dedx = v->GetValue(eth0, b)*std::sqrt(eion/eth0);
+    } else {
+      dedx = v->GetValue(eion, b);
+    }
+    qe = effCharge.EffectiveChargeSquareRatio(curParticle,curMaterial,escal);
+    if(e <= eth) {
+      dedx1 = ionLEModel->ComputeDEDXPerVolume(curMaterial, p, e, e)*qe;
+    } else {
+      dedx1 = ionHEModel->ComputeDEDXPerVolume(curMaterial, p, e, e)*qe +
+        ComputeIonCorrections(curParticle, curMaterial, escal) + rest/escal;
+    }
+    vv->PutValue(i, dedx/dedx1);
+    if(verbose>1) {
+      G4cout << "  E(meV)= " << e/MeV << "   Correction= " << dedx/dedx1
+             << "   "  << dedx << " " << dedx1
+             << "  massF= " << massFactor << G4endl;
+    }
+  }
+  delete v;
+  ionList[idx]  = ion;
+  stopData[idx] = vv;
+  if(verbose>1) G4cout << "End data set " << G4endl;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmCorrections::InitialiseForNewRun()
+{
+  G4ProductionCutsTable* tb = G4ProductionCutsTable::GetProductionCutsTable();
+  ncouples = tb->GetTableSize();
+  if(currmat.size() != ncouples) {
+    currmat.resize(ncouples);
+    size_t i;
+    for(i=0; i<100; i++) {thcorr[i].clear();}
+    for(i=0; i<ncouples; i++) {
+      currmat[i] = tb->GetMaterialCutsCouple(i)->GetMaterial();
+      G4String nam = currmat[i]->GetName();
+      for(G4int j=0; j<nIons; j++) {
+        if(nam == materialName[j]) { materialList[j] = currmat[i]; }
+      }
+    }
+  }
+}

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmModelManager.cc,v 1.40 2007/11/09 11:35:54 vnivanch Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EmModelManager.cc,v 1.46 2008/10/13 14:56:56 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4RegionModels::G4RegionModels(G4int nMod, std::vector<G4int>& list, G4DataVector& lowE)
+G4RegionModels::G4RegionModels(G4int nMod, std::vector<G4int>& indx,
+                               G4DataVector& lowE, const G4Region* reg)
+{
   nModelsForRegion      = nMod;
   theListOfModelIndexes = new G4int [nModelsForRegion];
   lowKineticEnergy      = new G4double [nModelsForRegion];
+  lowKineticEnergy      = new G4double [nModelsForRegion+1];
   for (G4int i=0; i<nModelsForRegion; i++) {
     theListOfModelIndexes[i] = list[i];
+    theListOfModelIndexes[i] = indx[i];
     lowKineticEnergy[i] = lowE[i];
+  }
+  lowKineticEnergy[nModelsForRegion] = lowE[nModelsForRegion];
+  theRegion = reg;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-#include "G4LossTableManager.hh"
 #include "G4Step.hh"
 #include "G4ParticleDefinition.hh"
 …
 #include "G4MaterialCutsCouple.hh"
 #include "G4ProductionCutsTable.hh"
-#include "G4Region.hh"
 #include "G4RegionStore.hh"
 #include "G4Gamma.hh"
 #include "G4Positron.hh"
+#include "G4UnitsTable.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
   regions.clear();
   orderOfModels.clear();
-  upperEkin.clear();
   maxCutInRange    = 12.*cm;
   maxSubCutInRange = 0.7*mm;
 …
 G4EmModelManager::~G4EmModelManager()
+{
-  G4int i,j;
   Clear();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmModelManager::Clear()
+{
   if(1 < verboseLevel) {
+    G4cout << "G4EmModelManager:: delete models ";
+    if(particle) G4cout << " for " << particle->GetParticleName();
+    G4cout << " nModels=" << nEmModels <<G4endl;
+  }
+  for(i = 0; i<nEmModels; i++) {
+    orderOfModels[i] = 1;
+  }
+  for(i = 0; i<nEmModels; i++) {
+    if (orderOfModels[i]) {
+      orderOfModels[i] = 0;
+      for(j = i+1; j<nEmModels; j++) {
+        if(models[i] == models[j]) orderOfModels[j] = 0;
+      }
+      G4String nam = models[i]->GetName();
+      if(nam != "PAI" && nam != "PAIModel" ) delete models[i];
+    }
+  }
+  for(i = 0; i<nEmModels; i++) {
+    orderOfModels[i] = 1;
+  }
+  for(i = 0; i<nEmModels; i++) {
+    if (orderOfModels[i]) {
+      orderOfModels[i] = 0;
+      for(j = i+1; j<nEmModels; j++) {
+        if(flucModels[i] == flucModels[j]) orderOfModels[j] = 0;
+      }
+      delete flucModels[i];
+    }
+  }
+  if(1 < verboseLevel)
+    G4cout << "G4EmModelManager:: models are deleted!" << G4endl;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmModelManager::Clear()
+{
+  if(1 < verboseLevel) {
+    G4cout << "G4EmModelManager::Clear()";
+    if(particle) G4cout << " for " << particle->GetParticleName();
+    G4cout << G4endl;
+    G4cout << "G4EmModelManager::Clear()" << G4endl;
+  }
   theCuts.clear();
   theSubCuts.clear();
-  upperEkin.clear();
   if(idxOfRegionModels) delete [] idxOfRegionModels;
   if(setOfRegionModels && nRegions) {
 …
   orderOfModels.push_back(num);
   p->DefineForRegion(r);
-  if (nEmModels>0) {
-    G4int idx = nEmModels;
-    do {idx--;} while (idx && num < orderOfModels[idx]);
-    if (num >= orderOfModels[idx] && num <= orderOfModels[idx+1]) idx++;
-    if (idx < nEmModels) {
-      models[nEmModels] = models[idx];
-      flucModels[nEmModels] = flucModels[idx];
-      regions[nEmModels] = regions[idx];
-      orderOfModels[nEmModels] = orderOfModels[idx];
-      models[idx] = p;
-      flucModels[idx] = fm;
-      regions[idx] = r;
-      orderOfModels[idx] = num;
+    }
+  }
   nEmModels++;
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4VEmModel* G4EmModelManager::GetModel(G4int i)
+G4VEmModel* G4EmModelManager::GetModel(G4int i, G4bool ver)
+{
   G4VEmModel* m = 0;
   if(i >= 0 && i < nEmModels) m = models[i];
   else if(verboseLevel > 0)
+  if(i >= 0 && i < nEmModels) {m = models[i];}
+  else if(verboseLevel > 0 && ver) {
     G4cout << "G4EmModelManager::GetModel WARNING: "
            << "index " << i << " is wrong Nmodels= "
+           << nEmModels << G4endl;
+           << nEmModels;
+    if(particle) G4cout << " for " << particle->GetParticleName();
+    G4cout<< G4endl;
+  }
   return m;
+}
 …
 const G4DataVector* G4EmModelManager::Initialise(const G4ParticleDefinition* p,
                                                  const G4ParticleDefinition* sp,
                                                        G4double theMinSubRange,
                                                        G4int val)
+                                                 G4double theMinSubRange,
+                                                 G4int val)
+{
   verboseLevel = val;
 …
   // Identify the list of regions with different set of models
   nRegions = 1;
   std::vector<const G4Region*> set;
   set.push_back(world);
+  std::vector<const G4Region*> setr;
+  setr.push_back(world);
   G4bool isWorld = false;
 …
       if (nRegions>1) {
         for (G4int j=1; j<nRegions; j++) {
           if ( r == set[j] ) newRegion = false;
+          if ( r == setr[j] ) newRegion = false;
+        }
+      }
       if (newRegion) {
         set.push_back(r);
+        setr.push_back(r);
         nRegions++;
+      }
 …
   idxOfRegionModels[numOfCouples] = 0;
   setOfRegionModels = new G4RegionModels*[nRegions];
+  upperEkin.resize(nEmModels);
+  std::vector<G4int>    modelAtRegion(nEmModels);
+  std::vector<G4int>    modelOrd(nEmModels);
+  G4DataVector          eLow(nEmModels);
+  G4DataVector          eHigh(nEmModels);
+  G4int nmax = nEmModels;
   // Order models for regions
   for (G4int reg=0; reg<nRegions; reg++) {
+    const G4Region* region = set[reg];
+    const G4Region* region = setr[reg];
     G4int n = 0;
-    std::vector<G4int>    modelAtRegion;
-    G4DataVector            eLow;
-    G4DataVector            eHigh;
-    modelAtRegion.clear();
-    eLow.clear();
-    eHigh.clear();
     if(isWorld || 0 < reg) {
 …
           G4double tmin = model->LowEnergyLimit();
           G4double tmax = model->HighEnergyLimit();
+          if (n>0) tmin = std::max(tmin, eHigh[n-1]);
+          G4int  ord    = orderOfModels[ii];
+          G4bool push   = true;
+          G4bool insert = false;
+          G4int  idx    = n;
           if(1 < verboseLevel) {
 …
                  << " tmin(MeV)= " << tmin/MeV
                  << "; tmax(MeV)= " << tmax/MeV
                  << "; order= " << orderOfModels[ii]
+                 << "; order= " << ord
                  << G4endl;
+          }
+          if (tmin < tmax) {
+            modelAtRegion.push_back(ii);
+            eLow.push_back(tmin);
+            eHigh.push_back(tmax);
+            upperEkin[ii] = tmax;
+            n++;
+          if (n == 0) n++;
+          else {
+            tmin = std::min(tmin, eHigh[n-1]);
+            if(tmin >= tmax) push = false;
+            else {
+              // high energy model
+              if(tmin == eHigh[n-1] && tmax > eHigh[n-1]) n++;
+              else if (tmax > eHigh[n-1]) {
+                // compare order of models
+                for(G4int k = n-1; k>=0; k--) {
+                  if (ord >= modelOrd[k]) {
+                    tmin = std::max(tmin, eHigh[k]);
+                    if(k < n-1) n = k + 2;
+                    break;
+                  } else if (tmin > eLow[k]) {
+                    eHigh[k] = tmin;
+                    n = k + 2;
+                    break;
+                  } else if (tmin == eLow[k]) {
+                    n = k + 1;
+                    break;
+                  }
+                }
+                if(tmin < eLow[0]) n = 1;
+                idx = n - 1;
+                // low energy model
+              } else {
+                tmax = std::max(tmax, eLow[0]);
+                insert = true;
+                push = false;
+                idx = 0;
+                if(tmax <= eLow[0]) tmax = eLow[0];
+                else {
+                  for(G4int k=0; k<n; k++) {
+                    if (ord >= modelOrd[k]) {
+                      if(k == 0) {
+                        if(tmin < eLow[0]) tmax = eLow[0];
+                        else insert = false;
+                        break;
+                      } else {
+                        insert = false;
+                        break;
+                      }
+                    } else if(tmax < eHigh[k]) {
+                      idx = k;
+                      if(k > 0) tmin = eLow[k];
+                      eLow[k] = tmax;
+                      break;
+                    } else if(tmax == eHigh[k]) {
+                      insert = false;
+                      push = true;
+                      idx = k;
+                      if(k > 0) tmin = eLow[k];
+                      else tmin = std::min(tmin,eLow[0]);
+                      break;
+                    } else {
+                      modelAtRegion[k] = ii;
+                      modelOrd[k] = ord;
+                      if(k == 0) eLow[idx] = std::min(tmin,eLow[0]);
+                    }
+                  }
+                }
+                if(insert && idx < n) n++;
+                else insert = false;
+              }
+            }
+          }
+          if(n > nmax) {
+            nmax = n;
+            modelAtRegion.resize(nmax);
+            modelOrd.resize(nmax);
+            eLow.resize(nmax);
+            eHigh.resize(nmax);
+          }
+          if(insert) {
+            for(G4int k=n-2; k>=idx; k--) {
+              modelAtRegion[k+1] = modelAtRegion[k];
+              modelOrd[k+1] = modelOrd[k];
+              eLow[k+1]  = eLow[k];
+              eHigh[k+1] = eHigh[k];
+            }
+          }
+          if (push || insert) {
+            modelAtRegion[idx] = ii;
+            modelOrd[idx] = ord;
+            eLow[idx]  = tmin;
+            eHigh[idx] = tmax;
+          }
+        }
 …
       eLow.push_back(0.0);
       eHigh.push_back(DBL_MAX);
-      upperEkin.push_back(DBL_MAX);
+    }
     eLow[0] = 0.0;
+    if(n >= nmax) eLow.resize(nmax+1);
+    eLow[n] = eHigh[n-1];
     if(1 < verboseLevel) {
 …
       if (region) G4cout << region->GetName();
       G4cout << ">  Elow(MeV)= ";
       for(G4int ii=0; ii<n; ii++) {G4cout << eLow[ii]/MeV << " ";}
+      for(G4int ii=0; ii<=n; ii++) {G4cout << eLow[ii]/MeV << " ";}
       G4cout << G4endl;
+    }
     G4RegionModels* rm = new G4RegionModels(n, modelAtRegion, eLow);
+    G4RegionModels* rm = new G4RegionModels(n, modelAtRegion, eLow, region);
     setOfRegionModels[reg] = rm;
+  }
 …
     G4int reg = nRegions;
     do {reg--;} while (reg>0 && pcuts != (set[reg]->GetProductionCuts()));
+    do {reg--;} while (reg>0 && pcuts != (setr[reg]->GetProductionCuts()));
     idxOfRegionModels[i] = reg;
 …
+{
-  // vectors to provide continues dE/dx
-  G4DataVector factor;
-  G4DataVector dedxLow;
-  G4DataVector dedxHigh;
   G4double e;
 …
     G4cout << "G4EmModelManager::FillDEDXVector() for "
            << couple->GetMaterial()->GetName()
            << "  Ecut(MeV)= " << cut
            << "  Esubcut(MeV)= " << subcut
+           << "  cut(MeV)= " << cut
+           << "  subcut(MeV)= " << subcut
            << "  Type " << tType
            << "  for " << particle->GetParticleName()
 …
   const G4RegionModels* regModels = setOfRegionModels[reg];
   G4int nmod = regModels->NumberOfModels();
+  factor.resize(nmod);
+  dedxLow.resize(nmod);
+  dedxHigh.resize(nmod);
+  // vectors to provide continues dE/dx
+  G4DataVector factor(nmod);
+  G4DataVector eLow(nmod+1);
+  G4DataVector dedxLow(nmod);
+  G4DataVector dedxHigh(nmod);
   if(1 < verboseLevel) {
 …
+  }
   // calculate factors to provide continuity of energy loss
   factor[0] = 1.0;
   G4int j;
 …
   G4int totBinsLoss = aVector->GetVectorLength();
+  dedxLow[0]  = 0.0;
+  e = upperEkin[regModels->ModelIndex(0)];
+  dedxLow[0] = 0.0;
+  eLow[0]    = 0.0;
+  e = regModels->LowEdgeEnergy(1);
+  eLow[1]    = e;
   G4VEmModel* model = models[regModels->ModelIndex(0)];
   dedxHigh[0] = 0.0;
   if(model && cut > subcut) {
     dedxHigh[0] = model->ComputeDEDX(couple,particle,e,cut);
     if(subcut > 0.0)
+    if(subcut > 0.0) {
       dedxHigh[0] -= model->ComputeDEDX(couple,particle,e,subcut);
+    }
+  }
   if(nmod > 1) {
     for(j=1; j<nmod; j++) {
+      e = upperEkin[regModels->ModelIndex(j-1)];
+      e = regModels->LowEdgeEnergy(j);
+      eLow[j]   = e;
       G4int idx = regModels->ModelIndex(j);
       dedxLow[j] = models[idx]->ComputeDEDX(couple,particle,e,cut);
       if(subcut > 0.0)
+      if(subcut > 0.0) {
         dedxLow[j] -= models[idx]->ComputeDEDX(couple,particle,e,subcut);
+      }
       if(subcut == cut) dedxLow[j] = 0.0;
+      e = upperEkin[idx];
+      e = regModels->LowEdgeEnergy(j+1);
+      eLow[j+1] = e;
       dedxHigh[j] = models[idx]->ComputeDEDX(couple,particle,e,cut);
       if(subcut > 0.0)
+      if(subcut > 0.0) {
         dedxHigh[j] -= models[idx]->ComputeDEDX(couple,particle,e,subcut);
+      }
       if(subcut == cut) dedxHigh[j] = 0.0;
+    }
+    if(1 < verboseLevel) {
+      G4cout << " model #0"
+             << "  dedx(" << eLow[0] << ")=  " << dedxLow[0]
+             << "  dedx(" << eLow[1] << ")=  " << dedxHigh[0]
+             << G4endl;
+    }
     for(j=1; j<nmod; j++) {
+      if(dedxLow[j] > 0.0) factor[j] = (dedxHigh[j-1]/dedxLow[j] - 1.0);
+      else                 factor[j] = 0.0;
+      if(dedxLow[j] > 0.0) {
+        factor[j] = (dedxHigh[j-1]/dedxLow[j] - 1.0)*eLow[j];
+      } else  factor[j] = 0.0;
+      if(1 < verboseLevel) {
+        G4cout << " model #" << j
+               << "  dedx(" << eLow[j] << ")=  " << dedxLow[j]
+               << "  dedx(" << eLow[j+1] << ")=  " << dedxHigh[j]
+               << "  factor= " << factor[j]/eLow[j]
+               << G4endl;
+      }
+    }
 …
       // Choose a model of energy losses
     G4int k = 0;
     if (nmod > 1 && e > upperEkin[regModels->ModelIndex(0)]) {
+    if (nmod > 1 && e > eLow[1]) {
       do {
         k++;
         fac *= (1.0 + factor[k]*upperEkin[regModels->ModelIndex(k-1)]/e);
       } while (k<nmod-1 && e > upperEkin[regModels->ModelIndex(k)] );
+        fac *= (1.0 + factor[k]/e);
+      } while (k+1 < nmod && e > eLow[k+1]);
+    }
 …
                                         G4EmTableType tType)
+{
-  // vectors to provide continues cross section
-  G4DataVector factor;
-  G4DataVector sigmaLow;
-  G4DataVector sigmaHigh;
   G4double e;
 …
   const G4RegionModels* regModels = setOfRegionModels[reg];
   G4int nmod = regModels->NumberOfModels();
+  factor.resize(nmod);
+  sigmaLow.resize(nmod);
+  sigmaHigh.resize(nmod);
+  // vectors to provide continues dE/dx
+  G4DataVector factor(nmod);
+  G4DataVector eLow(nmod+1);
+  G4DataVector sigmaLow(nmod);
+  G4DataVector sigmaHigh(nmod);
   if(2 < verboseLevel) {
 …
   G4int totBinsLambda = aVector->GetVectorLength();
+  sigmaLow[0]  = 0.0;
+  e = upperEkin[regModels->ModelIndex(0)];
+  sigmaLow[0] = 0.0;
+  eLow[0]     = 0.0;
+  e = regModels->LowEdgeEnergy(1);
+  eLow[1]     = e;
   G4VEmModel* model = models[regModels->ModelIndex(0)];
   sigmaHigh[0] = 0.0;
 …
     for(j=1; j<nmod; j++) {
+      e  = upperEkin[regModels->ModelIndex(j-1)];
+      sigmaLow[j] =
+        models[regModels->ModelIndex(j)]->CrossSection(couple,particle,e,cut,tmax);
+      e  = upperEkin[regModels->ModelIndex(j)];
+      sigmaHigh[j] =
+        models[regModels->ModelIndex(j)]->CrossSection(couple,particle,e,cut,tmax);
+      e  = regModels->LowEdgeEnergy(j);
+      eLow[j]   = e;
+      G4int idx = regModels->ModelIndex(j);
+      sigmaLow[j] = models[idx]->CrossSection(couple,particle,e,cut,tmax);
+      e  = regModels->LowEdgeEnergy(j+1);
+      eLow[j+1] = e;
+      sigmaHigh[j] = models[idx]->CrossSection(couple,particle,e,cut,tmax);
+    }
+    if(1 < verboseLevel) {
+      G4cout << " model #0"
+             << "  sigma(" << eLow[0] << ")=  " << sigmaLow[0]
+             << "  sigma(" << eLow[1] << ")=  " << sigmaHigh[0]
+             << G4endl;
+    }
+    for(j=1; j<nmod; j++) {
+      if(sigmaLow[j] > 0.0) {
+        factor[j] = (sigmaHigh[j-1]/sigmaLow[j] - 1.0)*eLow[j];
+      } else  factor[j] = 0.0;
       if(1 < verboseLevel) {
+        G4cout << " model #" << j << "   eUp= " << e
+               << "  sigmaUp= " << sigmaHigh[j]
+               << "  sigmaDown= " << sigmaLow[j]
+        G4cout << " model #" << j
+               << "  sigma(" << eLow[j] << ")=  " << sigmaLow[j]
+               << "  sigma(" << eLow[j+1] << ")=  " << sigmaHigh[j]
+               << "  factor= " << factor[j]/eLow[j]
                << G4endl;
+      }
+    }
-    for(j=1; j<nmod; j++) {
-      if(sigmaLow[j] > 0.0) factor[j] = (sigmaHigh[j-1]/sigmaLow[j] - 1.0);
-      else                  factor[j] = 0.0;
+    }
+  }
 …
     G4int k = 0;
     G4double fac = 1.0;
     if (nmod > 1 && e > upperEkin[regModels->ModelIndex(0)]) {
+    if (nmod > 1 && e > eLow[1]) {
       do {
         k++;
         fac *= (1.0 + factor[k]*upperEkin[regModels->ModelIndex(k-1)]/e);
       } while (k<nmod-1 && e > upperEkin[regModels->ModelIndex(k)] );
+        fac *= (1.0 + factor[k]/e);
+      } while ( k+1 < nmod && e > eLow[k+1] );
+    }
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmModelManager::DumpModelList(G4int verb)
+{
+  if(verb == 0) return;
+  for(G4int i=0; i<nRegions; i++) {
+    G4RegionModels* r = setOfRegionModels[i];
+    const G4Region* reg = r->Region();
+    if(verb > 1 || nRegions > 1) {
+    }
+    G4int n = r->NumberOfModels();
+    if(verb > 1 || n > 0) {
+      G4cout << "      ===== EM models for the G4Region  " << reg->GetName()
+             << " ======" << G4endl;;
+      for(G4int j=0; j<n; j++) {
+        const G4VEmModel* m = models[r->ModelIndex(j)];
+        G4cout << std::setw(20);
+        G4cout << m->GetName() << " :     Emin= "
+               << std::setw(10) << G4BestUnit(r->LowEdgeEnergy(j),"Energy")
+               << "        Emax=   "
+               << G4BestUnit(r->LowEdgeEnergy(j+1),"Energy")
+               << G4endl;
+      }
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

r819	r961
25	25	//
26	26	// $Id: G4EmMultiModel.cc,v 1.6 2007/05/22 17:31:58 vnivanch Exp $
27		// GEANT4 tag $Name: $
	27	// GEANT4 tag $Name: geant4-09-02-ref-02 $
28	28	//
29	29	// -------------------------------------------------------------------

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4EmProcessOptions.cc,v 1.22 2007/11/07 18:38:49 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EmProcessOptions.cc,v 1.26 2009/02/18 14:43:27 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4VMultipleScattering.hh"
 #include "G4Region.hh"
+#include "G4RegionStore.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmProcessOptions::ActivateDeexcitation(G4bool val, const G4Region* r)
+{
+  const std::vector<G4VEnergyLossProcess*>& v =
+        theManager->GetEnergyLossProcessVector();
+  std::vector<G4VEnergyLossProcess*>::const_iterator itr;
+  for(itr = v.begin(); itr != v.end(); itr++) {
+    G4VEnergyLossProcess* p = *itr;
+    if(p) p->ActivateDeexcitation(val,r);
+  }
+  const std::vector<G4VEmProcess*>& w =
+        theManager->GetEmProcessVector();
+  std::vector<G4VEmProcess*>::const_iterator itp;
+  for(itp = w.begin(); itp != w.end(); itp++) {
+    G4VEmProcess* q = *itp;
+    if(q) q->ActivateDeexcitation(val,r);
+void G4EmProcessOptions::ActivateDeexcitation(const G4String& pname,
+                                              G4bool val,
+                                              const G4String& reg)
+{
+  G4RegionStore* regionStore = G4RegionStore::GetInstance();
+  const G4Region* r = 0;
+  if(reg == "" || reg == "World") {
+    r = regionStore->GetRegion("DefaultRegionForTheWorld", false);
+  } else {
+    r = regionStore->GetRegion(reg, false);
+  }
+  if(!r) {
+    G4cout << "G4EmProcessOptions::ActivateDeexcitation ERROR: G4Region <"
+           << reg << "> not found, the command ignored" << G4endl;
+    return;
+  }
+  const std::vector<G4VEnergyLossProcess*>& v =
+        theManager->GetEnergyLossProcessVector();
+  std::vector<G4VEnergyLossProcess*>::const_iterator itr;
+  for(itr = v.begin(); itr != v.end(); itr++) {
+    G4VEnergyLossProcess* p = *itr;
+    if(p) {
+      if(pname == p->GetProcessName()) p->ActivateDeexcitation(val,r);
+    }
+  }
+  const std::vector<G4VEmProcess*>& w =
+        theManager->GetEmProcessVector();
+  std::vector<G4VEmProcess*>::const_iterator itp;
+  for(itp = w.begin(); itp != w.end(); itp++) {
+    G4VEmProcess* q = *itp;
+    if(q) {
+      if(pname == q->GetProcessName()) q->ActivateDeexcitation(val,r);
+    }
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmProcessOptions::SetPolarAngleLimit(G4double val)
+{
+  const std::vector<G4VMultipleScattering*>& u =
+        theManager->GetMultipleScatteringVector();
+  std::vector<G4VMultipleScattering*>::const_iterator itm;
+  for(itm = u.begin(); itm != u.end(); itm++) {
+    if(*itm) (*itm)->SetPolarAngleLimit(val);
+  }
+  const std::vector<G4VEmProcess*>& w =
+        theManager->GetEmProcessVector();
+  std::vector<G4VEmProcess*>::const_iterator itp;
+  for(itp = w.begin(); itp != w.end(); itp++) {
+    G4VEmProcess* q = *itp;
+    if(q) q->SetPolarAngleLimit(val);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4EmProcessOptions::SetLPMFlag(G4bool val)
+{
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4EmProcessOptions::SetSplineFlag(G4bool val)
+{
+  theManager->SetSplineFlag(val);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4EmProcessOptions::SetLinearLossLimit(G4double val)
+{

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

-              r819
+              r961
 //
 //
 // $Id: G4EnergyLossMessenger.cc,v 1.29 2007/06/11 14:56:51 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4EnergyLossMessenger.cc,v 1.37 2009/02/18 14:43:27 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 16-03-07 modify /process/eLoss/minsubsec command (V.Ivanchenko)
 // 18-05-07 add /process/msc directory and commands (V.Ivanchenko)
+// 11-03-08 add /process/em directory and commands (V.Ivanchenko)
 //
 // -------------------------------------------------------------------
 …
   mscDirectory = new G4UIdirectory("/process/msc/");
   mscDirectory->SetGuidance("Commands for EM scattering processes.");
+  emDirectory = new G4UIdirectory("/process/em/");
+  emDirectory->SetGuidance("General commands for EM processes.");
   RndmStepCmd = new G4UIcmdWithABool("/process/eLoss/rndmStep",this);
 …
   IntegCmd = new G4UIcmdWithABool("/process/eLoss/integral",this);
   IntegCmd->SetGuidance("Switch true/false the integration of cross section over step.");
+  IntegCmd->SetGuidance("Switch true/false the integral option");
   IntegCmd->SetParameterName("integ",true);
   IntegCmd->SetDefaultValue(true);
 …
   rangeCmd = new G4UIcmdWithABool("/process/eLoss/CSDARange",this);
   rangeCmd->SetGuidance("Switch true/false the precise range calculation.");
+  rangeCmd->SetGuidance("Switch true/false the CSDA range calculation");
   rangeCmd->SetParameterName("range",true);
   rangeCmd->SetDefaultValue(true);
 …
   lpmCmd = new G4UIcmdWithABool("/process/eLoss/LPM",this);
   lpmCmd->SetGuidance("Switch true/false the LPM effect calculation.");
+  lpmCmd->SetGuidance("The flag of the LPM effect calculation");
   lpmCmd->SetParameterName("lpm",true);
   lpmCmd->SetDefaultValue(true);
   lpmCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  splCmd = new G4UIcmdWithABool("/process/em/spline",this);
+  splCmd->SetGuidance("The flag of usage spline for Physics Vectors");
+  splCmd->SetParameterName("spl",true);
+  splCmd->SetDefaultValue(false);
+  splCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  aplCmd = new G4UIcmdWithABool("/process/em/applyCuts",this);
+  aplCmd->SetGuidance("The flag to Apply Cuts for gamma processes");
+  aplCmd->SetParameterName("apl",true);
+  aplCmd->SetDefaultValue(false);
+  aplCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  deexCmd = new G4UIcommand("/process/em/deexcitation",this);
+  deexCmd->SetGuidance("Set deexcitation flag per process and G4Region.");
+  deexCmd->SetGuidance("  procName  : process name");
+  deexCmd->SetGuidance("  flag      : flag");
+  deexCmd->SetGuidance("  regName   : G4Region name");
+  G4UIparameter* pName = new G4UIparameter("pName",'s',false);
+  deexCmd->SetParameter(pName);
+  G4UIparameter* flag = new G4UIparameter("flag",'s',false);
+  deexCmd->SetParameter(flag);
+  G4UIparameter* regName = new G4UIparameter("regName",'s',false);
+  deexCmd->SetParameter(regName);
   dedxCmd = new G4UIcmdWithAnInteger("/process/eLoss/binsDEDX",this);
   dedxCmd->SetGuidance("Set number of bins for DEDX tables.");
+  dedxCmd->SetGuidance("Set number of bins for DEDX tables");
   dedxCmd->SetParameterName("binsDEDX",true);
   dedxCmd->SetDefaultValue(120);
 …
   lamCmd = new G4UIcmdWithAnInteger("/process/eLoss/binsLambda",this);
   lamCmd->SetGuidance("Set number of bins for Lambda tables.");
+  lamCmd->SetGuidance("Set number of bins for Lambda tables");
   lamCmd->SetParameterName("binsL",true);
   lamCmd->SetDefaultValue(120);
 …
   verCmd = new G4UIcmdWithAnInteger("/process/eLoss/verbose",this);
   verCmd->SetGuidance("Set verbose level for EM physics.");
+  verCmd->SetGuidance("Set verbose level for EM physics");
   verCmd->SetParameterName("verb",true);
   verCmd->SetDefaultValue(1);
   verCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  ver1Cmd = new G4UIcmdWithAnInteger("/process/em/verbose",this);
+  ver1Cmd->SetGuidance("Set verbose level for EM physics");
+  ver1Cmd->SetParameterName("verb1",true);
+  ver1Cmd->SetDefaultValue(1);
+  ver1Cmd->AvailableForStates(G4State_PreInit,G4State_Idle);
   lllCmd = new G4UIcmdWithADouble("/process/eLoss/linLossLimit",this);
   lllCmd->SetGuidance("Set linearLossLimit parameter.");
+  lllCmd->SetGuidance("Set linearLossLimit parameter");
   lllCmd->SetParameterName("linlim",true);
   lllCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
   labCmd = new G4UIcmdWithADouble("/process/eLoss/lambdaFactor",this);
   labCmd->SetGuidance("Set lambdaFactor parameter.");
+  labCmd = new G4UIcmdWithADouble("/process/eLoss/LambdaFactor",this);
+  labCmd->SetGuidance("Set lambdaFactor parameter for integral option");
   labCmd->SetParameterName("Fl",true);
   labCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
   mscCmd = new G4UIcmdWithAString("/process/msc/StepLimit",this);
   mscCmd->SetGuidance("Set msc step limitation type.");
+  mscCmd->SetGuidance("Set msc step limitation type");
   mscCmd->SetParameterName("StepLim",true);
   mscCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
   latCmd = new G4UIcmdWithABool("/process/msc/LateralDisplacement",this);
   latCmd->SetGuidance("Switch true/false sampling of latra dislacent.");
+  latCmd->SetGuidance("Set flag of sampling of lateral displacement");
   latCmd->SetParameterName("lat",true);
   latCmd->SetDefaultValue(true);
 …
   frCmd = new G4UIcmdWithADouble("/process/msc/RangeFactor",this);
   frCmd->SetGuidance("Set RangeFactor parameter for msc process.");
+  frCmd->SetGuidance("Set RangeFactor parameter for msc processes");
   frCmd->SetParameterName("Fr",true);
   frCmd->SetRange("Fr>0");
 …
   fgCmd = new G4UIcmdWithADouble("/process/msc/GeomFactor",this);
   fgCmd->SetGuidance("Set GeomFactor parameter for msc process.");
+  fgCmd->SetGuidance("Set GeomFactor parameter for msc processes");
   fgCmd->SetParameterName("Fg",true);
   fgCmd->SetRange("Fg>0");
 …
   skinCmd = new G4UIcmdWithADouble("/process/msc/Skin",this);
   skinCmd->SetGuidance("Set skin parameter for multiple scattering.");
+  skinCmd->SetGuidance("Set skin parameter for msc processes");
   skinCmd->SetParameterName("skin",true);
   skinCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  angCmd = new G4UIcmdWithADoubleAndUnit("/process/msc/ThetaLimit",this);
+  angCmd->SetGuidance("Set the limit on the polar angle");
+  angCmd->SetParameterName("theta",true);
+  angCmd->SetUnitCategory("Angle");
+  angCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+}
 …
   delete MinSubSecCmd;
   delete StepFuncCmd;
+  delete deexCmd;
   delete eLossDirectory;
   delete mscDirectory;
+  delete emDirectory;
   delete MinEnCmd;
   delete MaxEnCmd;
 …
   delete rangeCmd;
   delete lpmCmd;
+  delete splCmd;
+  delete aplCmd;
   delete latCmd;
   delete verCmd;
+  delete ver1Cmd;
   delete mscCmd;
   delete dedxCmd;
 …
   delete labCmd;
   delete skinCmd;
+  delete angCmd;
+}
 …
+  }
+  if (command == deexCmd) {
+    G4String s1 (""), s2(""), s3("");
+    G4bool b = false;
+    std::istringstream is(newValue);
+    is >> s1 >> s2 >> s3;
+    if(s2 == "true") b = true;
+    opt->ActivateDeexcitation(s1,b,s3);
+  }
   if (command == mscCmd) {
     if(newValue == "Minimal")
 …
+  }
   if (command == IntegCmd)
+  if (command == IntegCmd) {
     opt->SetIntegral(IntegCmd->GetNewBoolValue(newValue));
+  }
   if (command == rangeCmd) {
     opt->SetBuildCSDARange(rangeCmd->GetNewBoolValue(newValue));
 …
+  }
+  if (command == splCmd) {
+    opt->SetSplineFlag(splCmd->GetNewBoolValue(newValue));
+    G4UImanager::GetUIpointer()->ApplyCommand("/run/physicsModified");
+  }
+  if (command == aplCmd) {
+    opt->SetApplyCuts(aplCmd->GetNewBoolValue(newValue));
+  }
   if (command == latCmd) {
     opt->SetMscLateralDisplacement(latCmd->GetNewBoolValue(newValue));
 …
+  }
   if (command == verCmd)
+  if (command == verCmd) {
     opt->SetVerbose(verCmd->GetNewIntValue(newValue));
+  if (command == lllCmd)
+  }
+  if (command == ver1Cmd) {
+    opt->SetVerbose(ver1Cmd->GetNewIntValue(newValue));
+  }
+  if (command == lllCmd) {
     opt->SetLinearLossLimit(lllCmd->GetNewDoubleValue(newValue));
   if (command == labCmd)
+  }
+  if (command == labCmd) {
     opt->SetLambdaFactor(labCmd->GetNewDoubleValue(newValue));
+  }
   if (command == skinCmd) {
     opt->SetSkin(skinCmd->GetNewDoubleValue(newValue));
 …
     G4UImanager::GetUIpointer()->ApplyCommand("/run/physicsModified");
+  }
+  if (command == angCmd) {
+    opt->SetPolarAngleLimit(angCmd->GetNewDoubleValue(newValue));
+    G4UImanager::GetUIpointer()->ApplyCommand("/run/physicsModified");
+  }
+}

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

-              r819
+              r961
 //
 //
 // $Id: G4EnergyLossTables.cc,v 1.33 2006/06/29 19:55:09 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4EnergyLossTables.cc,v 1.34 2008/07/08 10:57:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4EnergyLossTables::ParticleHaveNoLoss(const G4ParticleDefinition* aParticle, const G4String& q)
+{
+  G4String s = "G4EnergyLossTables:: " + q + " table not found for "
+             + aParticle->GetParticleName() + "!";
+  G4Exception(s);
+  exit(1);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4EnergyLossTables::ParticleHaveNoLoss(const G4ParticleDefinition* aParticle,
+                                            const G4String& q)
+{
+  G4String s = " " + q + " table not found for "
+             + aParticle->GetParticleName() + " !";
+  G4Exception("G4EnergyLossTables::ParticleHaveNoLoss", "EM01",
+              FatalException, s);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LossTableBuilder.cc,v 1.24 2007/02/16 11:59:35 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4LossTableBuilder.cc,v 1.28 2009/02/18 16:24:47 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4LossTableBuilder::G4LossTableBuilder()
+{}
+{
+  splineFlag = true;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4LossTableBuilder::BuildDEDXTable(G4PhysicsTable* dedxTable,
+                                  const std::vector<G4PhysicsTable*>& list)
+void
+G4LossTableBuilder::BuildDEDXTable(G4PhysicsTable* dedxTable,
+                                   const std::vector<G4PhysicsTable*>& list)
+{
   size_t n_processes = list.size();
 …
     pv = new G4PhysicsLogVector(elow, ehigh, nbins);
+    pv->SetSpline(splineFlag);
     for (size_t j=0; j<nbins; j++) {
       G4double dedx = 0.0;
 …
       G4double dedx1  = pv->GetValue(elow, b);
+      //G4cout << "nbins= " << nbins << " dedx1= " << dedx1 << G4endl;
+      // protection for specific cases dedx=0
       if(dedx1 == 0.0) {
         for (size_t k=1; k<nbins; k++) {
+        for (size_t k=1; k<nbins-1; k++) {
           bin0++;
           elow  = pv->GetLowEdgeEnergy(k);
 …
+      }
+      //G4cout << "nbins= " << nbins << " elow= " << elow << " ehigh= " << ehigh << G4endl;
+      // initialisation of a new vector
       G4PhysicsLogVector* v = new G4PhysicsLogVector(elow, ehigh, nbins);
+      // dedx is exect zero
+      if(nbins <= 2) {
+        v->PutValue(0,1000.);
+        v->PutValue(1,2000.);
+        G4PhysicsTableHelper::SetPhysicsVector(rangeTable, i, v);
+        return;
+      }
+      v->SetSpline(splineFlag);
+      // assumed dedx proportional to beta
       G4double range  = 2.*elow/dedx1;
-      //G4double range  = elow/dedx1;
       v->PutValue(0,range);
       G4double energy1 = elow;
 …
         G4double energy2 = pv->GetLowEdgeEnergy(j+bin0);
-        G4double dedx2   = pv->GetValue(energy2, b);
         G4double de      = (energy2 - energy1) * del;
+        G4double energy  = energy1 - de*0.5;
+        G4bool   yes     = true;
+        //G4bool   yes     = false;
+        if(dedx1 < DBL_MIN || dedx2 < DBL_MIN) yes = false;
+        G4double fac, f;
+        if(yes) fac = std::log(dedx2/dedx1)/std::log(energy2/energy1);
+        else    fac = (dedx2 - dedx1)/(energy2 - energy1);
+        G4double energy  = energy2 + de*0.5;
         for (size_t k=0; k<n; k++) {
           energy += de;
           if(yes) f = dedx1*std::exp(fac*std::log(energy/energy1));
           else    f = dedx1 + fac*(energy - energy1);
+          if(f > DBL_MIN) range  += de/f;
+        }
+          energy -= de;
+          dedx1 = pv->GetValue(energy, b);
+          if(dedx1 > 0.0) range += de/dedx1;
+        }
         //      G4cout << "Range i= " <<i << " j= " << j << G4endl;
         v->PutValue(j,range);
         energy1 = energy2;
-        dedx1   = dedx2;
+      }
       G4PhysicsTableHelper::SetPhysicsVector(rangeTable, i, v);
 …
       G4double rlow  = pv->GetValue(elow, b);
       G4double rhigh = pv->GetValue(ehigh, b);
-      rhigh *= std::exp(std::log(rhigh/rlow)/((G4double)(nbins-1)));
       G4LPhysicsFreeVector* v = new G4LPhysicsFreeVector(nbins,rlow,rhigh);
+      v->SetSpline(splineFlag);
       for (size_t j=0; j<nbins; j++) {
         G4double e  = pv->GetLowEdgeEnergy(j);
 …
         v->PutValues(j,r,e);
+      }
+      v->PutValues(nbins,rhigh+rlow,ehigh);
       G4PhysicsTableHelper::SetPhysicsVector(invRangeTable, i, v);

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4LossTableManager.cc,v 1.84 2007/06/14 07:28:48 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4LossTableManager.cc,v 1.95 2008/11/13 18:23:39 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 12-02-07 Add SetSkin, SetLinearLossLimit (V.Ivanchenko)
 // 18-06-07 Move definition of msc parameters to G4EmProcessOptions (V.Ivanchenko)
+// 21-02-08 Add G4EmSaturation (V.Ivanchenko)
 //
 // Class Description:
 …
 #include "G4PhysicsTableHelper.hh"
 #include "G4EmCorrections.hh"
+#include "G4EmSaturation.hh"
 #include "G4EmTableType.hh"
 #include "G4LossTableBuilder.hh"
 …
   size_t msc = msc_vector.size();
   for (size_t j=0; j<msc; j++) {
     if(msc_vector[j] ) delete msc_vector[j];
+    if( msc_vector[j] ) delete msc_vector[j];
+  }
   size_t emp = emp_vector.size();
   for (size_t k=0; k<emp; k++) {
+    if(emp_vector[k] ) delete emp_vector[k];
+    if( emp_vector[k] ) delete emp_vector[k];
+  }
+  size_t mod = mod_vector.size();
+  for (size_t a=0; a<mod; a++) {
+    if( mod_vector[a] ) delete mod_vector[a];
+  }
+  size_t fmod = fmod_vector.size();
+  for (size_t b=0; b<fmod; b++) {
+    if( fmod_vector[b] ) delete fmod_vector[b];
+  }
   Clear();
 …
   delete tableBuilder;
   delete emCorrections;
+  delete emSaturation;
+}
 …
   tableBuilder = new G4LossTableBuilder();
   emCorrections= new G4EmCorrections();
+  emSaturation = new G4EmSaturation();
   integral = true;
   integralActive = false;
 …
   stepFunctionActive = false;
   flagLPM = true;
+  splineFlag = true;
   bremsTh = DBL_MAX;
   verbose = 1;
+  tableBuilder->SetSplineFlag(splineFlag);
+}
 …
+{
   msc_vector.push_back(p);
   if(verbose > 1)
+  if(verbose > 1) {
     G4cout << "G4LossTableManager::Register G4VMultipleScattering : "
            << p->GetProcessName() << G4endl;
+  }
+}
 …
+{
   emp_vector.push_back(p);
   if(verbose > 1)
+  if(verbose > 1) {
     G4cout << "G4LossTableManager::Register G4VEmProcess : "
            << p->GetProcessName() << G4endl;
+  }
+}
 …
   for (size_t i=0; i<emp; i++) {
     if(emp_vector[i] == p) emp_vector[i] = 0;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+void G4LossTableManager::Register(G4VEmModel* p)
+{
+  mod_vector.push_back(p);
+  if(verbose > 1) {
+    G4cout << "G4LossTableManager::Register G4VEmModel : "
+           << p->GetName() << G4endl;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+void G4LossTableManager::DeRegister(G4VEmModel* p)
+{
+  size_t n = mod_vector.size();
+  for (size_t i=0; i<n; i++) {
+    if(mod_vector[i] == p) mod_vector[i] = 0;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+void G4LossTableManager::Register(G4VEmFluctuationModel* p)
+{
+  fmod_vector.push_back(p);
+  if(verbose > 1) {
+    G4cout << "G4LossTableManager::Register G4VEmFluctuationModel : "
+           << p->GetName() << G4endl;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+void G4LossTableManager::DeRegister(G4VEmFluctuationModel* p)
+{
+  size_t n = fmod_vector.size();
+  for (size_t i=0; i<n; i++) {
+    if(fmod_vector[i] == p) fmod_vector[i] = 0;
+  }
+}
 …
      const G4ParticleDefinition* aParticle)
+{
+  G4String s = "G4LossTableManager:: dE/dx table not found for "
+             + aParticle->GetParticleName() + "!";
+  G4Exception(s);
+  exit(1);
+  G4String s = " dE/dx table not found for "
+             + aParticle->GetParticleName() + " !";
+  G4Exception("G4LossTableManager::ParticleHaveNoLoss", "EM01",
+              FatalException, s);
+}
 …
     p = loss_vector[i];
     if (p && aParticle == part_vector[i] && !tables_are_built[i]) {
+      if (p->IsIonisationProcess() && isActive[i] || !em || (em && !isActive[iem]) ) {
+      if ((p->IsIonisationProcess() && isActive[i]) ||
+          !em || (em && !isActive[iem]) ) {
         em = p;
         iem= i;
 …
   dedx = em->IonisationTable();
   if (1 < n_dedx) {
     em->SetDEDXTable(dedx, fIonisation);
+    em->SetDEDXTable(dedx, fIsIonisation);
     dedx = 0;
     dedx  = G4PhysicsTableHelper::PreparePhysicsTable(dedx);
 …
     G4PhysicsTable* dedxSub = em->IonisationTableForSubsec();
     if (1 < listSub.size()) {
       em->SetDEDXTable(dedxSub, fSubIonisation);
+      em->SetDEDXTable(dedxSub, fIsSubIonisation);
       dedxSub = 0;
       dedxSub = G4PhysicsTableHelper::PreparePhysicsTable(dedxSub);
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+void G4LossTableManager::SetSplineFlag(G4bool val)
+{
+  splineFlag = val;
+  tableBuilder->SetSplineFlag(splineFlag);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4bool G4LossTableManager::SplineFlag() const
+{
+  return splineFlag;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4EmCorrections* G4LossTableManager::EmCorrections()
+{
+  return emCorrections;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4EmSaturation* G4LossTableManager::EmSaturation()
+{
+  return emSaturation;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmFluctuationModel.cc,v 1.2 2006/06/29 19:55:15 gunter Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4VEmFluctuationModel.cc,v 1.4 2009/02/19 11:25:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4VEmFluctuationModel.hh"
+#include "G4LossTableManager.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
 G4VEmFluctuationModel::G4VEmFluctuationModel(const G4String& nam)
   : name(nam)
+{
+  G4LossTableManager::Instance()->Register(this);
+}
+G4VEmFluctuationModel::~G4VEmFluctuationModel()
+{
+  G4LossTableManager::Instance()->DeRegister(this);
+}
+void G4VEmFluctuationModel::InitialiseMe(const G4ParticleDefinition*)
 {}
+G4VEmFluctuationModel::~G4VEmFluctuationModel()
+void G4VEmFluctuationModel::SetParticleAndCharge(const G4ParticleDefinition*,
+                                                 G4double)
 {}

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmModel.cc,v 1.8 2007/09/25 10:19:07 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEmModel.cc,v 1.25 2009/02/19 09:57:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 25.10.2005 Set default highLimit=100.TeV (V.Ivanchenko)
 // 06.02.2006 add method ComputeMeanFreePath() (mma)
+// 16.02.2009 Move implementations of virtual methods to source (VI)
 //
 //
 …
 #include "G4VEmModel.hh"
+#include "G4LossTableManager.hh"
+#include "G4ProductionCutsTable.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 G4VEmModel::G4VEmModel(const G4String& nam):
+ lowLimit(0.1*keV), highLimit(100.0*TeV), fluc(0), name(nam), pParticleChange(0)
+{}
+  fluc(0), name(nam), lowLimit(0.1*keV), highLimit(100.0*TeV),
+  polarAngleLimit(0.0),secondaryThreshold(DBL_MAX),theLPMflag(false),
+  pParticleChange(0),nuclearStopping(false),
+  currentCouple(0),currentElement(0),
+  nsec(5),flagDeexcitation(false)
+{
+  xsec.resize(nsec);
+  nSelectors = 0;
+  G4LossTableManager::Instance()->Register(this);
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4VEmModel::~G4VEmModel()
+{}
+{
+  G4LossTableManager::Instance()->DeRegister(this);
+  G4int n = elmSelectors.size();
+  if(n > 0) {
+    for(G4int i=0; i<n; i++) {
+      delete elmSelectors[i];
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::InitialiseElementSelectors(const G4ParticleDefinition* p,
+                                            const G4DataVector& cuts)
+{
+  // initialise before run
+  flagDeexcitation = false;
+  G4int nbins = G4int(std::log10(highLimit/lowLimit) + 0.5);
+  if(nbins < 3) nbins = 3;
+  G4bool spline = G4LossTableManager::Instance()->SplineFlag();
+  G4ProductionCutsTable* theCoupleTable=
+    G4ProductionCutsTable::GetProductionCutsTable();
+  G4int numOfCouples = theCoupleTable->GetTableSize();
+  // prepare vector
+  if(numOfCouples > nSelectors) {
+    elmSelectors.resize(numOfCouples);
+    nSelectors = numOfCouples;
+  }
+  // initialise vector
+  for(G4int i=0; i<numOfCouples; i++) {
+    const G4MaterialCutsCouple* couple =
+      theCoupleTable->GetMaterialCutsCouple(i);
+    const G4Material* material = couple->GetMaterial();
+    G4int idx = couple->GetIndex();
+    // selector already exist check if should be deleted
+    G4bool create = true;
+    if(elmSelectors[i]) {
+      if(material == elmSelectors[i]->GetMaterial()) create = false;
+      else delete elmSelectors[i];
+    }
+    if(create) {
+      elmSelectors[i] = new G4EmElementSelector(this,material,nbins,
+                                                lowLimit,highLimit,spline);
+    }
+    elmSelectors[i]->Initialise(p, cuts[idx]);
+    //elmSelectors[i]->Dump(p);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeDEDXPerVolume(const G4Material*,
+                                          const G4ParticleDefinition*,
+                                          G4double,G4double)
+{
+  return 0.0;
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
 G4double G4VEmModel::CrossSectionPerVolume(const G4Material* material,
                                            const G4ParticleDefinition* p,
+                                                 G4double ekin,
+                                                 G4double emin,
+                                                 G4double emax)
+{
+                                           G4double ekin,
+                                           G4double emin,
+                                           G4double emax)
+{
+  SetupForMaterial(p, material, ekin);
   G4double cross = 0.0;
   const G4ElementVector* theElementVector = material->GetElementVector();
   const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume();
+  size_t nelm = material->GetNumberOfElements();
+  for (size_t i=0; i<nelm; i++) {
+    const G4Element* elm = (*theElementVector)[i];
+  G4int nelm = material->GetNumberOfElements();
+  if(nelm > nsec) {
+    xsec.resize(nelm);
+    nsec = nelm;
+  }
+  for (G4int i=0; i<nelm; i++) {
     cross += theAtomNumDensityVector[i]*
       ComputeCrossSectionPerAtom(p,ekin,elm->GetZ(),elm->GetN(),emin,emax);
+      ComputeCrossSectionPerAtom(p,(*theElementVector)[i],ekin,emin,emax);
     xsec[i] = cross;
+  }
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeMeanFreePath(const G4ParticleDefinition* p,
+                                               G4double ekin,
+                                         const G4Material* material,
+                                               G4double emin,
+                                               G4double emax)
+{
+  G4double mfp = DBL_MAX;
+  G4double cross = CrossSectionPerVolume(material,p,ekin,emin,emax);
+  if (cross > DBL_MIN) mfp = 1./cross;
+  return mfp;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                                G4double, G4double, G4double,
+                                                G4double, G4double)
+{
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::MinEnergyCut(const G4ParticleDefinition*,
+                                  const G4MaterialCutsCouple*)
+{
+  return 0.0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                          const G4Material*, G4double)
+{
+  G4double q = p->GetPDGCharge()/CLHEP::eplus;
+  return q*q;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::GetParticleCharge(const G4ParticleDefinition* p,
+                                       const G4Material*, G4double)
+{
+  return p->GetPDGCharge();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                      const G4DynamicParticle*,
+                                      G4double&,G4double&,G4double)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::SampleDeexcitationAlongStep(const G4Material*,
+                                             const G4Track&,
+                                             G4double& )
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                        G4double kineticEnergy)
+{
+  return kineticEnergy;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::SampleScattering(const G4DynamicParticle*, G4double)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeTruePathLengthLimit(const G4Track&,
+                                                G4PhysicsTable*,
+                                                G4double)
+{
+  return DBL_MAX;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeGeomPathLength(G4double truePathLength)
+{
+  return truePathLength;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+G4double G4VEmModel::ComputeTrueStepLength(G4double geomPathLength)
+{
+  return geomPathLength;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::DefineForRegion(const G4Region*)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void G4VEmModel::SetupForMaterial(const G4ParticleDefinition*,
+                                  const G4Material*, G4double)
+{}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEmProcess.cc,v 1.48 2007/10/29 08:38:58 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEmProcess.cc,v 1.62 2009/02/19 09:57:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4VEmProcess::G4VEmProcess(const G4String& name, G4ProcessType type):
+                      G4VDiscreteProcess(name, type),
+  selectedModel(0),
+  G4VDiscreteProcess(name, type),
+  secondaryParticle(0),
+  buildLambdaTable(true),
   theLambdaTable(0),
   theEnergyOfCrossSectionMax(0),
   theCrossSectionMax(0),
-  particle(0),
-  secondaryParticle(0),
-  nLambdaBins(90),
-  lambdaFactor(0.8),
-  currentCouple(0),
   integral(false),
-  buildLambdaTable(true),
   applyCuts(false),
   startFromNull(true),
+  nRegions(0)
+  useDeexcitation(false),
+  nDERegions(0),
+  idxDERegions(0),
+  currentModel(0),
+  particle(0),
+  currentCouple(0)
+{
   SetVerboseLevel(1);
+  // Size of tables assuming spline
   minKinEnergy = 0.1*keV;
+  maxKinEnergy = 100.0*GeV;
+  maxKinEnergy = 100.0*TeV;
+  nLambdaBins  = 84;
+  // default lambda factor
+  lambdaFactor  = 0.8;
+  // default limit on polar angle
+  polarAngleLimit = 0.0;
+  // particle types
   theGamma     = G4Gamma::Gamma();
   theElectron  = G4Electron::Electron();
 …
   delete modelManager;
   (G4LossTableManager::Instance())->DeRegister(this);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEmProcess::Clear()
+{
+  delete [] theEnergyOfCrossSectionMax;
+  delete [] theCrossSectionMax;
+  delete [] idxDERegions;
+  theEnergyOfCrossSectionMax = 0;
+  theCrossSectionMax = 0;
+  idxDERegions = 0;
+  currentCouple = 0;
+  preStepLambda = 0.0;
+  mfpKinEnergy  = DBL_MAX;
+  deRegions.clear();
+  nDERegions = 0;
+}
 …
       theLambdaTable = G4PhysicsTableHelper::PreparePhysicsTable(theLambdaTable);
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEmProcess::Clear()
+{
+  if(theEnergyOfCrossSectionMax) delete [] theEnergyOfCrossSectionMax;
+  if(theCrossSectionMax) delete [] theCrossSectionMax;
+  theEnergyOfCrossSectionMax = 0;
+  theCrossSectionMax = 0;
+  currentCouple = 0;
+  preStepLambda = 0.0;
+  mfpKinEnergy  = DBL_MAX;
+  // Sub Cutoff and Deexcitation
+  if (nDERegions>0) {
+    const G4ProductionCutsTable* theCoupleTable=
+          G4ProductionCutsTable::GetProductionCutsTable();
+    size_t numOfCouples = theCoupleTable->GetTableSize();
+    idxDERegions = new G4bool[numOfCouples];
+    for (size_t j=0; j<numOfCouples; j++) {
+      const G4MaterialCutsCouple* couple =
+        theCoupleTable->GetMaterialCutsCouple(j);
+      const G4ProductionCuts* pcuts = couple->GetProductionCuts();
+      G4bool reg = false;
+      for(G4int i=0; i<nDERegions; i++) {
+        if(deRegions[i]) {
+          if(pcuts == deRegions[i]->GetProductionCuts()) reg = true;
+        }
+      }
+      idxDERegions[j] = reg;
+    }
+  }
+  if (1 < verboseLevel && nDERegions>0) {
+    G4cout << " Deexcitation is activated for regions: " << G4endl;
+    for (G4int i=0; i<nDERegions; i++) {
+      const G4Region* r = deRegions[i];
+      G4cout << "           " << r->GetName() << G4endl;
+    }
+  }
+}
 …
       G4cout << *theLambdaTable << G4endl;
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEmProcess::PrintInfoDefinition()
+{
+  if(verboseLevel > 0) {
+    G4cout << G4endl << GetProcessName() << ":   for  "
+           << particle->GetParticleName();
+    if(integral) G4cout << ", integral: 1 ";
+    if(applyCuts) G4cout << ", applyCuts: 1 ";
+    G4cout << "    SubType= " << GetProcessSubType() << G4endl;
+    if(buildLambdaTable) {
+      G4cout << "      Lambda tables from "
+             << G4BestUnit(minKinEnergy,"Energy")
+             << " to "
+             << G4BestUnit(maxKinEnergy,"Energy")
+             << " in " << nLambdaBins << " bins, spline: "
+             << (G4LossTableManager::Instance())->SplineFlag()
+             << G4endl;
+    }
+    PrintInfo();
+    modelManager->DumpModelList(verboseLevel);
+  }
+  if(verboseLevel > 2 && buildLambdaTable) {
+    G4cout << "      LambdaTable address= " << theLambdaTable << G4endl;
+    if(theLambdaTable) G4cout << (*theLambdaTable) << G4endl;
+  }
+}
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4VEmProcess::GetMeanFreePath(const G4Track& track,
-                                       G4double,
-                                       G4ForceCondition* condition)
+{
-  *condition = NotForced;
-  return G4VEmProcess::MeanFreePath(track);
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4VParticleChange* G4VEmProcess::PostStepDoIt(const G4Track& track,
                                               const G4Step&)
 …
+  }
+  G4VEmModel* currentModel = SelectModel(finalT);
+  SelectModel(finalT);
+  if(useDeexcitation) {
+    currentModel->SetDeexcitationFlag(idxDERegions[currentMaterialIndex]);
+  }
   /*
   if(0 < verboseLevel) {
 …
         } else if (p == thePositron) {
+          if (e < (*theCutsPositron)[currentMaterialIndex]) {
+          if (electron_mass_c2 < (*theCutsGamma)[currentMaterialIndex] &&
+              e < (*theCutsPositron)[currentMaterialIndex]) {
             good = false;
             e += 2.0*electron_mass_c2;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEmProcess::PrintInfoDefinition()
+{
-  if(verboseLevel > 0) {
-    G4cout << G4endl << GetProcessName() << ": " ;
-    PrintInfo();
-    if(integral) {
-      G4cout << "      Integral mode is used  "<< G4endl;
+    }
+  }
-  if (!buildLambdaTable)  return;
-  if(verboseLevel > 0) {
-    G4cout << "      tables are built for  "
-           << particle->GetParticleName()
-           << G4endl
-           << "      Lambda tables from "
-           << G4BestUnit(minKinEnergy,"Energy")
-           << " to "
-           << G4BestUnit(maxKinEnergy,"Energy")
-           << " in " << nLambdaBins << " bins."
-           << G4endl;
+  }
-  if(verboseLevel > 1) {
-    G4cout << "Tables are built for " << particle->GetParticleName()
-           << G4endl;
-  if(verboseLevel > 2) {
-    G4cout << "LambdaTable address= " << theLambdaTable << G4endl;
-    if(theLambdaTable) G4cout << (*theLambdaTable) << G4endl;
+    }
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4VEmProcess::MicroscopicCrossSection(G4double kineticEnergy,
-                                         const G4MaterialCutsCouple* couple)
+{
-  // Cross section per atom is calculated
-  DefineMaterial(couple);
-  G4double cross = 0.0;
-  G4bool b;
-  if(theLambdaTable) {
-    cross = (((*theLambdaTable)[currentMaterialIndex])->
-                           GetValue(kineticEnergy, b));
-    cross /= currentMaterial->GetTotNbOfAtomsPerVolume();
-  } else {
-    G4VEmModel* model = SelectModel(kineticEnergy);
-    cross =
-      model->CrossSectionPerVolume(currentMaterial,particle,kineticEnergy);
+  }
-  return cross;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 G4bool G4VEmProcess::StorePhysicsTable(const G4ParticleDefinition* part,
                                        const G4String& directory,
 …
              << G4endl;
+    }
+    if((G4LossTableManager::Instance())->SplineFlag()) {
+      size_t n = theLambdaTable->length();
+      for(size_t i=0; i<n; i++) {(* theLambdaTable)[i]->SetSpline(true);}
+    }
   } else {
     if (1 < verboseLevel) {
 …
   return yes;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEmProcess::ActivateDeexcitation(G4bool val, const G4Region* r)
+{
+  G4RegionStore* regionStore = G4RegionStore::GetInstance();
+  const G4Region* reg = r;
+  if (!reg) {reg = regionStore->GetRegion("DefaultRegionForTheWorld", false);}
+  // the region is in the list
+  if (nDERegions) {
+    for (G4int i=0; i<nDERegions; i++) {
+      if (reg == deRegions[i]) {
+        if(!val) deRegions[i] = 0;
+        return;
+      }
+    }
+  }
+  // new region
+  if(val) {
+    useDeexcitation = true;
+    deRegions.push_back(reg);
+    nDERegions++;
+  } else {
+    useDeexcitation = false;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEmProcess::CrossSectionPerVolume(G4double kineticEnergy,
+                                             const G4MaterialCutsCouple* couple)
+{
+  // Cross section per atom is calculated
+  DefineMaterial(couple);
+  G4double cross = 0.0;
+  G4bool b;
+  if(theLambdaTable) {
+    cross = (((*theLambdaTable)[currentMaterialIndex])->
+                           GetValue(kineticEnergy, b));
+  } else {
+    SelectModel(kineticEnergy);
+    cross = currentModel->CrossSectionPerVolume(currentMaterial,
+                                                particle,kineticEnergy);
+  }
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEmProcess::GetMeanFreePath(const G4Track& track,
+                                       G4double,
+                                       G4ForceCondition* condition)
+{
+  *condition = NotForced;
+  return G4VEmProcess::MeanFreePath(track);
+}
 …
   G4PhysicsVector* v =
     new G4PhysicsLogVector(minKinEnergy, maxKinEnergy, nLambdaBins);
+  v->SetSpline((G4LossTableManager::Instance())->SplineFlag());
   return v;
+}

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

r819	r961
26	26	//
27	27	// $Id: G4VEnergyLoss.cc,v 1.46 2006/06/29 19:55:21 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VEnergyLossProcess.cc,v 1.123 2008/01/11 19:55:29 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VEnergyLossProcess.cc,v 1.146 2009/02/19 11:25:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 G4VEnergyLossProcess::G4VEnergyLossProcess(const G4String& name,
+  G4ProcessType type): G4VContinuousDiscreteProcess(name, type),
+                                           G4ProcessType type):
+  G4VContinuousDiscreteProcess(name, type),
+  secondaryParticle(0),
   nSCoffRegions(0),
+  nDERegions(0),
   idxSCoffRegions(0),
+  idxDERegions(0),
   nProcesses(0),
   theDEDXTable(0),
 …
   theEnergyOfCrossSectionMax(0),
   theCrossSectionMax(0),
-  particle(0),
   baseParticle(0),
-  secondaryParticle(0),
-  currentCouple(0),
-  nBins(120),
-  nBinsCSDA(70),
-  nWarnings(0),
-  linLossLimit(0.05),
   minSubRange(0.1),
-  lambdaFactor(0.8),
-  mfpKinEnergy(0.0),
   lossFluctuationFlag(true),
   rndmStepFlag(false),
   tablesAreBuilt(false),
   integral(true),
+  isIon(false),
   isIonisation(true),
+  useSubCutoff(false)
+  useSubCutoff(false),
+  useDeexcitation(false),
+  particle(0),
+  currentCouple(0),
+  nWarnings(0),
+  mfpKinEnergy(0.0)
+{
   SetVerboseLevel(1);
   // Size of tables
+  // low energy limit
   lowestKinEnergy  = 1.*eV;
+  // Size of tables assuming spline
   minKinEnergy     = 0.1*keV;
   maxKinEnergy     = 100.0*TeV;
+  nBins            = 84;
   maxKinEnergyCSDA = 1.0*GeV;
+  nBinsCSDA        = 35;
+  // default linear loss limit for spline
+  linLossLimit  = 0.01;
   // default dRoverRange and finalRange
   SetStepFunction(0.2, 1.0*mm);
+  theElectron = G4Electron::Electron();
+  thePositron = G4Positron::Positron();
+  // default lambda factor
+  lambdaFactor  = 0.8;
+  // particle types
+  theElectron   = G4Electron::Electron();
+  thePositron   = G4Positron::Positron();
+  theGenericIon = 0;
   // run time objects
 …
   fluctModel = 0;
-  scoffRegions.clear();
-  scProcesses.clear();
   scTracks.reserve(5);
   secParticles.reserve(5);
 …
   // Data for stragling of ranges from ICRU'37 report
   const G4int nrbins = 7;
+  vstrag = new G4PhysicsLogVector(keV, GeV, nrbins);
+  vstrag = new G4PhysicsLogVector(keV, GeV, nrbins-1);
+  vstrag->SetSpline(true);
   G4double s[nrbins] = {-0.2, -0.85, -1.3, -1.578, -1.76, -1.85, -1.9};
   for(G4int i=0; i<nrbins; i++) {vstrag->PutValue(i, s[i]);}
 …
            << G4endl;
   delete vstrag;
   Clear();
+  Clean();
   if ( !baseParticle ) {
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 void G4VEnergyLossProcess::Clear()
+{
   if(1 < verboseLevel)
+void G4VEnergyLossProcess::Clean()
+{
+  if(1 < verboseLevel) {
     G4cout << "G4VEnergyLossProcess::Clear() for " << GetProcessName()
     << G4endl;
+           << G4endl;
+  }
   delete [] theDEDXAtMaxEnergy;
   delete [] theRangeAtMaxEnergy;
 …
   delete [] theCrossSectionMax;
   delete [] idxSCoffRegions;
+  delete [] idxDERegions;
   theDEDXAtMaxEnergy = 0;
 …
   tablesAreBuilt = false;
   scTracks.clear();
+  //scTracks.clear();
   scProcesses.clear();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::PreparePhysicsTable(
+     const G4ParticleDefinition& part)
+{
+  // Are particle defined?
+  if( !particle ) {
+    if(part.GetParticleType() == "nucleus" &&
+       part.GetParticleSubType() == "generic")
+         particle = G4GenericIon::GenericIon();
+    else particle = &part;
+  }
+  nProcesses = 0;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::MinPrimaryEnergy(const G4ParticleDefinition*,
+                                                const G4Material*,
+                                                G4double cut)
+{
+  return cut;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void
+G4VEnergyLossProcess::PreparePhysicsTable(const G4ParticleDefinition& part)
+{
   if(1 < verboseLevel) {
     G4cout << "G4VEnergyLossProcess::PreparePhysicsTable for "
            << GetProcessName()
            << " for " << part.GetParticleName()
-           << " local: " << particle->GetParticleName()
            << G4endl;
+  }
-  G4LossTableManager* lManager = G4LossTableManager::Instance();
-  if(&part != particle) {
-    if(part.GetParticleType() == "nucleus") lManager->RegisterIon(&part, this);
-    else                          lManager->RegisterExtraParticle(&part, this);
-    return;
+  }
-  Clear();
   currentCouple = 0;
 …
   fRange        = DBL_MAX;
   preStepKinEnergy = 0.0;
+  chargeSqRatio = 1.0;
+  massRatio = 1.0;
+  reduceFactor = 1.0;
+  G4LossTableManager* lManager = G4LossTableManager::Instance();
+  // Are particle defined?
+  if( !particle ) {
+    particle = &part;
+    if(part.GetParticleType() == "nucleus") {
+      if(!theGenericIon) theGenericIon = G4GenericIon::GenericIon();
+      if(particle == theGenericIon) { isIon = true; }
+      else if(part.GetPDGCharge() > eplus) {
+        isIon = true;
+        // generic ions created on-fly
+        if(part.GetPDGCharge() > 2.5*eplus) {
+          particle = theGenericIon;
+        }
+      }
+    }
+  }
+  if( particle != &part) {
+    if(part.GetParticleType() == "nucleus") {
+      isIon = true;
+      lManager->RegisterIon(&part, this);
+    } else {
+      lManager->RegisterExtraParticle(&part, this);
+    }
+    return;
+  }
+  Clean();
   // Base particle and set of models can be defined here
 …
   G4double initialCharge = particle->GetPDGCharge();
   G4double initialMass   = particle->GetPDGMass();
-  chargeSquare = initialCharge*initialCharge/(eplus*eplus);
-  chargeSqRatio = 1.0;
-  massRatio = 1.0;
-  reduceFactor = 1.0;
   if (baseParticle) {
 …
                                      minSubRange, verboseLevel);
+  // Sub Cutoff Regime
+  scProcesses.clear();
+  nProcesses = 0;
+  if (nSCoffRegions>0) {
+  // Sub Cutoff and Deexcitation
+  if (nSCoffRegions>0 || nDERegions>0) {
     theSubCuts = modelManager->SubCutoff();
 …
           G4ProductionCutsTable::GetProductionCutsTable();
     size_t numOfCouples = theCoupleTable->GetTableSize();
+    idxSCoffRegions = new G4int[numOfCouples];
+    if(nSCoffRegions>0) idxSCoffRegions = new G4bool[numOfCouples];
+    if(nDERegions>0) idxDERegions = new G4bool[numOfCouples];
     for (size_t j=0; j<numOfCouples; j++) {
 …
         theCoupleTable->GetMaterialCutsCouple(j);
       const G4ProductionCuts* pcuts = couple->GetProductionCuts();
+      G4int reg = 0;
+      for(G4int i=0; i<nSCoffRegions; i++) {
+        if( pcuts == scoffRegions[i]->GetProductionCuts()) reg = 1;
+      }
+      idxSCoffRegions[j] = reg;
+      if(nSCoffRegions>0) {
+        G4bool reg = false;
+        for(G4int i=0; i<nSCoffRegions; i++) {
+          if( pcuts == scoffRegions[i]->GetProductionCuts()) reg = true;
+        }
+        idxSCoffRegions[j] = reg;
+      }
+      if(nDERegions>0) {
+        G4bool reg = false;
+        for(G4int i=0; i<nDERegions; i++) {
+          if( pcuts == deRegions[i]->GetProductionCuts()) reg = true;
+        }
+        idxDERegions[j] = reg;
+      }
+    }
+  }
 …
   if (1 < verboseLevel) {
     G4cout << "G4VEnergyLossProcess::Initialise() is done "
+           << " for local " << particle->GetParticleName()
+           << " isIon= " << isIon
            << " chargeSqRatio= " << chargeSqRatio
            << " massRatio= " << massRatio
 …
+      }
+    }
+    if (nDERegions) {
+      G4cout << " Deexcitation is ON for regions: " << G4endl;
+      for (G4int i=0; i<nDERegions; i++) {
+        const G4Region* r = deRegions[i];
+        G4cout << "           " << r->GetName() << G4endl;
+      }
+    }
+  }
+}
 …
+  }
+  if(!tablesAreBuilt && &part == particle)
+    G4LossTableManager::Instance()->BuildPhysicsTable(particle, this);
+  if(0 < verboseLevel && (&part == particle) && !baseParticle) {
+    PrintInfoDefinition();
+    safetyHelper->InitialiseHelper();
+  if(&part == particle) {
+    if(!tablesAreBuilt) {
+      G4LossTableManager::Instance()->BuildPhysicsTable(particle, this);
+    }
+    if(!baseParticle) {
+      if(0 < verboseLevel) PrintInfoDefinition();
+      // needs to be done only once
+      safetyHelper->InitialiseHelper();
+    }
+  }
 …
     if(isIonisation) G4cout << "  isIonisation  flag = 1";
     G4cout << G4endl;
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEnergyLossProcess::ActivateSubCutoff(G4bool val, const G4Region* r)
+{
-  G4RegionStore* regionStore = G4RegionStore::GetInstance();
-  if(val) {
-    useSubCutoff = true;
-    if (!r) r = regionStore->GetRegion("DefaultRegionForTheWorld", false);
-    if (nSCoffRegions) {
-      for (G4int i=0; i<nSCoffRegions; i++) {
-        if (r == scoffRegions[i]) return;
+      }
+    }
-    scoffRegions.push_back(r);
-    nSCoffRegions++;
-  } else {
-    useSubCutoff = false;
+  }
+}
 …
   for(size_t i=0; i<numOfCouples; i++) {
     if(1 < verboseLevel)
+    if(1 < verboseLevel) {
       G4cout << "G4VEnergyLossProcess::BuildDEDXVector flag=  "
              << table->GetFlag(i) << G4endl;
+    }
     if (table->GetFlag(i)) {
 …
         theCoupleTable->GetMaterialCutsCouple(i);
       G4PhysicsVector* aVector = new G4PhysicsLogVector(emin, emax, bin);
+      aVector->SetSpline((G4LossTableManager::Instance())->SplineFlag());
       modelManager->FillDEDXVector(aVector, couple, tType);
 …
            << G4endl;
+  }
   if(!table) return table;
+  if(!table) {return table;}
   // Access to materials
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::GetContinuousStepLimit(
+                const G4Track&,
+                G4double, G4double, G4double&)
+{
+  return DBL_MAX;
+void G4VEnergyLossProcess::PrintInfoDefinition()
+{
+  if(0 < verboseLevel) {
+    G4cout << G4endl << GetProcessName() << ":   for  "
+           << particle->GetParticleName()
+           << "    SubType= " << GetProcessSubType()
+           << G4endl
+           << "      dE/dx and range tables from "
+           << G4BestUnit(minKinEnergy,"Energy")
+           << " to " << G4BestUnit(maxKinEnergy,"Energy")
+           << " in " << nBins << " bins" << G4endl
+           << "      Lambda tables from threshold to "
+           << G4BestUnit(maxKinEnergy,"Energy")
+           << " in " << nBins << " bins, spline: "
+           << (G4LossTableManager::Instance())->SplineFlag()
+           << G4endl;
+    if(theRangeTableForLoss && isIonisation) {
+      G4cout << "      finalRange(mm)= " << finalRange/mm
+             << ", dRoverRange= " << dRoverRange
+             << ", integral: " << integral
+             << ", fluct: " << lossFluctuationFlag
+             << ", linLossLimit= " << linLossLimit
+             << G4endl;
+    }
+    PrintInfo();
+    modelManager->DumpModelList(verboseLevel);
+    if(theCSDARangeTable && isIonisation) {
+      G4cout << "      CSDA range table up"
+             << " to " << G4BestUnit(maxKinEnergyCSDA,"Energy")
+             << " in " << nBinsCSDA << " bins" << G4endl;
+    }
+    if(nSCoffRegions>0 && isIonisation) {
+      G4cout << "      Subcutoff sampling in " << nSCoffRegions
+             << " regions" << G4endl;
+    }
+    if(2 < verboseLevel) {
+      G4cout << "      DEDXTable address= " << theDEDXTable << G4endl;
+      if(theDEDXTable && isIonisation) G4cout << (*theDEDXTable) << G4endl;
+      G4cout << "non restricted DEDXTable address= "
+             << theDEDXunRestrictedTable << G4endl;
+      if(theDEDXunRestrictedTable && isIonisation) {
+           G4cout << (*theDEDXunRestrictedTable) << G4endl;
+      }
+      if(theDEDXSubTable && isIonisation) {
+        G4cout << (*theDEDXSubTable) << G4endl;
+      }
+      G4cout << "      CSDARangeTable address= " << theCSDARangeTable
+             << G4endl;
+      if(theCSDARangeTable && isIonisation) {
+        G4cout << (*theCSDARangeTable) << G4endl;
+      }
+      G4cout << "      RangeTableForLoss address= " << theRangeTableForLoss
+             << G4endl;
+      if(theRangeTableForLoss && isIonisation) {
+             G4cout << (*theRangeTableForLoss) << G4endl;
+      }
+      G4cout << "      InverseRangeTable address= " << theInverseRangeTable
+             << G4endl;
+      if(theInverseRangeTable && isIonisation) {
+             G4cout << (*theInverseRangeTable) << G4endl;
+      }
+      G4cout << "      LambdaTable address= " << theLambdaTable << G4endl;
+      if(theLambdaTable && isIonisation) {
+        G4cout << (*theLambdaTable) << G4endl;
+      }
+      G4cout << "      SubLambdaTable address= " << theSubLambdaTable << G4endl;
+      if(theSubLambdaTable && isIonisation) {
+        G4cout << (*theSubLambdaTable) << G4endl;
+      }
+    }
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::ActivateSubCutoff(G4bool val, const G4Region* r)
+{
+  G4RegionStore* regionStore = G4RegionStore::GetInstance();
+  const G4Region* reg = r;
+  if (!reg) {reg = regionStore->GetRegion("DefaultRegionForTheWorld", false);}
+  // the region is in the list
+  if (nSCoffRegions) {
+    for (G4int i=0; i<nSCoffRegions; i++) {
+      if (reg == scoffRegions[i]) {
+        if(!val) deRegions[i] = 0;
+        return;
+      }
+    }
+  }
+  // new region
+  if(val) {
+    useSubCutoff = true;
+    scoffRegions.push_back(reg);
+    nSCoffRegions++;
+  } else {
+    useSubCutoff = false;
+  }
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::ActivateDeexcitation(G4bool val, const G4Region* r)
+{
+  G4RegionStore* regionStore = G4RegionStore::GetInstance();
+  const G4Region* reg = r;
+  if (!reg) {reg = regionStore->GetRegion("DefaultRegionForTheWorld", false);}
+  // the region is in the list
+  if (nDERegions) {
+    for (G4int i=0; i<nDERegions; i++) {
+      if (reg == deRegions[i]) {
+        if(!val) deRegions[i] = 0;
+        return;
+      }
+    }
+  }
+  // new region
+  if(val) {
+    useDeexcitation = true;
+    deRegions.push_back(reg);
+    nDERegions++;
+  } else {
+    useDeexcitation = false;
+  }
+}
 …
     if(x > finalRange && y < currentMinStep) {
       x = y + finalRange*(1.0 - dRoverRange)*(2.0 - finalRange/fRange);
     } else if (rndmStepFlag) x = SampleRange();
     //    G4cout<<GetProcessName()<<": e= "<<preStepKinEnergy
     //    <<" range= "<<fRange <<" cMinSt="<<currentMinStep
     //    <<" safety= " << safety<< " limit= " << x <<G4endl;
+  }
   //  G4cout<<GetProcessName()<<": e= "<<preStepKinEnergy
+    } else if (rndmStepFlag) {x = SampleRange();}
+    //G4cout<<GetProcessName()<<": e= "<<preStepKinEnergy
+    //  <<" range= "<<fRange <<" cMinSt="<<currentMinStep
+    //  << " limit= " << x <<G4endl;
+  }
+  //G4cout<<GetProcessName()<<": e= "<<preStepKinEnergy
   //  <<" stepLimit= "<<x<<G4endl;
   return x;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4VEnergyLossProcess::GetMeanFreePath(
-                             const G4Track& track,
-                             G4double,
-                             G4ForceCondition* condition)
+{
-  *condition = NotForced;
-  return MeanFreePath(track);
+}
 …
   *condition = NotForced;
   G4double x = DBL_MAX;
+  // initialisation of material, mass, charge, model at the beginning of the step
+  DefineMaterial(track.GetMaterialCutsCouple());
+  const G4ParticleDefinition* currPart = track.GetDefinition();
+  if(theGenericIon == particle) {
+    massRatio = proton_mass_c2/currPart->GetPDGMass();
+  }
+  preStepKinEnergy    = track.GetKineticEnergy();
+  preStepScaledEnergy = preStepKinEnergy*massRatio;
+  SelectModel(preStepScaledEnergy);
+  if(isIon) {
+    chargeSqRatio =
+      currentModel->GetChargeSquareRatio(currPart,currentMaterial,preStepKinEnergy);
+    reduceFactor  = 1.0/(chargeSqRatio*massRatio);
+  }
+  //G4cout << "q2= " << chargeSqRatio << " massRatio= " << massRatio << G4endl;
+  // initialisation for sampling of the interaction length
   if(previousStepSize <= DBL_MIN) theNumberOfInteractionLengthLeft = -1.0;
+  InitialiseStep(track);
+  if(theNumberOfInteractionLengthLeft < 0.0) mfpKinEnergy = DBL_MAX;
+  // compute mean free path
   if(preStepScaledEnergy < mfpKinEnergy) {
     if (integral) ComputeLambdaForScaledEnergy(preStepScaledEnergy);
 …
     if (theNumberOfInteractionLengthLeft < 0.0) {
       // beggining of tracking (or just after DoIt of this process)
+      //G4cout<<"G4VEnergyLossProcess::PostStepGetPhysicalInteractionLength Reset"<<G4endl;
       ResetNumberOfInteractionLengthLeft();
     } else if(currentInteractionLength < DBL_MAX) {
 …
       G4cout << "G4VEnergyLossProcess::PostStepGetPhysicalInteractionLength ";
       G4cout << "[ " << GetProcessName() << "]" << G4endl;
       G4cout << " for " << particle->GetParticleName()
+      G4cout << " for " << currPart->GetParticleName()
              << " in Material  " <<  currentMaterial->GetName()
              << " Ekin(MeV)= " << preStepKinEnergy/MeV
 …
+    }
 #endif
     // zero cross section case
   } else {
 …
   if(length <= DBL_MIN) return &fParticleChange;
   G4double eloss  = 0.0;
+  /*
+  G4double esecdep = 0.0;
+  /*
   if(-1 < verboseLevel) {
     const G4ParticleDefinition* d = track.GetDefinition();
 …
   */
+  const G4DynamicParticle* dynParticle = track.GetDynamicParticle();
   // stopping
   if (length >= fRange) {
+    eloss = preStepKinEnergy;
+    if (useDeexcitation) {
+      if(idxDERegions[currentMaterialIndex]) {
+        currentModel->SampleDeexcitationAlongStep(currentMaterial, track, eloss);
+        if(eloss < 0.0) eloss = 0.0;
+      }
+    }
     fParticleChange.SetProposedKineticEnergy(0.0);
     fParticleChange.ProposeLocalEnergyDeposit(preStepKinEnergy);
+    fParticleChange.ProposeLocalEnergyDeposit(eloss);
     return &fParticleChange;
+  }
 …
       GetScaledRangeForScaledEnergy(preStepScaledEnergy) - length/reduceFactor;
     eloss = preStepKinEnergy - ScaledKinEnergyForLoss(x)/massRatio;
     /*
     if(-1 < verboseLevel)
 …
              << " eloss0(MeV)= "
              << GetDEDXForScaledEnergy(preStepScaledEnergy)*length/MeV
+             << " lim(MeV)= " << preStepKinEnergy*linLossLimit/MeV
              << G4endl;
     */
+  }
+  const G4DynamicParticle* dynParticle = track.GetDynamicParticle();
+  G4VEmModel* currentModel = SelectModel(preStepScaledEnergy);
+  /*
+  /*
   G4double eloss0 = eloss;
   if(-1 < verboseLevel ) {
 …
   G4double cut  = (*theCuts)[currentMaterialIndex];
   G4double esec = 0.0;
-  G4double esecdep = 0.0;
   // SubCutOff
 …
     if(idxSCoffRegions[currentMaterialIndex]) {
       G4double currentMinSafety = 0.0;
+      G4bool yes = false;
       G4StepPoint* prePoint  = step.GetPreStepPoint();
+      G4StepPoint* postPoint = step.GetPostStepPoint();
+      G4double preSafety  = prePoint->GetSafety();
+      G4double postSafety = preSafety - length;
+      G4double rcut = currentCouple->GetProductionCuts()->GetProductionCut(1);
+      // recompute safety
+      if(prePoint->GetStepStatus() != fGeomBoundary &&
+         postPoint->GetStepStatus() != fGeomBoundary) {
+        /*
+        //      G4bool yes = (track.GetTrackID() == 5512);
+        G4bool yes = false;
+        if(yes)
+          G4cout << "G4VEnergyLoss: presafety= " << preSafety
+                 << " rcut= " << rcut << "  length= " << length
+                 << " dir " << track.GetMomentumDirection()
+                 << G4endl;
+        */
+        if(preSafety < rcut)
+      // Check boundary
+      if(prePoint->GetStepStatus() == fGeomBoundary) yes = true;
+      // Check PrePoint
+      else {
+        G4double preSafety  = prePoint->GetSafety();
+        G4double rcut = currentCouple->GetProductionCuts()->GetProductionCut(1);
+        // recompute presafety
+        if(preSafety < rcut) {
           preSafety = safetyHelper->ComputeSafety(prePoint->GetPosition());
+        //if(yes) {
+        //  G4cout << "G4VEnergyLoss: newsafety= " << preSafety << G4endl;
+          //       if(preSafety==0.0 && track.GetTrackID() == 5512 ) exit(1);
+        //}
+        if(postSafety < rcut)
+          postSafety = safetyHelper->ComputeSafety(postPoint->GetPosition());
+        /*
+          if(-1 < verboseLevel)
+          G4cout << "Subcutoff: presafety(mm)= " << preSafety/mm
+                 << " postsafety(mm)= " << postSafety/mm
+                 << " rcut(mm)= " << rcut/mm
+                 << G4endl;
+        */
+        currentMinSafety = std::min(preSafety,postSafety);
+      }
+        }
+        if(preSafety < rcut) yes = true;
+        // Check PostPoint
+        else {
+          G4double postSafety = preSafety - length;
+          if(postSafety < rcut) {
+            postSafety =
+              safetyHelper->ComputeSafety(step.GetPostStepPoint()->GetPosition());
+            if(postSafety < rcut) yes = true;
+          }
+        }
+      }
       // Decide to start subcut sampling
       if(currentMinSafety < rcut) {
+      if(yes) {
         cut = (*theSubCuts)[currentMaterialIndex];
 …
                                 currentModel,currentMaterialIndex,
                                 esecdep);
+        // add bremsstrahlung sampling
         /*
         if(nProcesses > 0) {
 …
             esec += e;
             pParticleChange->AddSecondary(t);
-            //  mom -= t->GetMomentum();
+          }
-          //        fParticleChange.SetProposedMomentum(mom);
+        }
+      }
 …
   // Corrections, which cannot be tabulated
+  CorrectionsAlongStep(currentCouple, dynParticle, eloss, length);
+  currentModel->CorrectionsAlongStep(currentCouple, dynParticle,
+                                     eloss, esecdep, length);
   // Sample fluctuations
 …
       G4double tmax =
         std::min(currentModel->MaxSecondaryKinEnergy(dynParticle),cut);
+      G4double emean = eloss;
       eloss = fluc->SampleFluctuations(currentMaterial,dynParticle,
                                        tmax,length,eloss);
       /*
+                                       tmax,length,emean);
+      /*
       if(-1 < verboseLevel)
       G4cout << "After fluct: eloss(MeV)= " << eloss/MeV
              << " fluc= " << (eloss-eloss0)/MeV
              << " currentChargeSquare= " << chargeSquare
+             << " ChargeSqRatio= " << chargeSqRatio
              << " massRatio= " << massRatio
              << " tmax= " << tmax
 …
   eloss += esecdep;
   if(eloss < 0.0) eloss = 0.0;
+  // deexcitation
+  else if (useDeexcitation) {
+    if(idxDERegions[currentMaterialIndex]) {
+      currentModel->SampleDeexcitationAlongStep(currentMaterial, track, eloss);
+      if(eloss < 0.0) eloss = 0.0;
+    }
+  }
   // Energy balanse
 …
     eloss  = preStepKinEnergy - esec;
     finalT = 0.0;
+  } else if(isIon) {
+    fParticleChange.SetProposedCharge(
+      currentModel->GetParticleCharge(track.GetDefinition(),currentMaterial,finalT));
+  }
 …
   fParticleChange.ProposeLocalEnergyDeposit(eloss);
   /*
+  /*
   if(-1 < verboseLevel) {
     G4cout << "Final value eloss(MeV)= " << eloss/MeV
 …
            << G4endl;
+  }
   */
+  */
   return &fParticleChange;
 …
        G4VEmModel* model,
        G4int idx,
        G4double& extraEdep)
+       G4double& /*extraEdep*/)
+{
   // Fast check weather subcutoff can work
 …
   const G4Track* track = step.GetTrack();
   const G4DynamicParticle* dp = track->GetDynamicParticle();
+  G4double e = dp->GetKineticEnergy()*massRatio;
   G4bool b;
+  G4double cross =
+    chargeSqRatio*(((*theSubLambdaTable)[idx])->GetValue(dp->GetKineticEnergy(),b));
+  G4double cross = chargeSqRatio*(((*theSubLambdaTable)[idx])->GetValue(e,b));
   G4double length = step.GetStepLength();
   // negligible probability to get any interaction
   if(length*cross < perMillion) return;
   /*
+  /*
   if(-1 < verboseLevel)
     G4cout << "<<< Subcutoff for " << GetProcessName()
 …
   // Sample subcutoff secondaries
   G4StepPoint* preStepPoint = step.GetPreStepPoint();
+  G4StepPoint* postStepPoint = step.GetPostStepPoint();
   G4ThreeVector prepoint = preStepPoint->GetPosition();
   G4ThreeVector dr = step.GetPostStepPoint()->GetPosition() - prepoint;
+  G4ThreeVector dr = postStepPoint->GetPosition() - prepoint;
   G4double pretime = preStepPoint->GetGlobalTime();
+  //  G4double dt = length/preStepPoint->GetVelocity();
+  G4double dt = postStepPoint->GetGlobalTime() - pretime;
+  //G4double dt = length/preStepPoint->GetVelocity();
   G4double fragment = 0.0;
 …
       G4bool addSec = true;
+      /*
       // do not track very low-energy delta-electrons
       if(theSecondaryRangeTable && (*it)->GetDefinition() == theElectron) {
 …
+        }
+      }
+      */
       if(addSec) {
         //      G4Track* t = new G4Track((*it), pretime + fragment*dt, r);
         G4Track* t = new G4Track((*it), pretime, r);
+        G4Track* t = new G4Track((*it), pretime + fragment*dt, r);
+        //G4Track* t = new G4Track((*it), pretime, r);
         t->SetTouchableHandle(track->GetTouchableHandle());
         tracks.push_back(t);
         /*
           if(-1 < verboseLevel)
           G4cout << "New track " << p->GetDefinition()->GetParticleName()
           << " e(keV)= " << p->GetKineticEnergy()/keV
           << " fragment= " << fragment
           << G4endl;
+        /*
+        if(-1 < verboseLevel)
+          G4cout << "New track " << t->GetDefinition()->GetParticleName()
+                 << " e(keV)= " << t->GetKineticEnergy()/keV
+                 << " fragment= " << fragment
+                 << G4endl;
         */
+      }
 …
+  }
+  G4VEmModel* currentModel = SelectModel(postStepScaledEnergy);
+  SelectModel(postStepScaledEnergy);
+  if(useDeexcitation) {
+    currentModel->SetDeexcitationFlag(idxDERegions[currentMaterialIndex]);
+  }
   const G4DynamicParticle* dynParticle = track.GetDynamicParticle();
   G4double tcut = (*theCuts)[currentMaterialIndex];
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::PrintInfoDefinition()
+{
+  if(0 < verboseLevel) {
+    G4cout << G4endl << GetProcessName() << ":   tables are built for  "
+           << particle->GetParticleName()
+           << G4endl
+           << "      dE/dx and range tables from "
+           << G4BestUnit(minKinEnergy,"Energy")
+           << " to " << G4BestUnit(maxKinEnergy,"Energy")
+           << " in " << nBins << " bins." << G4endl
+           << "      Lambda tables from threshold to "
+           << G4BestUnit(maxKinEnergy,"Energy")
+           << " in " << nBins << " bins."
+G4bool G4VEnergyLossProcess::StorePhysicsTable(
+       const G4ParticleDefinition* part, const G4String& directory,
+       G4bool ascii)
+{
+  G4bool res = true;
+  if ( baseParticle || part != particle ) return res;
+  if(!StoreTable(part,theDEDXTable,ascii,directory,"DEDX"))
+    {res = false;}
+  if(!StoreTable(part,theDEDXunRestrictedTable,ascii,directory,"DEDXnr"))
+    {res = false;}
+  if(!StoreTable(part,theDEDXSubTable,ascii,directory,"SubDEDX"))
+    {res = false;}
+  if(!StoreTable(part,theIonisationTable,ascii,directory,"Ionisation"))
+    {res = false;}
+  if(!StoreTable(part,theIonisationSubTable,ascii,directory,"SubIonisation"))
+    {res = false;}
+  if(isIonisation &&
+     !StoreTable(part,theCSDARangeTable,ascii,directory,"CSDARange"))
+    {res = false;}
+  if(isIonisation &&
+     !StoreTable(part,theRangeTableForLoss,ascii,directory,"Range"))
+    {res = false;}
+  if(isIonisation &&
+     !StoreTable(part,theInverseRangeTable,ascii,directory,"InverseRange"))
+    {res = false;}
+  if(!StoreTable(part,theLambdaTable,ascii,directory,"Lambda"))
+    {res = false;}
+  if(!StoreTable(part,theSubLambdaTable,ascii,directory,"SubLambda"))
+    {res = false;}
+  if ( res ) {
+    if(0 < verboseLevel) {
+      G4cout << "Physics tables are stored for " << particle->GetParticleName()
+             << " and process " << GetProcessName()
+             << " in the directory <" << directory
+             << "> " << G4endl;
+    }
+  } else {
+    G4cout << "Fail to store Physics Tables for "
+           << particle->GetParticleName()
+           << " and process " << GetProcessName()
+           << " in the directory <" << directory
+           << "> " << G4endl;
+  }
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4bool G4VEnergyLossProcess::RetrievePhysicsTable(
+       const G4ParticleDefinition* part, const G4String& directory,
+       G4bool ascii)
+{
+  G4bool res = true;
+  const G4String particleName = part->GetParticleName();
+  if(1 < verboseLevel) {
+    G4cout << "G4VEnergyLossProcess::RetrievePhysicsTable() for "
+           << particleName << " and process " << GetProcessName()
+           << "; tables_are_built= " << tablesAreBuilt
            << G4endl;
+    PrintInfo();
+    if(theRangeTableForLoss && isIonisation)
+      G4cout << "      Step function: finalRange(mm)= " << finalRange/mm
+             << ", dRoverRange= " << dRoverRange
+             << ", integral: " << integral
+             << ", fluct: " << lossFluctuationFlag
+             << G4endl;
+    if(theCSDARangeTable && isIonisation)
+      G4cout << "      CSDA range table up"
+             << " to " << G4BestUnit(maxKinEnergyCSDA,"Energy")
+             << " in " << nBinsCSDA << " bins." << G4endl;
+    if(nSCoffRegions>0)
+      G4cout << "      Subcutoff sampling in " << nSCoffRegions
+             << " regions" << G4endl;
+    if(2 < verboseLevel) {
+      G4cout << "DEDXTable address= " << theDEDXTable << G4endl;
+      if(theDEDXTable && isIonisation) G4cout << (*theDEDXTable) << G4endl;
+      G4cout << "non restricted DEDXTable address= "
+             << theDEDXunRestrictedTable << G4endl;
+      if(theDEDXunRestrictedTable && isIonisation)
+           G4cout << (*theDEDXunRestrictedTable) << G4endl;
+      if(theDEDXSubTable && isIonisation) G4cout << (*theDEDXSubTable)
+                                                 << G4endl;
+      G4cout << "CSDARangeTable address= " << theCSDARangeTable
+  }
+  if(particle == part) {
+    //    G4bool yes = true;
+    if ( !baseParticle ) {
+      G4bool fpi = true;
+      if(!RetrieveTable(part,theDEDXTable,ascii,directory,"DEDX",fpi))
+        {fpi = false;}
+      if(!RetrieveTable(part,theIonisationTable,ascii,directory,"Ionisation",false))
+        {fpi = false;}
+      if(!RetrieveTable(part,theRangeTableForLoss,ascii,directory,"Range",fpi))
+        {res = false;}
+      if(!RetrieveTable(part,theDEDXunRestrictedTable,ascii,directory,"DEDXnr",false))
+        {res = false;}
+      if(!RetrieveTable(part,theCSDARangeTable,ascii,directory,"CSDARange",false))
+        {res = false;}
+      if(!RetrieveTable(part,theInverseRangeTable,ascii,directory,"InverseRange",fpi))
+        {res = false;}
+      if(!RetrieveTable(part,theLambdaTable,ascii,directory,"Lambda",true))
+        {res = false;}
+      G4bool yes = false;
+      if(nSCoffRegions > 0) {yes = true;}
+      if(!RetrieveTable(part,theDEDXSubTable,ascii,directory,"SubDEDX",yes))
+        {res = false;}
+      if(!RetrieveTable(part,theSubLambdaTable,ascii,directory,"SubLambda",yes))
+        {res = false;}
+      if(!fpi) yes = false;
+      if(!RetrieveTable(part,theIonisationSubTable,ascii,directory,"SubIonisation",yes))
+        {res = false;}
+    }
+  }
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4bool G4VEnergyLossProcess::StoreTable(const G4ParticleDefinition* part,
+                                        G4PhysicsTable* aTable, G4bool ascii,
+                                        const G4String& directory,
+                                        const G4String& tname)
+{
+  G4bool res = true;
+  if ( aTable ) {
+    const G4String name = GetPhysicsTableFileName(part,directory,tname,ascii);
+    if( !aTable->StorePhysicsTable(name,ascii)) res = false;
+  }
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+G4bool G4VEnergyLossProcess::RetrieveTable(const G4ParticleDefinition* part,
+                                           G4PhysicsTable* aTable, G4bool ascii,
+                                           const G4String& directory,
+                                           const G4String& tname,
+                                           G4bool mandatory)
+{
+  G4bool res = true;
+  G4String filename = GetPhysicsTableFileName(part,directory,tname,ascii);
+  G4bool yes = aTable->ExistPhysicsTable(filename);
+  if(yes) {
+    yes = G4PhysicsTableHelper::RetrievePhysicsTable(aTable,filename,ascii);
+    if((G4LossTableManager::Instance())->SplineFlag()) {
+      size_t n = aTable->length();
+      for(size_t i=0; i<n; i++) {(*aTable)[i]->SetSpline(true);}
+    }
+  }
+  if(yes) {
+    if (0 < verboseLevel) {
+      G4cout << tname << " table for " << part->GetParticleName()
+             << " is Retrieved from <" << filename << ">"
              << G4endl;
+      if(theCSDARangeTable && isIonisation) G4cout << (*theCSDARangeTable)
+            << G4endl;
+      G4cout << "RangeTableForLoss address= " << theRangeTableForLoss
+    }
+  } else {
+    if(mandatory) res = false;
+    if(mandatory || 1 < verboseLevel) {
+      G4cout << tname << " table for " << part->GetParticleName()
+             << " from file <"
+             << filename << "> is not Retrieved"
              << G4endl;
+      if(theRangeTableForLoss && isIonisation)
+             G4cout << (*theRangeTableForLoss) << G4endl;
+      G4cout << "InverseRangeTable address= " << theInverseRangeTable
+             << G4endl;
+      if(theInverseRangeTable && isIonisation)
+             G4cout << (*theInverseRangeTable) << G4endl;
+      G4cout << "LambdaTable address= " << theLambdaTable << G4endl;
+      if(theLambdaTable && isIonisation) G4cout << (*theLambdaTable) << G4endl;
+      G4cout << "SubLambdaTable address= " << theSubLambdaTable << G4endl;
+      if(theSubLambdaTable && isIonisation) G4cout << (*theSubLambdaTable)
+             << G4endl;
+    }
+  }
+  return res;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::GetDEDXDispersion(
+                                  const G4MaterialCutsCouple *couple,
+                                  const G4DynamicParticle* dp,
+                                        G4double length)
+{
+  DefineMaterial(couple);
+  G4double ekin = dp->GetKineticEnergy();
+  SelectModel(ekin*massRatio);
+  G4double tmax = currentModel->MaxSecondaryKinEnergy(dp);
+  tmax = std::min(tmax,(*theCuts)[currentMaterialIndex]);
+  G4double d = 0.0;
+  G4VEmFluctuationModel* fm = currentModel->GetModelOfFluctuations();
+  if(fm) d = fm->Dispersion(currentMaterial,dp,tmax,length);
+  return d;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::CrossSectionPerVolume(
+         G4double kineticEnergy, const G4MaterialCutsCouple* couple)
+{
+  // Cross section per volume is calculated
+  DefineMaterial(couple);
+  G4double cross = 0.0;
+  G4bool b;
+  if(theLambdaTable) {
+    cross =
+      ((*theLambdaTable)[currentMaterialIndex])->GetValue(kineticEnergy, b);
+  } else {
+    SelectModel(kineticEnergy);
+    cross =
+      currentModel->CrossSectionPerVolume(currentMaterial,
+                                          particle, kineticEnergy,
+                                          (*theCuts)[currentMaterialIndex]);
+  }
+  return cross;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::MeanFreePath(const G4Track& track)
+{
+  DefineMaterial(track.GetMaterialCutsCouple());
+  preStepLambda = GetLambdaForScaledEnergy(track.GetKineticEnergy()*massRatio);
+  G4double x = DBL_MAX;
+  if(DBL_MIN < preStepLambda) x = 1.0/preStepLambda;
+  return x;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::ContinuousStepLimit(const G4Track& track,
+                                                   G4double x, G4double y,
+                                                   G4double& z)
+{
+  G4GPILSelection sel;
+  return AlongStepGetPhysicalInteractionLength(track, x, y, z, &sel);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::GetMeanFreePath(
+                             const G4Track& track,
+                             G4double,
+                             G4ForceCondition* condition)
+{
+  *condition = NotForced;
+  return MeanFreePath(track);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4double G4VEnergyLossProcess::GetContinuousStepLimit(
+                const G4Track&,
+                G4double, G4double, G4double&)
+{
+  return DBL_MAX;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4PhysicsVector* G4VEnergyLossProcess::LambdaPhysicsVector(
+                 const G4MaterialCutsCouple* couple, G4double cut)
+{
+  //  G4double cut  = (*theCuts)[couple->GetIndex()];
+  //  G4int nbins = nLambdaBins;
+  G4double tmin =
+    std::max(MinPrimaryEnergy(particle, couple->GetMaterial(), cut),
+             minKinEnergy);
+  if(tmin >= maxKinEnergy) tmin = 0.5*maxKinEnergy;
+  G4PhysicsVector* v = new G4PhysicsLogVector(tmin, maxKinEnergy, nBins);
+  v->SetSpline((G4LossTableManager::Instance())->SplineFlag());
+  return v;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void G4VEnergyLossProcess::AddCollaborativeProcess(
+            G4VEnergyLossProcess* p)
+{
+  G4bool add = true;
+  if(p->GetProcessName() != "eBrem") add = false;
+  if(add && nProcesses > 0) {
+    for(G4int i=0; i<nProcesses; i++) {
+      if(p == scProcesses[i]) {
+        add = false;
+        break;
+      }
+    }
+  }
+  if(add) {
+    scProcesses.push_back(p);
+    nProcesses++;
+    if (1 < verboseLevel) {
+      G4cout << "### The process " << p->GetProcessName()
+             << " is added to the list of collaborative processes of "
+             << GetProcessName() << G4endl;
+    }
+  }
 …
   } else if(fSubRestricted == tType) {
     theDEDXSubTable = p;
   } else if(fIonisation == tType && theIonisationTable != p) {
+  } else if(fIsIonisation == tType && theIonisationTable != p) {
     if(theIonisationTable) theIonisationTable->clearAndDestroy();
     theIonisationTable = p;
   } else if(fSubIonisation == tType && theIonisationSubTable != p) {
+  } else if(fIsSubIonisation == tType && theIonisationSubTable != p) {
     if(theIonisationSubTable) theIonisationSubTable->clearAndDestroy();
     theIonisationSubTable = p;
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4PhysicsVector* G4VEnergyLossProcess::LambdaPhysicsVector(
-                 const G4MaterialCutsCouple* couple, G4double cut)
+{
-  //  G4double cut  = (*theCuts)[couple->GetIndex()];
-  //  G4int nbins = nLambdaBins;
-  G4double tmin =
-    std::max(MinPrimaryEnergy(particle, couple->GetMaterial(), cut),
-             minKinEnergy);
-  if(tmin >= maxKinEnergy) tmin = 0.5*maxKinEnergy;
-  G4PhysicsVector* v = new G4PhysicsLogVector(tmin, maxKinEnergy, nBins);
-  return v;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4VEnergyLossProcess::MicroscopicCrossSection(
-         G4double kineticEnergy, const G4MaterialCutsCouple* couple)
+{
-  // Cross section per atom is calculated
-  DefineMaterial(couple);
-  G4double cross = 0.0;
-  G4bool b;
-  if(theLambdaTable)
-    cross =
-      ((*theLambdaTable)[currentMaterialIndex])->GetValue(kineticEnergy, b)/
-      currentMaterial->GetTotNbOfAtomsPerVolume();
-  return cross;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4bool G4VEnergyLossProcess::StorePhysicsTable(
-       const G4ParticleDefinition* part, const G4String& directory,
-       G4bool ascii)
+{
-  G4bool res = true;
-  if ( baseParticle || part != particle ) return res;
-  if ( theDEDXTable ) {
-    const G4String name = GetPhysicsTableFileName(part,directory,"DEDX",ascii);
-    if( !theDEDXTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theDEDXunRestrictedTable ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"DEDXnr",ascii);
-    if( !theDEDXTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theDEDXSubTable ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"SubDEDX",ascii);
-    if( !theDEDXSubTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theIonisationTable ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"Ionisation",ascii);
-    if( !theIonisationTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theIonisationSubTable ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"SubIonisation",ascii);
-    if( !theIonisationSubTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theCSDARangeTable && isIonisation ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"CSDARange",ascii);
-    if( !theCSDARangeTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theRangeTableForLoss && isIonisation ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"Range",ascii);
-    if( !theRangeTableForLoss->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theInverseRangeTable && isIonisation ) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"InverseRange",ascii);
-    if( !theInverseRangeTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theLambdaTable  && isIonisation) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"Lambda",ascii);
-    if( !theLambdaTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( theSubLambdaTable  && isIonisation) {
-    const G4String name =
-      GetPhysicsTableFileName(part,directory,"SubLambda",ascii);
-    if( !theSubLambdaTable->StorePhysicsTable(name,ascii)) res = false;
+  }
-  if ( res ) {
-    if(0 < verboseLevel) {
-      G4cout << "Physics tables are stored for " << particle->GetParticleName()
-             << " and process " << GetProcessName()
-             << " in the directory <" << directory
-             << "> " << G4endl;
+    }
-  } else {
-    G4cout << "Fail to store Physics Tables for "
-           << particle->GetParticleName()
-           << " and process " << GetProcessName()
-           << " in the directory <" << directory
-           << "> " << G4endl;
+  }
-  return res;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-G4bool G4VEnergyLossProcess::RetrievePhysicsTable(
-       const G4ParticleDefinition* part, const G4String& directory,
-       G4bool ascii)
+{
-  G4bool res = true;
-  const G4String particleName = part->GetParticleName();
-  if(1 < verboseLevel) {
-    G4cout << "G4VEnergyLossProcess::RetrievePhysicsTable() for "
-           << particleName << " and process " << GetProcessName()
-           << "; tables_are_built= " << tablesAreBuilt
-           << G4endl;
+  }
-  if(particle == part) {
-    G4bool yes = true;
-    G4bool fpi = true;
-    if ( !baseParticle ) {
-      G4String filename;
-      filename = GetPhysicsTableFileName(part,directory,"DEDX",ascii);
-      yes = theDEDXTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theDEDXTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "DEDX table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        fpi = false;
-        if (1 < verboseLevel) {
-          G4cout << "DEDX table for " << particleName << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"Range",ascii);
-      yes = theRangeTableForLoss->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theRangeTableForLoss,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "Range table for loss for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if(fpi) {
-          res = false;
-          G4cout << "Range table for loss for " << particleName
-                 << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"DEDXnr",ascii);
-      yes = theDEDXunRestrictedTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theDEDXunRestrictedTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "Non-restricted DEDX table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if (1 < verboseLevel) {
-          G4cout << "Non-restricted DEDX table for " << particleName
-                 << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"CSDARange",ascii);
-      yes = theCSDARangeTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theCSDARangeTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "CSDA Range table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        G4cout << "CSDA Range table for loss for " << particleName
-               << " does not exist"
-               << G4endl;
+      }
-      filename = GetPhysicsTableFileName(part,directory,"InverseRange",ascii);
-      yes = theInverseRangeTable->ExistPhysicsTable(filename);
-      if(yes)  yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                     theInverseRangeTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "InverseRange table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if(fpi) {
-          res = false;
-          G4cout << "InverseRange table for " << particleName
-                 << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"Lambda",ascii);
-      yes = theLambdaTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theLambdaTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "Lambda table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if(fpi) {
-          res = false;
-          G4cout << "Lambda table for " << particleName << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"SubDEDX",ascii);
-      yes = theDEDXSubTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theDEDXSubTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "SubDEDX table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if(nSCoffRegions) {
-          res=false;
-          G4cout << "SubDEDX table for " << particleName << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"SubLambda",ascii);
-      yes = theSubLambdaTable->ExistPhysicsTable(filename);
-      if(yes) yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theSubLambdaTable,filename,ascii);
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "SubLambda table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
-      } else {
-        if(nSCoffRegions) {
-          res=false;
-          G4cout << "SubLambda table for " << particleName << " from file <"
-                 << filename << "> is not Retrieved"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"Ionisation",ascii);
-      yes = theIonisationTable->ExistPhysicsTable(filename);
-      if(yes) {
-        theIonisationTable =
-          G4PhysicsTableHelper::PreparePhysicsTable(theIonisationTable);
-        yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theIonisationTable,filename,ascii);
+      }
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "Ionisation table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
+      }
-      filename = GetPhysicsTableFileName(part,directory,"SubIonisation",ascii);
-      yes = theIonisationSubTable->ExistPhysicsTable(filename);
-      if(yes) {
-        theIonisationSubTable =
-          G4PhysicsTableHelper::PreparePhysicsTable(theIonisationSubTable);
-        yes = G4PhysicsTableHelper::RetrievePhysicsTable(
-                    theIonisationSubTable,filename,ascii);
+      }
-      if(yes) {
-        if (0 < verboseLevel) {
-          G4cout << "SubIonisation table for " << particleName
-                 << " is Retrieved from <"
-                 << filename << ">"
-                 << G4endl;
+        }
+      }
+    }
+  }
-  return res;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEnergyLossProcess::AddCollaborativeProcess(
-            G4VEnergyLossProcess* p)
+{
-  G4bool add = true;
-  if(nProcesses > 0) {
-    for(G4int i=0; i<nProcesses; i++) {
-      if(p == scProcesses[i]) {
-        add = false;
-        break;
+      }
+    }
+  }
-  if(add) {
-    scProcesses.push_back(p);
-    nProcesses++;
-    if (0 < verboseLevel)
-      G4cout << "### The process " << p->GetProcessName()
-             << " is added to the list of collaborative processes of "
-             << GetProcessName() << G4endl;
+  }
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-G4double G4VEnergyLossProcess::GetDEDXDispersion(
-                                  const G4MaterialCutsCouple *couple,
-                                  const G4DynamicParticle* dp,
-                                        G4double length)
+{
-  DefineMaterial(couple);
-  G4double ekin = dp->GetKineticEnergy();
-  G4VEmModel* currentModel = SelectModel(ekin*massRatio);
-  G4double tmax = currentModel->MaxSecondaryKinEnergy(dp);
-  tmax = std::min(tmax,(*theCuts)[currentMaterialIndex]);
-  G4double d = 0.0;
-  G4VEmFluctuationModel* fm = currentModel->GetModelOfFluctuations();
-  if(fm) d = fm->Dispersion(currentMaterial,dp,tmax,length);
-  return d;
+}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4VEnergyLossProcess::ActivateDeexcitation(G4bool, const G4Region*)
-{}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4VMultipleScattering.cc,v 1.47 2007/11/09 11:35:54 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VMultipleScattering.cc,v 1.60 2008/11/20 20:32:40 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 // 12-04-07 Add verbosity at destruction (V.Ivanchenko)
 // 27-10-07 Virtual functions moved to source (V.Ivanchenko)
+// 11-03-08 Set skin value does not effect step limit type (V.Ivanchenko)
 //
 // Class Description:
 …
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+G4VMultipleScattering::G4VMultipleScattering(const G4String& name, G4ProcessType type):
+                 G4VContinuousDiscreteProcess(name, type),
+G4VMultipleScattering::G4VMultipleScattering(const G4String& name,
+                                             G4ProcessType type):
+  G4VContinuousDiscreteProcess(name, type),
+  buildLambdaTable(true),
   theLambdaTable(0),
   firstParticle(0),
-  currentParticle(0),
-  currentCouple(0),
-  nBins(120),
   stepLimit(fUseSafety),
   skin(0.0),
+  skin(3.0),
   facrange(0.02),
   facgeom(2.5),
   latDisplasment(true),
+  buildLambdaTable(true)
+{
+  currentParticle(0),
+  currentCouple(0)
+{
+  SetVerboseLevel(1);
+  SetProcessSubType(fMultipleScattering);
+  // Size of tables assuming spline
   minKinEnergy = 0.1*keV;
   maxKinEnergy = 100.0*TeV;
+  SetVerboseLevel(1);
+  nBins        = 84;
+  // default limit on polar angle
+  polarAngleLimit = 0.0;
   pParticleChange = &fParticleChange;
 …
 G4VMultipleScattering::~G4VMultipleScattering()
+{
   if(1 < verboseLevel)
+  if(1 < verboseLevel) {
     G4cout << "G4VMultipleScattering destruct " << GetProcessName()
            << G4endl;
+  }
   delete modelManager;
   if (theLambdaTable) {
 …
   G4String num = part.GetParticleName();
   if(1 < verboseLevel) {
-    //    G4cout << "========================================================" << G4endl;
     G4cout << "### G4VMultipleScattering::BuildPhysicsTable() for "
            << GetProcessName()
 …
       if (theLambdaTable->GetFlag(i)) {
         // create physics vector and fill it
+        const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(i);
+        const G4MaterialCutsCouple* couple =
+          theCoupleTable->GetMaterialCutsCouple(i);
         G4PhysicsVector* aVector = PhysicsVector(couple);
         modelManager->FillLambdaVector(aVector, couple, false);
 …
+  }
   if(verboseLevel>0 && ( num == "e-" || num == "mu+" ||
+                         num == "proton" || num == "pi-" || num == "GenericIon")) {
+                         num == "proton" || num == "pi-" ||
+                         num == "GenericIon")) {
     PrintInfoDefinition();
     if(2 < verboseLevel && theLambdaTable) G4cout << *theLambdaTable << G4endl;
 …
     currentCouple = 0;
     if(part.GetParticleType() == "nucleus" &&
+       part.GetParticleSubType() == "generic")
+         firstParticle = G4GenericIon::GenericIon();
+    else firstParticle = &part;
+       part.GetParticleSubType() == "generic") {
+      firstParticle = G4GenericIon::GenericIon();
+    } else {
+      firstParticle = &part;
+    }
     currentParticle = &part;
+  }
   if(1 < verboseLevel) {
-    //    G4cout << "========================================================" << G4endl;
     G4cout << "### G4VMultipleScattering::PrepearPhysicsTable() for "
            << GetProcessName()
 …
+{
   if (0 < verboseLevel) {
+    G4cout << G4endl << GetProcessName() << ":  Model variant of multiple scattering "
+           << "for " << firstParticle->GetParticleName()
+    G4cout << G4endl << GetProcessName()
+           << ":   for " << firstParticle->GetParticleName()
+           << "    SubType= " << GetProcessSubType()
            << G4endl;
     if (theLambdaTable) {
 …
              << " to "
              << G4BestUnit(MaxKinEnergy(),"Energy")
+             << " in " << nBins << " bins."
+             << " in " << nBins << " bins, spline: "
+             << (G4LossTableManager::Instance())->SplineFlag()
              << G4endl;
+    }
-    G4cout << "      LateralDisplacementFlag=  " << latDisplasment
-           << "   Skin= " << skin << G4endl;
     PrintInfo();
+    modelManager->DumpModelList(verboseLevel);
     if (2 < verboseLevel) {
       G4cout << "LambdaTable address= " << theLambdaTable << G4endl;
 …
 G4double G4VMultipleScattering::AlongStepGetPhysicalInteractionLength(
                              const G4Track& track,
                              G4double previousStepSize,
+                             G4double,
                              G4double currentMinimalStep,
                              G4double& currentSafety,
 …
   // get Step limit proposed by the process
   valueGPILSelectionMSC = NotCandidateForSelection;
+  G4double steplength = GetMscContinuousStepLimit(track,previousStepSize,
+                                              currentMinimalStep,currentSafety);
+  G4double steplength = GetMscContinuousStepLimit(track,
+                                                  track.GetKineticEnergy(),
+                                                  currentMinimalStep,
+                                                  currentSafety);
   // G4cout << "StepLimit= " << steplength << G4endl;
   // set return value for G4GPILSelection
 …
   if( couple->IsUsed() ) nbins = nBins;
   G4PhysicsVector* v = new G4PhysicsLogVector(minKinEnergy, maxKinEnergy, nbins);
+  v->SetSpline((G4LossTableManager::Instance())->SplineFlag());
   return v;
+}
 …
                << G4endl;
+    }
+    if((G4LossTableManager::Instance())->SplineFlag()) {
+      size_t n = theLambdaTable->length();
+      for(size_t i=0; i<n; i++) {(* theLambdaTable)[i]->SetSpline(true);}
+    }
   } else {
     if (1 < verboseLevel) {

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

-              r819
+              r961
 // ********************************************************************
 //
 // $Id: G4ionEffectiveCharge.cc,v 1.17.2.1 2008/04/22 15:28:13 vnivanch Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionEffectiveCharge.cc,v 1.24 2008/12/18 13:01:46 gunter Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
 …
 #include "G4ionEffectiveCharge.hh"
 #include "G4UnitsTable.hh"
-#include "G4ParticleDefinition.hh"
 #include "G4Material.hh"
+#include "G4NistManager.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 …
+{
   chargeCorrection = 1.0;
   energyHighLimit  = 10.0*MeV;
+  energyHighLimit  = 20.0*MeV;
   energyLowLimit   = 1.0*keV;
   energyBohr       = 25.*keV;
   massFactor       = amu_c2/(proton_mass_c2*keV);
+  minCharge        = 0.1;
+  minCharge        = 1.0;
+  lastPart         = 0;
+  lastMat          = 0;
+  lastKinEnergy    = 0.0;
+  effCharge        = eplus;
+  nist = G4NistManager::Instance();
+}
 …
 G4double G4ionEffectiveCharge::EffectiveCharge(const G4ParticleDefinition* p,
                                                const G4Material* material,
                                                      G4double kineticEnergy)
+                                               G4double kineticEnergy)
+{
+  if(p == lastPart && material == lastMat && kineticEnergy == lastKinEnergy)
+    return effCharge;
+  lastPart      = p;
+  lastMat       = material;
+  lastKinEnergy = kineticEnergy;
   G4double mass   = p->GetPDGMass();
   G4double charge = p->GetPDGCharge();
 …
   chargeCorrection = 1.0;
+  effCharge = charge;
   // The aproximation of ion effective charge from:
 …
   if( reducedEnergy > Zi*energyHighLimit || Zi < 1.5 || !material) return charge;
-  static G4double c[6] = {0.2865,  0.1266, -0.001429,
-.02402,-0.01135, 0.001475} ;
   G4double z    = material->GetIonisation()->GetZeffective();
+  reducedEnergy = std::max(reducedEnergy,energyLowLimit);
+  G4double q;
+  //  reducedEnergy = std::max(reducedEnergy,energyLowLimit);
   // Helium ion case
   if( Zi < 2.5 ) {
+    static G4double c[6] = {0.2865,  0.1266, -0.001429,
+.02402,-0.01135, 0.001475} ;
     G4double Q = std::max(0.0,std::log(reducedEnergy*massFactor));
 …
     if(tq2 < 0.2) tt *= (1.0 - tq2 + 0.5*tq2*tq2);
     else          tt *= std::exp(-tq2);
+    q = (1.0 + tt) * std::sqrt(ex);
+    effCharge = charge*(1.0 + tt) * std::sqrt(ex);
     // Heavy ion case
   } else {
+    G4double z23  = std::pow(z, 0.666666);
+    G4double zi13 = std::pow(Zi, 0.333333);
+    G4double y;
+    //    = nist->GetZ13(z);
+    //G4double z23  = y*y;
+    G4double zi13 = nist->GetZ13(Zi);
     G4double zi23 = zi13*zi13;
+    G4double e = std::max(reducedEnergy,energyBohr/z23);
+    //    G4double e = std::max(reducedEnergy,energyBohr/z23);
+    //G4double e = reducedEnergy;
     // v1 is ion velocity in vF unit
     G4double eF   = material->GetIonisation()->GetFermiEnergy();
     G4double v1sq = e/eF;
+    G4double v1sq = reducedEnergy/eF;
     G4double vFsq = eF/energyBohr;
+    G4double vF   = std::sqrt(vFsq);
+    G4double y ;
+    G4double vF   = std::sqrt(eF/energyBohr);
     // Faster than Fermi velocity
 …
+    }
+    G4double q;
     G4double y3 = std::pow(y, 0.3) ;
     //    G4cout << "y= " << y << " y3= " << y3 << " v1= " << v1 << " vF= " << vF << G4endl;
+    // G4cout<<"y= "<<y<<" y3= "<<y3<<" v1= "<<v1<<" vF= "<<vF<<G4endl;
     q = 1.0 - std::exp( 0.803*y3 - 1.3167*y3*y3 - 0.38157*y - 0.008983*y*y ) ;
+    //    q = 1.0 - std::exp(-0.95*std::sqrt(reducedEnergy/energyBohr)/zi23);
+    //y *= 0.77;
+    //y *= (0.75 + 0.52/Zi);
+    //if( y < 0.2 ) q = y*(1.0 - 0.5*y);
+    //else          q = 1.0 - std::exp(-y);
     G4double qmin = minCharge/Zi;
     if(q < qmin) q = qmin;
+    effCharge = q*charge;
+    /*
+    G4double x1 = 1.0*effCharge*(1.0 - 0.132*std::log(y))/(y*std::sqrt(z));
+    G4double x2 = 0.1*effCharge*effCharge*energyBohr/reducedEnergy;
+    chargeCorrection = 1.0 + x1 - x2;
+    G4cout << "x1= "<<x1<<" x2= "<< x2<<" corr= "<<chargeCorrection<<G4endl;
+    */
     G4double tq = 7.6 - std::log(reducedEnergy/keV);
 …
     G4double lambda = 10.0 * vF / (zi13 * (6.0 + q));
     if(q < 0.2) lambda *= (1.0 - 0.666666*q - q*q/9.0);
+    if(q < 0.2) lambda *= (1.0 - 0.66666667*q - q*q/9.0);
     else        lambda *= std::pow(1.0-q, 0.666666);
 …
     chargeCorrection = sq * (1.0 + xx);
+  }
   //  G4cout << "G4ionEffectiveCharge: charge= " << charge << " q= " << q
   //         << " chargeCor= " << chargeCorrection
   //       << " e(MeV)= " << kineticEnergy/MeV << G4endl;
   return q*charge;
+  return effCharge;
+}

trunk/source/processes/electromagnetic/xrays/GNUmakefile

-              r819
+              r961
 # $Id: GNUmakefile,v 1.6 2006/04/05 13:34:23 vnivanch Exp $
+# $Id: GNUmakefile,v 1.7 2008/06/13 01:06:31 gum Exp $
 # --------------------------------------------------------------------
 # GNUmakefile for electromagnetic sub-library.  John Allison, 25/6/98.
 …
             -I$(G4BASE)/processes/management/include \
             -I$(G4BASE)/processes/cuts/include \
+            -I$(G4BASE)/processes/electromagnetic/utils/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/particles/bosons/include \

trunk/source/processes/electromagnetic/xrays/History

-              r819
+              r961
 $Id: History,v 1.62 2007/11/02 20:56:36 gum Exp $
+$Id: History,v 1.69 2008/11/14 20:47:11 gum Exp $
 -------------------------------------------------------------------
 …
      ----------------------------------------------------------
+November 08: P. Gumplinger (xrays-V09-01-06)
+- Do not calculate a step limit coming from G4Cerenkov when the
+  minimum beta for a particle to radiate in the material (vacuum)
+  is already 1; fix G4Cerenkov.cc
+November 08: V. Ivanchenko (xrays-V09-01-05)
+- exclude G4MscRadiation from the release
+October 08: P. Gumplinger (xrays-V09-01-04)
+- Add SetProcessSubType(G4EmProcessSubType) to G4Cerenkov.cc
+  and G4Scintillation. Modify G4Cerenkov to allow for
+  MaxBetaChangePerStep, sets PostStepGetPhysicalInteractionLength to
+  where the particle would drop below the Cerenkov threshold in the
+  current material. The Cerenkov photon origins are now sampled
+  according to the linear decrease in the MeanNumberOfPhotons over
+  the step. G4Cerenkov now inherits from G4VProcess. For this to work
+  tracking-V09-01-03 or newer is required.
+July 08: P. Gumplinger (xrays-V09-01-03)
+- In G4Scintillation and G4Cerenkov now
+  SetTouchableHandle(aStep.GetPreStepPoint()->GetTouchableHandle())
+  for the secondaries in the DoIt.
+June 08: P. Gumplinger (xrays-V09-01-02)
+- G4Scintillation: make now use of G4EmSaturation to implement the
+  Birks Correction.
+June 08: P. Gumplinger (xrays-V09-01-01)
+- G4Scintillation, G4Cerenkov
+  trivial name changes: momentum->energy, momenta->energies
+February 08: P. Gumplinger
+- G4BirkScintillation class was removed and scintillation with Birk's law
+  was added to the G4Scintillation class directly.
+February 08: V. Grichine
+- G4BirkScintillation class was added. The class implements the scintillation
+  process with Birk's law
 November 07: P. Gumplinger (xrays-V09-00-03)
 - G4Cerenkov constructor add warning printout about the change

trunk/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh

-              r819
+              r961
 //
 //
 // $Id: G4Cerenkov.hh,v 1.9 2007/09/30 22:17:04 gum Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4Cerenkov.hh,v 1.10 2008/10/22 01:17:36 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 #include "G4ParticleMomentum.hh"
 #include "G4Step.hh"
 #include "G4VDiscreteProcess.hh"
+#include "G4VProcess.hh"
 #include "G4OpticalPhoton.hh"
 #include "G4DynamicParticle.hh"
 …
 /////////////////////
 class G4Cerenkov : public G4VDiscreteProcess
+class G4Cerenkov : public G4VProcess
+{
 …
         // condition for the DoIt to be invoked at every step.
+        G4double PostStepGetPhysicalInteractionLength(const G4Track& aTrack,
+                                                      G4double ,
+                                                      G4ForceCondition* );
+        // Returns the discrete step limit and sets the 'StronglyForced'
+        // condition for the DoIt to be invoked at every step.
         G4VParticleChange* PostStepDoIt(const G4Track& aTrack,
                                         const G4Step&  aStep);
         // This is the method implementing the Cerenkov process.
+        //  no operation in  AtRestDoIt and  AlongStepDoIt
+        virtual G4double AlongStepGetPhysicalInteractionLength(
+                               const G4Track&,
+                               G4double  ,
+                               G4double  ,
+                               G4double& ,
+                               G4GPILSelection*
+                              ) { return -1.0; };
+        virtual G4double AtRestGetPhysicalInteractionLength(
+                               const G4Track& ,
+                               G4ForceCondition*
+                              ) { return -1.0; };
+        //  no operation in  AtRestDoIt and  AlongStepDoIt
+        virtual G4VParticleChange* AtRestDoIt(
+                               const G4Track& ,
+                               const G4Step&
+                              ) {return 0;};
+        virtual G4VParticleChange* AlongStepDoIt(
+                               const G4Track& ,
+                               const G4Step&
+                              ) {return 0;};
         void SetTrackSecondariesFirst(const G4bool state);
 …
         // been tracked, the tracking of the primary resumes.
+        void SetMaxBetaChangePerStep(const G4double d);
+        // Set the maximum allowed change in beta = v/c in % (perCent)
+        // per step.
         void SetMaxNumPhotonsPerStep(const G4int NumPhotons);
         // Set the maximum number of Cerenkov photons allowed to be
 …
         G4bool fTrackSecondariesFirst;
+        G4int  fMaxPhotons;
+        G4double fMaxBetaChange;
+        G4int  fMaxPhotons;
 };
 …
 inline
+void G4Cerenkov::SetMaxBetaChangePerStep(const G4double value)
+{
+        fMaxBetaChange = value*perCent;
+}
+inline
 void G4Cerenkov::SetMaxNumPhotonsPerStep(const G4int NumPhotons)
+{
 …
+}
+inline G4PhysicsTable* G4Cerenkov::GetPhysicsTable() const
+inline
+G4PhysicsTable* G4Cerenkov::GetPhysicsTable() const
+{
   return thePhysicsTable;

trunk/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh

r819	r961
26	26	//
27	27	// $Id: G4ForwardXrayTR.hh,v 1.14 2006/06/29 19:55:33 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4ForwardXrayTR -- header file

trunk/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh

r819	r961
26	26	//
27	27	// $Id: G4GammaXTRadiator.hh,v 1.4 2006/06/29 19:55:35 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh

r819	r961
26	26	//
27	27	// $Id: G4RegularXTRadiator.hh,v 1.3 2006/06/29 19:55:37 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/xrays/include/G4Scintillation.hh

-              r819
+              r961
 //
 //
 // $Id: G4Scintillation.hh,v 1.13 2006/06/29 19:55:39 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Scintillation.hh,v 1.15 2008/06/13 01:04:49 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
 …
 #include "G4PhysicsOrderedFreeVector.hh"
+#include "G4EmSaturation.hh"
 // Class Description:
 // RestDiscrete Process - Generation of Scintillation Photons.
 …
         // Returns the address of the slow scintillation integral table.
+        void AddSaturation(G4EmSaturation* sat) { emSaturation = sat; }
+        // Adds Birks Saturation to the process.
+        G4EmSaturation* GetSaturation() const { return emSaturation; }
+        // Returns the Birks Saturation.
         void DumpPhysicsTable() const;
         // Prints the fast and slow scintillation integral tables.
 private:
+protected:
         void BuildThePhysicsTable();
 …
         ///////////////////////
-protected:
         G4PhysicsTable* theSlowIntegralTable;
         G4PhysicsTable* theFastIntegralTable;
+        G4bool fTrackSecondariesFirst;
+        G4double YieldFactor;
+        G4double ExcitationRatio;
 private:
+        G4bool fTrackSecondariesFirst;
+        G4double YieldFactor;
+        G4double ExcitationRatio;
+        G4EmSaturation* emSaturation;
 };

trunk/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh

r819	r961
26	26	//
27	27	// $Id: G4StrawTubeXTRadiator.hh,v 1.4 2007/09/29 17:49:34 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh

r819	r961
26	26	//
27	27	// $Id: G4SynchrotronRadiation.hh,v 1.4 2006/06/29 19:55:43 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// ------------------------------------------------------------

trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh

r819	r961
26	26	//
27	27	// $Id: G4SynchrotronRadiationInMat.hh,v 1.2 2006/06/29 19:55:45 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// ------------------------------------------------------------

trunk/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh

r819	r961
26	26	//
27	27	// $Id: G4TransitionRadiation.hh,v 1.9 2006/06/29 19:55:47 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4TransitionRadiation -- header file

trunk/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh

r819	r961
26	26	//
27	27	// $Id: G4TransparentRegXTRadiator.hh,v 1.2 2006/06/29 19:55:49 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/xrays/include/G4VTRModel.hh

r819	r961
26	26	//
27	27	// $Id: G4VTRModel.hh,v 1.3 2006/06/29 19:55:51 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4VTRModel -- header file

trunk/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh

r819	r961
26	26	//
27	27	// $Id: G4VTransitionRadiation.hh,v 1.3 2006/06/29 19:55:53 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4VTransitionRadiation -- header file

trunk/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh

r819	r961
26	26	//
27	27	// $Id: G4VXTRenergyLoss.hh,v 1.24 2007/09/29 17:49:34 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	//

trunk/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc

-              r819
+              r961
 //
 //
 // $Id: G4Cerenkov.cc,v 1.23 2007/10/15 20:05:23 gum Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4Cerenkov.cc,v 1.26 2008/11/14 20:16:51 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 ////////////////////////////////////////////////////////////////////////
 …
 #include "G4ios.hh"
 #include "G4Poisson.hh"
+#include "G4EmProcessSubType.hh"
+#include "G4LossTableManager.hh"
+#include "G4MaterialCutsCouple.hh"
+#include "G4ParticleDefinition.hh"
 #include "G4Cerenkov.hh"
 …
 G4Cerenkov::G4Cerenkov(const G4String& processName, G4ProcessType type)
            : G4VDiscreteProcess(processName, type)
+           : G4VProcess(processName, type)
+{
         G4cout << "G4Cerenkov::G4Cerenkov constructor" << G4endl;
         G4cout << "NOTE: this is now a G4VDiscreteProcess!" << G4endl;
+        G4cout << "NOTE: this is now a G4VProcess!" << G4endl;
         G4cout << "Required change in UserPhysicsList: " << G4endl;
         G4cout << "change: pmanager->AddContinuousProcess(theCerenkovProcess);" << G4endl;
 …
         G4cout << "        pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep);" << G4endl;
+        SetProcessSubType(fCerenkov);
         fTrackSecondariesFirst = false;
+        fMaxBetaChange = 0.;
         fMaxPhotons = 0;
 …
+{
         //////////////////////////////////////////////////////
         // Should we ensure that the material is dispersive?
 …
         G4MaterialPropertiesTable* aMaterialPropertiesTable =
                                aMaterial->GetMaterialPropertiesTable();
+        if (!aMaterialPropertiesTable)
+           return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+        if (!aMaterialPropertiesTable) return pParticleChange;
         const G4MaterialPropertyVector* Rindex =
                 aMaterialPropertiesTable->GetProperty("RINDEX");
+        if (!Rindex)
+           return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+        if (!Rindex) return pParticleChange;
         // particle charge
 …
                 aParticleChange.SetNumberOfSecondaries(0);
                 return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+                return pParticleChange;
+        }
 …
                 aParticleChange.SetNumberOfSecondaries(0);
                 return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+                return pParticleChange;
+        }
 …
         ////////////////////////////////////////////////////////////////
         G4double Pmin = Rindex->GetMinPhotonMomentum();
         G4double Pmax = Rindex->GetMaxPhotonMomentum();
+        G4double Pmin = Rindex->GetMinPhotonEnergy();
+        G4double Pmax = Rindex->GetMaxPhotonEnergy();
         G4double dp = Pmax - Pmin;
 …
         G4double maxSin2 = (1.0 - maxCos) * (1.0 + maxCos);
+        const G4double beta1 = pPreStepPoint ->GetBeta();
+        const G4double beta2 = pPostStepPoint->GetBeta();
+        G4double MeanNumberOfPhotons1 =
+                     GetAverageNumberOfPhotons(charge,beta1,aMaterial,Rindex);
+        G4double MeanNumberOfPhotons2 =
+                     GetAverageNumberOfPhotons(charge,beta2,aMaterial,Rindex);
         for (G4int i = 0; i < NumPhotons; i++) {
                 // Determine photon momentum
+                // Determine photon energy
                 G4double rand;
                 G4double sampledMomentum, sampledRI;
+                G4double sampledEnergy, sampledRI;
                 G4double cosTheta, sin2Theta;
                 // sample a momentum
+                // sample an energy
                 do {
                         rand = G4UniformRand();
                         sampledMomentum = Pmin + rand * dp;
                         sampledRI = Rindex->GetProperty(sampledMomentum);
+                        sampledEnergy = Pmin + rand * dp;
+                        sampledRI = Rindex->GetProperty(sampledEnergy);
                         cosTheta = BetaInverse / sampledRI;
 …
                 G4double cosPhi = cos(phi);
                 // calculate x,y, and z components of photon momentum
+                // calculate x,y, and z components of photon energy
                 // (in coord system with primary particle direction
                 //  aligned with the z axis)
 …
                                       photonPolarization.z());
                 aCerenkovPhoton->SetKineticEnergy(sampledMomentum);
+                aCerenkovPhoton->SetKineticEnergy(sampledEnergy);
                 // Generate new G4Track object:
+                rand = G4UniformRand();
+                G4double delta = rand * aStep.GetStepLength();
+                G4double delta, NumberOfPhotons, N;
+                do {
+                   rand = G4UniformRand();
+                   delta = rand * aStep.GetStepLength();
+                   NumberOfPhotons = MeanNumberOfPhotons1 - delta *
+                                (MeanNumberOfPhotons1-MeanNumberOfPhotons2)/
+                                              aStep.GetStepLength();
+                   N = G4UniformRand() *
+                       std::max(MeanNumberOfPhotons1,MeanNumberOfPhotons2);
+                } while (N > NumberOfPhotons);
                 G4double deltaTime = delta /
                        ((pPreStepPoint->GetVelocity()+
 …
                 new G4Track(aCerenkovPhoton,aSecondaryTime,aSecondaryPosition);
+                aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
+                aSecondaryTrack->SetTouchableHandle(
+                                 aStep.GetPreStepPoint()->GetTouchableHandle());
                 aSecondaryTrack->SetParentID(aTrack.GetTrackID());
 …
+        }
         return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+        return pParticleChange;
+}
 …
                       // Retrieve the first refraction index in vector
                       // of (photon momentum, refraction index) pairs
+                      // of (photon energy, refraction index) pairs
                       theRefractionIndexVector->ResetIterator();
 …
                       if (currentRI > 1.0) {
                          // Create first (photon momentum, Cerenkov Integral)
+                         // Create first (photon energy, Cerenkov Integral)
                          // pair
                          G4double currentPM = theRefractionIndexVector->
                                                  GetPhotonMomentum();
+                                                 GetPhotonEnergy();
                          G4double currentCAI = 0.0;
 …
                          G4double prevRI  = currentRI;
                          // loop over all (photon momentum, refraction index)
+                         // loop over all (photon energy, refraction index)
                          // pairs stored for this material
 …
                                 currentPM = theRefractionIndexVector->
                                                 GetPhotonMomentum();
+                                                GetPhotonEnergy();
                                 currentCAI = 0.5*(1.0/(prevRI*prevRI) +
 …
 //
+G4double G4Cerenkov::GetMeanFreePath(const G4Track& aTrack,
+G4double G4Cerenkov::GetMeanFreePath(const G4Track&,
+                                           G4double,
+                                           G4ForceCondition*)
+{
+        return 1.;
+}
+G4double G4Cerenkov::PostStepGetPhysicalInteractionLength(
+                                           const G4Track& aTrack,
                                            G4double,
                                            G4ForceCondition* condition)
+{
+        *condition = StronglyForced;
+        // If user has defined an average maximum number of photons to
+        // be generated in a Step, then return the Step length for that
+        // number of photons.
+        if (fMaxPhotons <= 0) return DBL_MAX;
+        *condition = NotForced;
+        G4double StepLimit = DBL_MAX;
         const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
         const G4Material* aMaterial = aTrack.GetMaterial();
+        G4MaterialPropertiesTable* aMaterialPropertiesTable =
+                               aMaterial->GetMaterialPropertiesTable();
+        if (!aMaterialPropertiesTable) return DBL_MAX;
+        const G4MaterialPropertyVector* Rindex =
+                aMaterialPropertiesTable->GetProperty("RINDEX");
+        if (!Rindex) return DBL_MAX;
+        // particle charge
+        const G4double charge = aParticle->GetDefinition()->GetPDGCharge();
+        const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple();
+        const G4double kineticEnergy = aParticle->GetKineticEnergy();
+        const G4ParticleDefinition* particleType = aParticle->GetDefinition();
+        const G4double mass = particleType->GetPDGMass();
         // particle beta
         const G4double beta = aParticle->GetTotalMomentum() /
                               aParticle->GetTotalEnergy();
+        G4double MeanNumberOfPhotons =
+                 GetAverageNumberOfPhotons(charge,beta,aMaterial,Rindex);
+        if(MeanNumberOfPhotons <= 0.0) return DBL_MAX;
+        G4double StepLimit = fMaxPhotons / MeanNumberOfPhotons;
+        return StepLimit;
+        // particle gamma
+        const G4double gamma = 1./std::sqrt(1.-beta*beta);
+        G4MaterialPropertiesTable* aMaterialPropertiesTable =
+                            aMaterial->GetMaterialPropertiesTable();
+        const G4MaterialPropertyVector* Rindex = NULL;
+        if (aMaterialPropertiesTable)
+                     Rindex = aMaterialPropertiesTable->GetProperty("RINDEX");
+        G4double nMax;
+        if (Rindex) {
+           nMax = Rindex->GetMaxProperty();
+        } else {
+           return StepLimit;
+        }
+        G4double BetaMin = 1./nMax;
+        if ( BetaMin >= 1. ) return StepLimit;
+        G4double GammaMin = 1./std::sqrt(1.-BetaMin*BetaMin);
+        if (gamma < GammaMin ) return StepLimit;
+        G4double kinEmin = mass*(GammaMin-1.);
+        G4double RangeMin = G4LossTableManager::Instance()->
+                                                   GetRange(particleType,
+                                                            kinEmin,
+                                                            couple);
+        G4double Range    = G4LossTableManager::Instance()->
+                                                   GetRange(particleType,
+                                                            kineticEnergy,
+                                                            couple);
+        G4double Step = Range - RangeMin;
+        if (Step < 1.*um ) return StepLimit;
+        if (Step > 0. && Step < StepLimit) StepLimit = Step;
+        // If user has defined an average maximum number of photons to
+        // be generated in a Step, then calculate the Step length for
+        // that number of photons.
+        if (fMaxPhotons > 0) {
+           // particle charge
+           const G4double charge = aParticle->
+                                   GetDefinition()->GetPDGCharge();
+           G4double MeanNumberOfPhotons =
+                    GetAverageNumberOfPhotons(charge,beta,aMaterial,Rindex);
+           G4double Step = 0.;
+           if (MeanNumberOfPhotons > 0.0) Step = fMaxPhotons /
+                                                 MeanNumberOfPhotons;
+           if (Step > 0. && Step < StepLimit) StepLimit = Step;
+        }
+        // If user has defined an maximum allowed change in beta per step
+        if (fMaxBetaChange > 0.) {
+           G4double dedx = G4LossTableManager::Instance()->
+                                                   GetDEDX(particleType,
+                                                           kineticEnergy,
+                                                           couple);
+           G4double deltaGamma = gamma -
+./std::sqrt(1.-beta*beta*
+                                                 (1.-fMaxBetaChange)*
+                                                 (1.-fMaxBetaChange));
+           G4double Step = mass * deltaGamma / dedx;
+           if (Step > 0. && Step < StepLimit) StepLimit = Step;
+        }
+        *condition = StronglyForced;
+        return StepLimit;
+}
 …
         if(!(CerenkovAngleIntegrals->IsFilledVectorExist()))return 0.0;
         // Min and Max photon momenta
         G4double Pmin = Rindex->GetMinPhotonMomentum();
         G4double Pmax = Rindex->GetMaxPhotonMomentum();
+        // Min and Max photon energies
+        G4double Pmin = Rindex->GetMinPhotonEnergy();
+        G4double Pmax = Rindex->GetMaxPhotonEnergy();
         // Min and Max Refraction Indices
 …
         // If n(Pmin) < 1/Beta, and n(Pmax) >= 1/Beta, then
         // we need to find a P such that the value of n(P) == 1/Beta.
         // Interpolation is performed by the GetPhotonMomentum() and
+        // Interpolation is performed by the GetPhotonEnergy() and
         // GetProperty() methods of the G4MaterialPropertiesTable and
         // the GetValue() method of G4PhysicsVector.
         else {
                 Pmin = Rindex->GetPhotonMomentum(BetaInverse);
+                Pmin = Rindex->GetPhotonEnergy(BetaInverse);
                 dp = Pmax - Pmin;

trunk/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc

r819	r961
26	26	//
27	27	// $Id: G4ForwardXrayTR.cc,v 1.14 2007/05/11 14:23:04 gcosmo Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4ForwardXrayTR class -- implementation file

trunk/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc

r819	r961
26	26	//
27	27	// $Id: G4GammaXTRadiator.cc,v 1.5 2006/06/29 19:56:07 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

trunk/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc

r819	r961
26	26	//
27	27	// $Id: G4RegularXTRadiator.cc,v 1.9 2006/06/29 19:56:09 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

trunk/source/processes/electromagnetic/xrays/src/G4Scintillation.cc

-              r819
+              r961
 //
 //
 // $Id: G4Scintillation.cc,v 1.26 2006/06/29 19:56:11 gunter Exp $
 // GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Scintillation.cc,v 1.30 2008/10/22 01:19:11 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 ////////////////////////////////////////////////////////////////////////
 …
 #include "G4ios.hh"
+#include "G4EmProcessSubType.hh"
 #include "G4Scintillation.hh"
 …
                   : G4VRestDiscreteProcess(processName, type)
+{
+        SetProcessSubType(fScintillation);
         fTrackSecondariesFirst = false;
 …
         BuildThePhysicsTable();
+        emSaturation = NULL;
+}
 …
         G4double ScintillationYield = aMaterialPropertiesTable->
                                       GetConstProperty("SCINTILLATIONYIELD");
+        ScintillationYield *= YieldFactor;
         G4double ResolutionScale    = aMaterialPropertiesTable->
                                       GetConstProperty("RESOLUTIONSCALE");
+        ScintillationYield = YieldFactor * ScintillationYield;
+        G4double MeanNumberOfPhotons = ScintillationYield * TotalEnergyDeposit;
+        // Birks law saturation:
+        G4double constBirks = 0.0;
+        constBirks = aMaterial->GetIonisation()->GetBirksConstant();
+        G4double MeanNumberOfPhotons;
+        if (emSaturation) {
+           MeanNumberOfPhotons = ScintillationYield*
+                              (emSaturation->VisibleEnergyDeposition(&aStep));
+        } else {
+           MeanNumberOfPhotons = ScintillationYield*TotalEnergyDeposit;
+        }
         G4int NumPhotons;
+        if (MeanNumberOfPhotons > 10.) {
+        if (MeanNumberOfPhotons > 10.)
+        {
           G4double sigma = ResolutionScale * sqrt(MeanNumberOfPhotons);
           NumPhotons = G4int(G4RandGauss::shoot(MeanNumberOfPhotons,sigma)+0.5);
+        }
+        else {
+        else
+        {
           NumPhotons = G4int(G4Poisson(MeanNumberOfPhotons));
+        }
         if (NumPhotons <= 0) {
+        if (NumPhotons <= 0)
+        {
            // return unchanged particle and no secondaries
 …
             for (G4int i = 0; i < Num; i++) {
                 // Determine photon momentum
+                // Determine photon energy
                 G4double CIIvalue = G4UniformRand()*CIImax;
                 G4double sampledMomentum =
+                G4double sampledEnergy =
                               ScintillationIntegral->GetEnergy(CIIvalue);
                 if (verboseLevel>1) {
                    G4cout << "sampledMomentum = " << sampledMomentum << G4endl;
+                   G4cout << "sampledEnergy = " << sampledEnergy << G4endl;
                    G4cout << "CIIvalue =        " << CIIvalue << G4endl;
+                }
 …
                                       photonPolarization.z());
                 aScintillationPhoton->SetKineticEnergy(sampledMomentum);
+                aScintillationPhoton->SetKineticEnergy(sampledEnergy);
                 // Generate new G4Track object:
 …
                 new G4Track(aScintillationPhoton,aSecondaryTime,aSecondaryPosition);
+                aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
+                aSecondaryTrack->SetTouchableHandle(
+                                 aStep.GetPreStepPoint()->GetTouchableHandle());
+                // aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
                 aSecondaryTrack->SetParentID(aTrack.GetTrackID());
 …
                       // Retrieve the first intensity point in vector
                       // of (photon momentum, intensity) pairs
+                      // of (photon energy, intensity) pairs
                       theFastLightVector->ResetIterator();
 …
                       if (currentIN >= 0.0) {
                          // Create first (photon momentum, Scintillation
+                         // Create first (photon energy, Scintillation
                          // Integral pair
                          G4double currentPM = theFastLightVector->
                                                  GetPhotonMomentum();
+                                                 GetPhotonEnergy();
                          G4double currentCII = 0.0;
 …
                          G4double prevIN  = currentIN;
                          // loop over all (photon momentum, intensity)
+                         // loop over all (photon energy, intensity)
                          // pairs stored for this material
 …
+                         {
                                 currentPM = theFastLightVector->
                                                 GetPhotonMomentum();
+                                                GetPhotonEnergy();
                                 currentIN=theFastLightVector->
 …
                       // Retrieve the first intensity point in vector
                       // of (photon momentum, intensity) pairs
+                      // of (photon energy, intensity) pairs
                       theSlowLightVector->ResetIterator();
 …
                       if (currentIN >= 0.0) {
                          // Create first (photon momentum, Scintillation
+                         // Create first (photon energy, Scintillation
                          // Integral pair
                          G4double currentPM = theSlowLightVector->
                                                  GetPhotonMomentum();
+                                                 GetPhotonEnergy();
                          G4double currentCII = 0.0;
 …
                          G4double prevIN  = currentIN;
                          // loop over all (photon momentum, intensity)
+                         // loop over all (photon energy, intensity)
                          // pairs stored for this material
 …
+                         {
                                 currentPM = theSlowLightVector->
                                                 GetPhotonMomentum();
+                                                GetPhotonEnergy();
                                 currentIN=theSlowLightVector->

trunk/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc

r819	r961
26	26	//
27	27	// $Id: G4StrawTubeXTRadiator.cc,v 1.6 2007/09/29 17:49:34 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc

r819	r961
26	26	//
27	27	// $Id: G4SynchrotronRadiation.cc,v 1.5 2006/06/29 19:56:15 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc

r819	r961
26	26	//
27	27	// $Id: G4SynchrotronRadiationInMat.cc,v 1.2 2006/06/29 19:56:17 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// --------------------------------------------------------------

trunk/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc

r819	r961
26	26	//
27	27	// $Id: G4TransitionRadiation.cc,v 1.7 2006/06/29 19:56:19 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4TransitionRadiation class -- implementation file

trunk/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc

r819	r961
26	26	//
27	27	// $Id: G4TransparentRegXTRadiator.cc,v 1.11 2007/09/29 17:49:34 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30

trunk/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc

r819	r961
26	26	//
27	27	// $Id: G4VTransitionRadiation.cc,v 1.5 2006/06/29 19:56:23 gunter Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// G4VTransitionRadiation class -- implementation file

trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc

r819	r961
26	26	//
27	27	// $Id: G4VXTRenergyLoss.cc,v 1.44 2007/09/29 17:49:34 vnivanch Exp $
28		// GEANT4 tag $Name: $
	28	// GEANT4 tag $Name: geant4-09-02-ref-02 $
29	29	//
30	30	// History:

Context Navigation

Legend: