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

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/utils/src/G4EmSaturation.cc (modified) (11 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmSaturation.cc,v 1.10 2009/09/25 09:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmSaturation.cc,v 1.11 2010/10/25 17:23:01 vnivanch Exp $
+// GEANT4 tag $Name: emutils-V09-03-23 $
 //
 // -------------------------------------------------------------------
@@ -59 +59 @@
   verbose = 1;
   manager = 0;
+
   curMaterial = 0;
-  curBirks = 0.0;
-  curRatio = 1.0;
+  curBirks    = 0.0;
+  curRatio    = 1.0;
   curChargeSq = 1.0;
-  nMaterials = 0;
+  nMaterials  = 0;
+
   electron = 0;
+  proton   = 0;
+  nist     = G4NistManager::Instance();
+
   Initialise(); 
 }
@@ -82 +87 @@
                                       G4double niel)
 {
-  if(edep <= 0.0) return 0.0;
+  if(edep <= 0.0) { return 0.0; }
 
   G4double evis = edep;
@@ -109 +114 @@
 
       // continues energy loss
-      if(eloss > 0.0) eloss /= (1.0 + bfactor*eloss/length);
+      if(eloss > 0.0) { eloss /= (1.0 + bfactor*eloss/length); }
  
       // non-ionizing energy loss
       if(nloss > 0.0) {
-        if(!proton) {proton = G4Proton::Proton();}
+        if(!proton) { proton = G4Proton::Proton(); }
         G4double escaled = nloss*curRatio;
         G4double s = manager->GetRange(proton,escaled,couple)/curChargeSq; 
@@ -133 +138 @@
   // is this material in the vector?
   
-  for(G4int j=0; j<nG4Birks; j++) {
+  for(G4int j=0; j<nG4Birks; ++j) {
     if(name == g4MatNames[j]) {
       if(verbose > 0) 
@@ -152 +157 @@
   if(!manager) {
     manager = G4LossTableManager::Instance();
-    nist    = G4NistManager::Instance();
     electron= G4Electron::Electron();
-    proton  = 0;
-  }
-
-  if(mat == curMaterial) return curBirks;
+  }
+
+  if(mat == curMaterial) { return curBirks; }
 
   curMaterial = mat;
@@ -165 +168 @@
 
   // seach in the run-time list
-  for(G4int i=0; i<nMaterials; i++) {
+  for(G4int i=0; i<nMaterials; ++i) {
     if(mat == matPointers[i]) {
       curBirks = mat->GetIonisation()->GetBirksConstant();
@@ -180 +183 @@
   // seach in the Geant4 list
   if(curBirks == 0.0) {
-    for(G4int j=0; j<nG4Birks; j++) {
+    for(G4int j=0; j<nG4Birks; ++j) {
       if(name == g4MatNames[j]) {
         mat->GetIonisation()->SetBirksConstant(g4MatData[j]);
@@ -201 +204 @@
   const G4double* theAtomNumDensityVector = mat->GetVecNbOfAtomsPerVolume();
   size_t nelm = mat->GetNumberOfElements();
-  for (size_t i=0; i<nelm; i++) {
+  for (size_t i=0; i<nelm; ++i) {
     const G4Element* elm = (*theElementVector)[i];
     G4double Z = elm->GetZ();
@@ -231 +234 @@
   if(nMaterials > 0) {
     G4cout << "### Birks coeffitients used in run time" << G4endl;
-    for(G4int i=0; i<nMaterials; i++) {
+    for(G4int i=0; i<nMaterials; ++i) {
       G4double br = matPointers[i]->GetIonisation()->GetBirksConstant();
       G4cout << "   " << matNames[i] << "     " 
@@ -248 +251 @@
   if(nG4Birks > 0) {
     G4cout << "### Birks coeffitients for Geant4 materials" << G4endl;
-    for(G4int i=0; i<nG4Birks; i++) {
+    for(G4int i=0; i<nG4Birks; ++i) {
       G4cout << "   " << g4MatNames[i] << "   " 
              << g4MatData[i]*MeV/mm << " mm/MeV" << G4endl;