Import Geant4 10.7.1 source tree

source/processes/electromagnetic/utils/History

@@ -16,6 +16,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+30 January 21: V.Ivanchenko (emutils-V10-06-16)
+- G4VEnergyLossProcess, G4VEmProcess, - improved printout
+  G4EmExtraParameters, G4EmExtraParametersMessenger - fixed #2292
+
+11 January 21: V.Ivanchenko
+- G4EmCorrections - fix 2-D interpolation of shell corrections 
+    (problem #2308), which provides minor change of ranges of 
+    charge particles (< 0.1 mm)
+
 12 November 20: B. Morgan (emutils-V10-06-15)
 - Apply typo fixes from Gurkan Myczko (https://github.com/Geant4/geant4/pull/15)
 

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

@@ -287,9 +287,8 @@ inline G4double G4EmCorrections::Value2(G4double xv, G4double yv,
                                         G4double z11, G4double z21, 
                                         G4double z12, G4double z22) const
 {
-  return (z11*(x2-xv)*(y2-yv) + z22*(xv-x1)*(yv-y1) +
-          0.5*(z12*((x2-xv)*(yv-y1)+(xv-x1)*(y2-yv))+
-               z21*((xv-x1)*(y2-yv)+(yv-y1)*(x2-xv))))
+  return ( z11*(x2-xv)*(y2-yv) + z22*(xv-x1)*(yv-y1) +
+	   z12*(x2-xv)*(yv-y1) + z21*(xv-x1)*(y2-yv) )
          / ((x2-x1)*(y2-y1));
 }
 

source/processes/electromagnetic/utils/src/G4EmExtraParameters.cc

@@ -284,7 +284,7 @@ const std::vector<G4String>& G4EmExtraParameters::TypesPhysics() const
 
 void G4EmExtraParameters::SetSubCutoff(G4bool val, const G4String& region)
 {
-  G4String r = CheckRegion(region);
+  const G4String& r = CheckRegion(region);
   G4int nreg =  m_regnamesSubCut.size();
   for(G4int i=0; i<nreg; ++i) {
     if(r == m_regnamesSubCut[i]) { 
@@ -326,13 +326,13 @@ G4EmExtraParameters::ActivateForcedInteraction(const G4String& procname,
                                                G4double length, 
                                                G4bool wflag)
 {
-  G4String r = CheckRegion(region);
+  const G4String& r = CheckRegion(region);
   if(length >= 0.0) {
     G4int n =  m_procForced.size();
     for(G4int i=0; i<n; ++i) {
       if(procname == m_procForced[i] && r == m_regnamesForced[i] ) { 
 	m_lengthForced[i] = length;
-	m_weightForced[i]= wflag;
+	m_weightForced[i] = wflag;
 	return; 
       }
     }
@@ -355,7 +355,7 @@ G4EmExtraParameters::ActivateSecondaryBiasing(const G4String& procname,
                                               G4double factor,
                                               G4double energyLim)
 {
-  G4String r = CheckRegion(region);
+  const G4String& r = CheckRegion(region);
   if(factor >= 0.0 && energyLim >= 0.0) {
     G4int n =  m_procBiasedSec.size();
     for(G4int i=0; i<n; ++i) {

source/processes/electromagnetic/utils/src/G4EmExtraParametersMessenger.cc

@@ -94,6 +94,12 @@ G4EmExtraParametersMessenger::G4EmExtraParametersMessenger(G4EmExtraParameters*
   SubSecCmd->SetGuidance("  Region   : region name");
   SubSecCmd->AvailableForStates(G4State_PreInit);
 
+  G4UIparameter* subSec = new G4UIparameter("subSec",'s',false);
+  SubSecCmd->SetParameter(subSec);
+
+  G4UIparameter* subSecReg = new G4UIparameter("Region",'s',false);
+  SubSecCmd->SetParameter(subSecReg);
+
   StepFuncCmd = new G4UIcommand("/process/eLoss/StepFunction",this);
   StepFuncCmd->SetGuidance("Set the energy loss step limitation parameters for e+-.");
   StepFuncCmd->SetGuidance("  dRoverR   : max Range variation per step");
@@ -167,12 +173,6 @@ G4EmExtraParametersMessenger::G4EmExtraParametersMessenger(G4EmExtraParameters*
   unitPrm3->SetDefaultValue("mm");
   StepFuncCmd3->SetParameter(unitPrm3);
 
-  G4UIparameter* subSec = new G4UIparameter("subSec",'s',false);
-  SubSecCmd->SetParameter(subSec);
-
-  G4UIparameter* subSecReg = new G4UIparameter("Region",'s',false);
-  SubSecCmd->SetParameter(subSecReg);
-
   bfCmd = new G4UIcommand("/process/em/setBiasingFactor",this);
   bfCmd->SetGuidance("Set factor for the process cross section.");
   bfCmd->SetGuidance("  procName   : process name");

source/processes/electromagnetic/utils/src/G4VEmProcess.cc

@@ -897,10 +897,7 @@ G4bool G4VEmProcess::StorePhysicsTable(const G4ParticleDefinition* part,
     yes = theLambdaTable->StorePhysicsTable(nam,ascii);
 
     if ( yes ) {
-      G4cout << "Physics table is stored for " << particle->GetParticleName()
-             << " and process " << GetProcessName()
-             << " in the directory <" << directory
-             << "> " << G4endl;
+      if(0 < verboseLevel) G4cout << "Stored: " << nam << G4endl;
     } else {
       G4cout << "Fail to store Physics Table for " 
              << particle->GetParticleName()
@@ -915,11 +912,13 @@ G4bool G4VEmProcess::StorePhysicsTable(const G4ParticleDefinition* part,
     yes = theLambdaTablePrim->StorePhysicsTable(name,ascii);
 
     if ( yes ) {
-      G4cout << "Physics table prim is stored for " 
-             << particle->GetParticleName()
-             << " and process " << GetProcessName()
-             << " in the directory <" << directory
-             << "> " << G4endl;
+      if(0 < verboseLevel) {
+	G4cout << "Physics table prim is stored for " 
+	       << particle->GetParticleName()
+	       << " and process " << GetProcessName()
+	       << " in the directory <" << directory
+	       << "> " << G4endl;
+      }
     } else {
       G4cout << "Fail to store Physics Table Prim for " 
              << particle->GetParticleName()

source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc

@@ -1738,21 +1738,6 @@ G4bool G4VEnergyLossProcess::StorePhysicsTable(
   if(!StoreTable(part,theSubLambdaTable,ascii,directory,"SubLambda")) 
     {res = false;}
 
-  if ( !res ) {
-    if(1 < 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;
 }
 
@@ -1765,7 +1750,7 @@ G4VEnergyLossProcess::RetrievePhysicsTable(const G4ParticleDefinition* part,
 {
   G4bool res = true;
   if (!isMaster) return res;
-  const G4String particleName = part->GetParticleName();
+  const G4String& particleName = part->GetParticleName();
 
   if(1 < verboseLevel) {
     G4cout << "G4VEnergyLossProcess::RetrievePhysicsTable() for "
@@ -1830,14 +1815,15 @@ G4bool G4VEnergyLossProcess::StoreTable(const G4ParticleDefinition* part,
                                         const G4String& directory,
                                         const G4String& tname)
 {
-  //G4cout << "G4VEnergyLossProcess::StoreTable: " << aTable
-  //         << "  " << directory << "  " << tname << G4endl;
   G4bool res = true;
   if ( aTable ) {
-    const G4String name = GetPhysicsTableFileName(part,directory,tname,ascii);
-    G4cout << name << G4endl;
-    //G4cout << *aTable << G4endl;
-    if( !aTable->StorePhysicsTable(name,ascii)) res = false;
+    const G4String& name = GetPhysicsTableFileName(part, directory, tname, ascii);
+    if ( aTable->StorePhysicsTable(name,ascii) ) {
+      if (0 < verboseLevel) G4cout << "Stored: " << name << G4endl;
+    } else {
+      res = false;
+      G4cout << "Fail to store: " << name << G4endl;
+    }
   }
   return res;
 }