Import Geant4 10.0.0 source tree

examples/advanced/composite_calorimeter/src/CCalAMaterial.cc

@@ -61,7 +61,7 @@ CCalAMaterial::CCalAMaterial(G4String mat, G4double dens, int nconst,
   closeMaterial();
 }
 
-CCalAMaterial::CCalAMaterial(G4String elemat, double Aeff, double dens) {
+CCalAMaterial::CCalAMaterial(G4String elemat, double eff, double dens) {
   name=elemat;
   density=dens;
   nElem=1;
@@ -71,7 +71,7 @@ CCalAMaterial::CCalAMaterial(G4String elemat, double Aeff, double dens) {
   theElements[0] = elemat;
   theWeights[0]  = 1;
 
-  aEff=Aeff;
+  aEff=eff;
 }
 
 CCalAMaterial::~CCalAMaterial() {

examples/advanced/composite_calorimeter/src/CCalMagneticField.cc

@@ -98,24 +98,24 @@ void CCalMagneticField::MagneticField(const double x[3], double B[3]) const {
     B[i]   = 0*kilogauss;
   }
 
-  G4double m=0, c=0;
+  G4double m1=0, c1=0;
   G4double xnew = x[0]/mm + xoff;
   if (npts > 0) {
     for (i=0; i<npts; i++) {
       if (xnew > pos[i]*mm) {
-	m = slope[i];
-        c = intercept[i];
+	m1 = slope[i];
+        c1 = intercept[i];
       }
     }
   }
-  G4double scor = c + m*xnew;
+  G4double scor = c1 + m*xnew;
   if (scor < 0.) scor = 0.;
   if (scor > 1.) scor = 1.0;
 
   B[2] = scor*fval*kilogauss;
 #ifdef ddebug
   G4cout << "Field at x: " << x[0]/mm << "mm (" << xnew << ") = " << B[2]/tesla
-	 << "T (m = " << m << ", c = " << c << ", scale = " << scor << ")"
+	 << "T (m = " << m1 << ", c = " << c1 << ", scale = " << scor << ")"
 	 << G4endl;
 #endif
 }

examples/advanced/composite_calorimeter/src/CCalMaterialFactory.cc

@@ -384,13 +384,13 @@ void CCalMaterialFactory::readMaterials(std::ifstream& is){
     //It should be a material definition
     matname=name;
     G4int nElem;
-    G4double density;
-    is >> nElem >> density >> jump;
+    G4double dens;
+    is >> nElem >> dens >> jump;
 
 #ifdef debug
     G4cout <<"       " << matname
 	   << " made of " << nElem 
-	   << " elements. Density=" << density 
+	   << " elements. Density=" << dens
 	   << G4endl;
 #endif
 
@@ -414,7 +414,7 @@ void CCalMaterialFactory::readMaterials(std::ifstream& is){
     else
       md = byVolume;
 
-    addCCalMaterial(matname, density, absnelem, mats, weights, md);
+    addCCalMaterial(matname, dens, absnelem, mats, weights, md);
     delete[] mats;
     delete[] weights;