Commit f46e4ea9 authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

Avoid redundant divisions. (AGDDControl-00-00-15)

	* Tagging AGDDControl-00-00-15.
	* Avoid redundant divisions.

2015-05-22 Johcen Meyer  <jomeyer@mail.cern.ch>

	* tagging AGDDControl-00-00-14
	* cleaning up requirements

        * tagging AGDDControl-00-00-13
        * Tagging AGDDControl-00-00-12
parent 138b94a7
......@@ -9,8 +9,6 @@ use AtlasPolicy AtlasPolicy-*
library AGDDControl *.cxx components/*.cxx
apply_pattern installed_library
apply_pattern install_runtime
public
use AGDDKernel AGDDKernel* DetectorDescription/AGDD
use AtlasCLHEP AtlasCLHEP-* External
......
......@@ -128,7 +128,7 @@ GeoMaterial* AGDD2GeoModelBuilder::CreateMaterial(std::string name)
std::cout<<"something is wrong, nmat=0!!!"<<std::endl;
return 0;
}
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*CLHEP::g/CLHEP::cm3);
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*(CLHEP::g/CLHEP::cm3));
AGDDElement *el=ms->GetElement(nmat->GetName());
if (el)
{
......@@ -146,7 +146,7 @@ GeoMaterial* AGDD2GeoModelBuilder::CreateMaterial(std::string name)
std::cout<<"something is wrong, nmat=0!!!"<<std::endl;
return 0;
}
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*CLHEP::g/CLHEP::cm3);
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*(CLHEP::g/CLHEP::cm3));
for (int i=0;i<nmat->NComponents();i++)
{
AGDDElement *el=nmat->Element(i);
......@@ -166,7 +166,7 @@ GeoMaterial* AGDD2GeoModelBuilder::CreateMaterial(std::string name)
std::cout<<"can't get the mixture, returning!"<<std::endl;
return 0;
}
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*CLHEP::g/CLHEP::cm3);
g4mat=new GeoMaterial(nmat->GetName(),nmat->GetDensity()*(CLHEP::g/CLHEP::cm3));
for (int i=0;i<nmat->NComponents();i++)
{
AGDDSimpleMaterial *el=nmat->Material(i);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment