Import Geant4 11.1.1 source tree

source/processes/electromagnetic/standard/History

@@ -6,6 +6,12 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2022-12-21 V.Ivanchenko (emstand-V11-00-22)
+- G4GoudsmithSoundersonMscModel - fixed warning when build CMSSW
+
+## 2022-12-11 V.Ivanchenko
+- G4UrbanMscModel - added flag MscPositronCorrection
+
 ## 2022-11-23 Gabriele Cosmo (emstand-V11-00-21)
 - Fixed more compilation warnings for implicit type conversions.
 

source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh

@@ -277,7 +277,7 @@ void G4GoudsmitSaundersonMscModel::SetParticle(const G4ParticleDefinition* p)
 inline
 G4double G4GoudsmitSaundersonMscModel::Randomizetlimit()
 {
-  G4double temptlimit = tlimit;
+  G4double temptlimit;
     do {
          temptlimit = G4RandGauss::shoot(rndmEngineMod,tlimit,0.1*tlimit);
        } while ( (temptlimit<0.) || (temptlimit>2.*tlimit));

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

@@ -192,6 +192,7 @@ private:
 
   G4bool latDisplasmentbackup;
   G4bool dispAlg96;
+  G4bool fPosiCorrection = true;
   G4bool isFirstInstance = false;
 };
 

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

@@ -151,7 +151,8 @@ void G4UrbanMscModel::Initialise(const G4ParticleDefinition* p,
   InitialiseParameters(p);
 
   latDisplasmentbackup = latDisplasment;
-  dispAlg96 = (G4EmParameters::Instance()->LateralDisplacementAlg96());
+  dispAlg96 = G4EmParameters::Instance()->LateralDisplacementAlg96();
+  fPosiCorrection = G4EmParameters::Instance()->MscPositronCorrection();
 
   // initialise cache only once
   if(0 == msc.size()) {
@@ -983,7 +984,7 @@ G4double G4UrbanMscModel::ComputeTheta0(G4double trueStepLength,
   }
   G4double y = trueStepLength/currentRadLength;
 
-  if(particle == positron)
+  if(fPosiCorrection && particle == positron)
   {
     static const G4double xl= 0.6;
     static const G4double xh= 0.9;

source/processes/electromagnetic/utils/History

@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2022-12-11 V.Ivanchenko (emutils-V11-00-39)
+- G4EmParameters, G4EmParametersMessenger, added parameter, UI command, 
+    GetSet methods - MscPositronCorrection
+
 ## 2022-11-23 Gabriele Cosmo (emutils-V11-00-38)
 - Fixed more compilation warnings for implicit type conversions.
 

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

@@ -205,6 +205,9 @@ public:
   G4bool PhotoeffectBelowKShell() const;
   void SetPhotoeffectBelowKShell(G4bool v);
 
+  G4bool MscPositronCorrection() const;
+  void SetMscPositronCorrection(G4bool v);
+
   // 5d
   void SetOnIsolated(G4bool val);
   G4bool OnIsolated() const;
@@ -421,6 +424,7 @@ private:
   G4bool fPolarisation;
   G4bool fMuDataFromFile;
   G4bool fPEKShell;
+  G4bool fMscPosiCorr;
   G4bool onIsolated; // 5d model conversion on free ions
   G4bool fDNA;
   G4bool fIsPrinted;

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

@@ -104,6 +104,7 @@ private:
   G4UIcmdWithABool*          icru90Cmd;
   G4UIcmdWithABool*          mudatCmd;
   G4UIcmdWithABool*          peKCmd;
+  G4UIcmdWithABool*          mscPCmd;
 
   G4UIcmdWithADoubleAndUnit* minEnCmd;
   G4UIcmdWithADoubleAndUnit* maxEnCmd;

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

@@ -135,6 +135,7 @@ void G4EmParameters::Initialise()
   fPolarisation = false;
   fMuDataFromFile = false;
   fPEKShell = true;
+  fMscPosiCorr = true;
   fDNA = false;
   fIsPrinted = false;
 
@@ -513,6 +514,17 @@ void G4EmParameters::SetPhotoeffectBelowKShell(G4bool v)
   fPEKShell = v;
 }
 
+G4bool G4EmParameters::MscPositronCorrection() const
+{
+  return fMscPosiCorr;
+}
+
+void G4EmParameters::SetMscPositronCorrection(G4bool v)
+{
+  if(IsLocked()) { return; }
+  fMscPosiCorr = v;
+}
+
 void G4EmParameters::ActivateDNA()
 {
   if(IsLocked()) { return; }

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

@@ -196,6 +196,13 @@ G4EmParametersMessenger::G4EmParametersMessenger(G4EmParameters* ptr)
   peKCmd->AvailableForStates(G4State_PreInit);
   peKCmd->SetToBeBroadcasted(false);
 
+  mscPCmd = new G4UIcmdWithABool("/process/msc/PositronCorrection",this);
+  mscPCmd->SetGuidance("Enable msc positron correction");
+  mscPCmd->SetParameterName("mscPC",true);
+  mscPCmd->SetDefaultValue(true);
+  mscPCmd->AvailableForStates(G4State_PreInit, G4State_Idle);
+  mscPCmd->SetToBeBroadcasted(false);
+
   minEnCmd = new G4UIcmdWithADoubleAndUnit("/process/eLoss/minKinEnergy",this);
   minEnCmd->SetGuidance("Set the min kinetic energy for EM tables");
   minEnCmd->SetParameterName("emin",true);
@@ -474,6 +481,7 @@ G4EmParametersMessenger::~G4EmParametersMessenger()
   delete icru90Cmd;
   delete mudatCmd;
   delete peKCmd;
+  delete mscPCmd;
 
   delete minEnCmd;
   delete maxEnCmd;
@@ -563,6 +571,8 @@ void G4EmParametersMessenger::SetNewValue(G4UIcommand* command,
     theParameters->SetRetrieveMuDataFromFile(mudatCmd->GetNewBoolValue(newValue));
   } else if (command == peKCmd) {
     theParameters->SetPhotoeffectBelowKShell(peKCmd->GetNewBoolValue(newValue));
+  } else if (command == mscPCmd) {
+    theParameters->SetMscPositronCorrection(mscPCmd->GetNewBoolValue(newValue));
 
   } else if (command == minEnCmd) {
     theParameters->SetMinEnergy(minEnCmd->GetNewDoubleValue(newValue));