Import Geant4 10.6.1 source tree

source/processes/electromagnetic/utils/History

@@ -16,12 +16,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+13 January 19: V.Ivanchenko (emutils-V10-05-23)
+- G4EmParameters, G4EmParametersMessenger - added new parameter
+    to enable read of e+e- production table from file (CMS request)
+
 16 October 19: D.Sawkey (emutils-V10-05-22)
 - G4EmBiasingManager - delete non-tracked particles
 
 11 October 19: W.G.Shin, S.Incerti (emutils-V10-05-21)
-- G4DNAModelSubType.hh : added Kreipl and Meesungnoen amorphous 
-ice models
+- G4DNAModelSubType.hh : added Kreipl and Meesungnoen amorphous
+  ice models
 - G4EmLowEParametersMessenger.* : added corresponding commands
 
 10 October 19: V.Ivanchenko (emutils-V10-05-20)

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

@@ -168,12 +168,15 @@ public:
   void SetEnablePolarisation(G4bool val);
   G4bool EnablePolarisation() const;
 
-  G4bool GetDirectionalSplitting();
+  G4bool GetDirectionalSplitting() const;
   void SetDirectionalSplitting(G4bool v);
 
-  G4bool QuantumEntanglement();
+  G4bool QuantumEntanglement() const;
   void SetQuantumEntanglement(G4bool v);
 
+  G4bool RetrieveMuDataFromFile() const;
+  void SetRetrieveMuDataFromFile(G4bool v);
+
   // 5d
   void  SetOnIsolated(G4bool val);
   G4bool  OnIsolated() const;
@@ -378,6 +381,7 @@ private:
   G4bool gener;
   G4bool fSamplingTable;
   G4bool fPolarisation;
+  G4bool fMuDataFromFile;
   G4bool onIsolated; // 5d model conversion on free ions
   G4bool fDNA;
   

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

@@ -99,6 +99,7 @@ private:
   G4UIcmdWithABool*          onIsolatedCmd;
   G4UIcmdWithABool*          sampleTCmd;
   G4UIcmdWithABool*          icru90Cmd;
+  G4UIcmdWithABool*          mudatCmd;
 
   G4UIcmdWithADouble*        minSubSecCmd;
   G4UIcmdWithADoubleAndUnit* minEnCmd;

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

@@ -136,6 +136,7 @@ void G4EmParameters::Initialise()
   onIsolated = false;
   fSamplingTable = false;
   fPolarisation = false;
+  fMuDataFromFile = false;
   fDNA = false;
 
   minSubRange = 1.0;
@@ -414,6 +415,7 @@ G4bool G4EmParameters::BirksActive() const
 
 void G4EmParameters::SetUseICRU90Data(G4bool val)
 {
+  if(IsLocked()) { return; }
   fICRU90 = val;
 }
 
@@ -481,6 +483,16 @@ void G4EmParameters::SetEmSaturation(G4EmSaturation* ptr)
   }
 }
 
+G4bool G4EmParameters::RetrieveMuDataFromFile() const
+{
+  return fMuDataFromFile;
+}
+
+void G4EmParameters::SetRetrieveMuDataFromFile(G4bool v)
+{
+  fMuDataFromFile = v;
+}
+
 void G4EmParameters::SetOnIsolated(G4bool val)
 {
   if(IsLocked()) { return; }
@@ -1156,7 +1168,7 @@ void G4EmParameters::DefineRegParamForEM(G4VEmProcess* ptr) const
   fBParameters->DefineRegParamForEM(ptr);
 }
 
-G4bool G4EmParameters::QuantumEntanglement()
+G4bool G4EmParameters::QuantumEntanglement() const
 {
   return fBParameters->QuantumEntanglement(); 
 }
@@ -1167,7 +1179,7 @@ void G4EmParameters::SetQuantumEntanglement(G4bool v)
   fBParameters->SetQuantumEntanglement(v); 
 }
 
-G4bool G4EmParameters::GetDirectionalSplitting() { 
+G4bool G4EmParameters::GetDirectionalSplitting() const { 
   return fBParameters->GetDirectionalSplitting(); 
 }
 
@@ -1266,7 +1278,8 @@ void G4EmParameters::StreamInfo(std::ostream& os) const
      <<G4BestUnit(maxKinEnergyCSDA,"Energy") << "\n";
   os << "Max kinetic energy for NIEL computation            " 
      <<G4BestUnit(maxNIELEnergy,"Energy") << "\n";
-  os << "Linear loss limit " <<linLossLimit << "\n";
+  os << "Linear loss limit                                  " <<linLossLimit << "\n";
+  os << "Read data from file for e+e- pair production by mu " <<fMuDataFromFile << "\n";
 
   os << "=======================================================================" << "\n";
   os << "======                 Multiple Scattering Parameters          ========" << "\n";

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

@@ -174,6 +174,12 @@ G4EmParametersMessenger::G4EmParametersMessenger(G4EmParameters* ptr)
   icru90Cmd->SetDefaultValue(false);
   icru90Cmd->AvailableForStates(G4State_PreInit);
 
+  mudatCmd = new G4UIcmdWithABool("/process/em/MuDataFromFile",this);
+  mudatCmd->SetGuidance("Enable usage of muon data from file");
+  mudatCmd->SetParameterName("mudat",true);
+  mudatCmd->SetDefaultValue(false);
+  mudatCmd->AvailableForStates(G4State_PreInit);
+
   minSubSecCmd = new G4UIcmdWithADouble("/process/eLoss/minsubsec",this);
   minSubSecCmd->SetGuidance("Set the ratio subcut/cut ");
   minSubSecCmd->SetParameterName("rcmin",true);
@@ -408,6 +414,7 @@ G4EmParametersMessenger::~G4EmParametersMessenger()
   delete onIsolatedCmd;
   delete sampleTCmd;
   delete icru90Cmd;
+  delete mudatCmd;
 
   delete minSubSecCmd;
   delete minEnCmd;
@@ -496,6 +503,8 @@ void G4EmParametersMessenger::SetNewValue(G4UIcommand* command,
     theParameters->SetGeneralProcessActive(sharkCmd->GetNewBoolValue(newValue));
   } else if (command == sampleTCmd) {
     theParameters->SetEnableSamplingTable(sampleTCmd->GetNewBoolValue(newValue));
+  } else if (command == mudatCmd) {
+    theParameters->SetRetrieveMuDataFromFile(mudatCmd->GetNewBoolValue(newValue));
 
   } else if (command == minSubSecCmd) {
     theParameters->SetMinSubRange(minSubSecCmd->GetNewDoubleValue(newValue));