Undo explicit casts related to std::complex<Forward>

Author: maxaehle

source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc

@@ -88,10 +88,10 @@ G4double G4GammaXTRadiator::GetStackFactor(G4double energy, G4double gamma,
   G4complex Hb = std::pow(Cb, -fAlphaGas);
   G4complex H  = Ha * Hb;
 
-  G4complex F1 = (G4double(1.0) - Ha) * (G4double(1.0) - Hb) / (G4double(1.0) - H) * G4double(fPlateNumber);
+  G4complex F1 = (1.0 - Ha) * (1.0 - Hb) / (1.0 - H) * G4double(fPlateNumber);
 
-  G4complex F2 = (G4double(1.0) - Ha) * (G4double(1.0) - Ha) * Hb / (G4double(1.0) - H) / (G4double(1.0) - H) *
-                 (G4double(1.0) - std::pow(H, fPlateNumber));
+  G4complex F2 = (1.0 - Ha) * (1.0 - Ha) * Hb / (1.0 - H) / (1.0 - H) *
+                 (1.0 - std::pow(H, fPlateNumber));
 
   G4complex R = (F1 + F2) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
 

source/processes/electromagnetic/xrays/src/G4GaussXTRadiator.cc

@@ -206,11 +206,11 @@ G4double G4GaussXTRadiator::GetStackFactor(G4double energy,
 
   // G4complex F1 = ( 1.0 - Ha ) * ( 1.0 - Hb ) * ( 1.0 - Hs ) * G4double(fPlateNumber) * D;
 
-  G4complex F1 = ( G4double(1.) - Ha ) * ( G4double(1.) - Hb ) * nn / ( G4double(1.) - H );
+  G4complex F1 = ( 1. - Ha ) * ( 1. - Hb ) * nn / ( 1. - H );
 
   // G4complex F2 = ( 1.0 - Ha ) * ( 1.0 - Ha ) * Hb * ( 1.0 - Hs ) * ( 1.0 - Hs ) * (1.0 - std::exp( -0.5 * fPlateNumber * sigma) ) * D * D;
 
-  G4complex F2 = ( G4double(1.) - Ha ) * ( G4double(1.) - Ha ) * Hb * ( G4double(1.) - Hn ) / ( G4double(1.) - H ) / ( G4double(1.) - H );
+  G4complex F2 = ( 1. - Ha ) * ( 1. - Ha ) * Hb * ( 1. - Hn ) / ( 1. - H ) / ( 1. - H );
 
   G4complex R = (F1 + F2) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
 

source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc

@@ -153,10 +153,10 @@ G4double G4RegularXTRadiator::GetStackFactor(G4double energy, G4double gamma,
   G4complex Hb = std::pow(Cb, -fAlphaGas);
   G4complex H  = Ha * Hb;
 
-  G4complex F1 = (G4double(1.0) - Ha) * (G4double(1.0) - Hb) / (G4double(1.0) - H) * G4double(fPlateNumber);
+  G4complex F1 = (1.0 - Ha) * (1.0 - Hb) / (1.0 - H) * G4double(fPlateNumber);
 
-  G4complex F2 = (G4double(1.0) - Ha) * (G4double(1.0) - Ha) * Hb / (G4double(1.0) - H) / (G4double(1.0) - H) *
-                 (G4double(1.0) - std::pow(H, fPlateNumber));
+  G4complex F2 = (1.0 - Ha) * (1.0 - Ha) * Hb / (1.0 - H) / (1.0 - H) *
+                 (1.0 - std::pow(H, fPlateNumber));
 
   G4complex R = (F1 + F2) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
 

source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc

@@ -118,9 +118,9 @@ G4double G4StrawTubeXTRadiator::GetStackFactor(G4double energy, G4double gamma,
   G4complex Z2 = GetPlateComplexFZ(energy, gamma, varAngle);
   G4complex Z3 = GetGasComplexFZ(energy, gamma, varAngle);
 
-  G4complex R = (Z1 - Z2) * (Z1 - Z2) * (G4double(1.) - H2 * H) +
-                (Z2 - Z3) * (Z2 - Z3) * (G4double(1.) - H3) +
-                G4double(2.) * (Z1 - Z2) * (Z2 - Z3) * H2 * (G4double(1.) - H3);
+  G4complex R = (Z1 - Z2) * (Z1 - Z2) * (1. - H2 * H) +
+                (Z2 - Z3) * (Z2 - Z3) * (1. - H3) +
+                2. * (Z1 - Z2) * (Z2 - Z3) * H2 * (1. - H3);
 
   result = 2.0 * std::real(R) * (varAngle * energy / hbarc / hbarc);
 

source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc

@@ -140,12 +140,12 @@ G4double G4TransparentRegXTRadiator::GetStackFactor(G4double energy,
   G4complex Hb(Qb * std::cos(bZb), -Qb * std::sin(bZb));
   G4complex H  = Ha * Hb;
   G4complex Hs = conj(H);
-  D            = (G4double)1.0 / ((1 - Q) * (1 - Q) +
-             4 * Q * std::sin((G4double)0.5 * (aZa + bZb)) * std::sin((G4double)0.5 * (aZa + bZb)));
+  D            = 1.0 / ((1 - Q) * (1 - Q) +
+             4 * Q * std::sin(0.5 * (aZa + bZb)) * std::sin(0.5 * (aZa + bZb)));
   G4complex F1 =
-    ((G4double)1.0 - Ha) * ((G4double)1.0 - Hb) * ((G4double)1.0 - Hs) * G4double(fPlateNumber) * D;
-  G4complex F2 = ((G4double)1.0 - Ha) * ((G4double)1.0 - Ha) * Hb * ((G4double)1.0 - Hs) * ((G4double)1.0 - Hs) *
-                 ((G4double)1.0 - std::exp(-0.5 * fPlateNumber * sigma)) * D * D;
+    (1.0 - Ha) * (1.0 - Hb) * (1.0 - Hs) * G4double(fPlateNumber) * D;
+  G4complex F2 = (1.0 - Ha) * (1.0 - Ha) * Hb * (1.0 - Hs) * (1.0 - Hs) *
+                 (1.0 - std::exp(-0.5 * fPlateNumber * sigma)) * D * D;
   G4complex R = (F1 + F2) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
   result      = 2.0 * std::real(R);
   return result;

source/processes/electromagnetic/xrays/src/G4XTRGammaRadModel.cc

@@ -90,17 +90,17 @@ G4double G4XTRGammaRadModel::GetStackFactor(G4double energy, G4double gamma,
   G4complex Hb = std::pow(Cb, -fAlphaGas);
   G4complex H  = Ha * Hb;
 
-  G4complex F1 = ((G4double)0.5 * ((G4double)1.0 + Qa) * ((G4double)1.0 + H) - Ha - Qa * Hb) / ((G4double)1.0 - H);
+  G4complex F1 = (0.5 * (1.0 + Qa) * (1.0 + H) - Ha - Qa * Hb) / (1.0 - H);
 
-  G4complex F2 = ((G4double)1.0 - Ha) * (Qa - Ha) * Hb / ((G4double)1.0 - H) / (Q - H);
+  G4complex F2 = (1.0 - Ha) * (Qa - Ha) * Hb / (1.0 - H) / (Q - H);
 
   F2 *= std::pow(Q, G4double(fPlateNumber)) - std::pow(H, fPlateNumber);
 
   result = (1. - std::pow(Q, G4double(fPlateNumber))) / (1. - Q);
 
   G4complex stack = result * F1;
   stack += F2;
-  stack *= G4double(2.0) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
+  stack *= 2.0 * OneInterfaceXTRdEdx(energy, gamma, varAngle);
 
   result = std::real(stack);
 

source/processes/electromagnetic/xrays/src/G4XTRRegularRadModel.cc

@@ -146,7 +146,7 @@ G4double G4XTRRegularRadModel::GetStackFactor(G4double energy, G4double gamma,
   G4complex H  = Ha * Hb;
   G4complex Hs = std::conj(H);
 
-  G4complex F2 = ((G4double)1.0 - Ha) * (Qa - Ha) * Hb * ((G4double)1.0 - Hs) * (Q - Hs);
+  G4complex F2 = (1.0 - Ha) * (Qa - Ha) * Hb * (1.0 - Hs) * (Q - Hs);
   F2 *= std::pow(Q, G4double(fPlateNumber)) - std::pow(H, fPlateNumber);
 
   G4double result = (1. - std::pow(Q, G4double(fPlateNumber))) / (1. - Q);

source/processes/electromagnetic/xrays/src/G4XTRTransparentRegRadModel.cc

@@ -132,12 +132,12 @@ G4double G4XTRTransparentRegRadModel::GetStackFactor(G4double energy,
   G4complex H  = Ha * Hb;
   G4complex Hs = conj(H);
   G4double D =
-    (G4double)1.0 / (((G4double)1. - Q) * ((G4double)1. - Q) +
-           4. * Q * std::sin((G4double)0.5 * (aZa + bZb)) * std::sin(0.5 * (aZa + bZb)));
+    1.0 / ((1. - Q) * (1. - Q) +
+           4. * Q * std::sin(0.5 * (aZa + bZb)) * std::sin(0.5 * (aZa + bZb)));
   G4complex F1 =
-    ((G4double)1.0 - Ha) * ((G4double)1.0 - Hb) * ((G4double)1.0 - Hs) * G4double(fPlateNumber) * D;
-  G4complex F2 = ((G4double)1.0 - Ha) * ((G4double)1.0 - Ha) * Hb * ((G4double)1.0 - Hs) * ((G4double)1.0 - Hs) *
-                 ((G4double)1.0 - std::exp(-0.5 * fPlateNumber * sigma)) * D * D;
+    (1.0 - Ha) * (1.0 - Hb) * (1.0 - Hs) * G4double(fPlateNumber) * D;
+  G4complex F2 = (1.0 - Ha) * (1.0 - Ha) * Hb * (1.0 - Hs) * (1.0 - Hs) *
+                 (1.0 - std::exp(-0.5 * fPlateNumber * sigma)) * D * D;
   G4complex R = (F1 + F2) * OneInterfaceXTRdEdx(energy, gamma, varAngle);
   return 2.0 * std::real(R);
 }