Skip to content

Commit 5375cc0

Browse files
authored
Merge pull request #46119 from Dr15Jones/fixDDDefinitions2Objects
Fix static analysis warning in DDDefinitions2Objects
2 parents a2eae47 + cae2762 commit 5375cc0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

DetectorDescription/DDCMS/plugins/dd4hep/DDDefinitions2Objects.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ void Converter<DDLCompositeMaterial>::operator()(xml_h element) const {
590590
TGeoManager& mgr = description.manager();
591591
TGeoMaterial* mat = mgr.GetMaterial(nam.c_str());
592592
if (nullptr == mat) {
593-
const char* matname = nam.c_str();
594593
double density = xmat.attr<double>(DD_CMU(density)) / (dd4hep::g / dd4hep::cm3);
595594
xml_coll_t composites(xmat, DD_CMU(MaterialFraction));
596595
TGeoMixture* mix = new TGeoMixture(nam.c_str(), composites.size(), density);
@@ -634,10 +633,10 @@ void Converter<DDLCompositeMaterial>::operator()(xml_h element) const {
634633
mix->SetPressure(ns.context()->description.stdConditions().pressure);
635634
mix->SetRadLen(0e0);
636635
/// Create medium from the material
637-
TGeoMedium* medium = mgr.GetMedium(matname);
636+
TGeoMedium* medium = mgr.GetMedium(nam.c_str());
638637
if (nullptr == medium) {
639638
--unique_mat_id;
640-
medium = new TGeoMedium(matname, unique_mat_id, mix);
639+
medium = new TGeoMedium(nam.c_str(), unique_mat_id, mix);
641640
medium->SetTitle("material");
642641
medium->SetUniqueID(unique_mat_id);
643642
}

0 commit comments

Comments
 (0)