Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DD4hep] Prohibit use of undefined materials #36496

Merged
merged 4 commits into from Dec 17, 2021
Merged

[DD4hep] Prohibit use of undefined materials #36496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a06c806
Add exception for undefined materials
cvuosalo Dec 11, 2021
56a0f25
Correct material ordering
cvuosalo Dec 13, 2021
0551af9
Update units tests to use correctly ordered materials
cvuosalo Dec 15, 2021
441da8b
Format fix
cvuosalo Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dict2026Geometry.py
View file
Open in desktop
Expand Up @@ -322,8 +322,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/data/cms-test-ddangular-algorithm.xml
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@

<IncludeSection>
<Include ref="DetectorDescription/DDCMS/data/testDDAngularAlgorithm.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
</IncludeSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/data/cms-test-ddvectors.xml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
</ConstantsSection>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2015/v1/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/data/cms-test-shapes.xml
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
<Include ref="DetectorDescription/DDCMS/data/testSolids.xml"/>
<Include ref="DetectorDescription/DDCMS/data/testPosParts.xml"/>
<Include ref="DetectorDescription/DDCMS/data/testAlgorithm.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
</IncludeSection>
<PosPartSection label="">
<PosPart copyNumber="2">
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/data/cms-test-tree-navigation.xml
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@

<IncludeSection>
<Include ref="DetectorDescription/DDCMS/data/testTreeNavigation.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
</IncludeSection>

<PosPartSection label="">
Expand Down
2 changes: 0 additions & 2 deletions DetectorDescription/DDCMS/interface/DDParsingContext.h
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@ namespace cms {
rotations.reserve(3000);
shapes.reserve(4000);
volumes.reserve(3000);
unresolvedMaterials.reserve(300);
unresolvedVectors.reserve(300);
unresolvedShapes.reserve(1000);

Expand Down Expand Up @@ -84,7 +83,6 @@ namespace cms {
std::unordered_map<std::string, dd4hep::Volume> volumes;
std::vector<std::string> namespaces;

std::unordered_map<std::string, std::vector<CompositeMaterial>> unresolvedMaterials;
std::vector<std::pair<std::string, double>> compMaterialsVec;
std::unordered_map<std::string, std::vector<CompositeMaterial>> compMaterialsRefs;
std::unordered_map<std::string, std::vector<std::string>> unresolvedVectors;
Expand Down
59 changes: 3 additions & 56 deletions DetectorDescription/DDCMS/plugins/dd4hep/DDDefinitions2Objects.cc
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@

#include "XML/Utilities.h"
#include "FWCore/ParameterSet/interface/FileInPath.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/thread_safety_macros.h"
#include "DataFormats/Math/interface/CMSUnits.h"
#include "DetectorDescription/DDCMS/interface/DDAlgoArguments.h"
Expand Down Expand Up @@ -626,14 +627,8 @@ void Converter<DDLCompositeMaterial>::operator()(xml_h element) const {
continue;
}

printout(ns.context()->debug_materials ? ALWAYS : WARNING,
"DD4CMS Warning",
"+++ Composite material \"%s\" [nor \"%s\"] not present! [delay resolution]",
fracname.c_str(),
ns.prepend(fracname).c_str());

ns.context()->unresolvedMaterials[nam].emplace_back(
cms::DDParsingContext::CompositeMaterial(ns.prepend(fracname), fraction));
throw cms::Exception("DD4CMS") << "Composite material \"" + fracname + "\" or \"" + ns.prepend(fracname) +
"\" not yet defined.";
}
mix->SetTemperature(ns.context()->description.stdConditions().temperature);
mix->SetPressure(ns.context()->description.stdConditions().pressure);
Expand Down Expand Up @@ -2219,54 +2214,6 @@ static long load_dddefinition(Detector& det, xml_h element) {
print_doc((doc = d).root());
xml_coll_t(d.root(), DD_CMU(MaterialSection)).for_each(Converter<MaterialSection>(det, &context));
}
{
PrintLevel printLvl(DEBUG);
if (!context.unresolvedMaterials.empty())
printLvl = WARNING;
printout(context.debug_materials ? ALWAYS : printLvl,
"DD4CMS",
"+++ RESOLVING %ld unknown material constituents.....",
context.unresolvedMaterials.size());

// Resolve referenced materials (if any)

while (!context.unresolvedMaterials.empty()) {
for (auto it = context.unresolvedMaterials.begin(); it != context.unresolvedMaterials.end();) {
auto const& name = it->first;
std::vector<bool> valid;

printout(context.debug_materials ? ALWAYS : WARNING,
"DD4CMS",
"+++ [%06ld] ---------- %s",
context.unresolvedMaterials.size(),
name.c_str());

auto mat = ns.material(name);
for (auto& mit : it->second) {
printout(context.debug_materials ? ALWAYS : WARNING,
"DD4CMS",
"+++ component %-48s Fraction: %.6f",
mit.name.c_str(),
mit.fraction);
auto fmat = ns.material(mit.name);
if (nullptr != fmat.ptr()) {
if (mat.ptr()->GetMaterial()->IsMixture()) {
valid.emplace_back(true);
static_cast<TGeoMixture*>(mat.ptr()->GetMaterial())
->AddElement(fmat.ptr()->GetMaterial(), mit.fraction);
}
}
}
// All components are resolved
if (valid.size() == it->second.size())
it = context.unresolvedMaterials.erase(it);
else
++it;
}
// Do it again if there are unresolved
// materials left after this pass
}
}
if (open_geometry) {
det.init();
ns.addVolume(det.worldVolume());
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D84.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D85.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D77XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D84XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D85XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/MuonCommonData/data/cms-test-ddgemangular-algorithm.xml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
</ConstantsSection>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2015/v1/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/MuonCommonData/data/cms-test-muon-geometry-2015.xml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
</ConstantsSection>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2015/v1/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/data/cms-test-ddcuttubsfrompoints-algorithm.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

<IncludeSection>
<Include ref="Geometry/TrackerCommonData/data/testDDCutTubsFromPointsAlgorithm.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml"/>
<Include ref="Geometry/TrackerCommonData/data/pixfwdCommon.xml"/>
</IncludeSection>
Expand Down
16 changes: 8 additions & 8 deletions Geometry/TrackerCommonData/data/cms-test-ddpixbarlayerupgrade-algorithm.xml
View file
Open in desktop
Expand Up @@ -17,15 +17,15 @@
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/TrackerCommonData/data/testDDPixBarLayerUpgradeAlgorithm.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/TrackerCommonData/data/trackermaterial.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this test data file, v1 of materials.xml needed to be used instead of the more recent v3.

<Include ref="Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml"/>
<Include ref="Geometry/TrackerCommonData/data/pixfwdMaterials.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/v3/pixbarmaterial.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml"/>
<Include ref="Geometry/TrackerCommonData/data/testDDPixBarLayerUpgradeAlgorithm.xml"/>
</IncludeSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/data/cms-test-ddpixfwddisk-algo.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<IncludeSection>
<Include ref="Geometry/TrackerCommonData/data/testDDPixFwdDiskAlgo.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/PixelForward/pixfwdDisks.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
</IncludeSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/data/cms-test-ddpixphase1fwddisk-algo.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<IncludeSection>
<Include ref="Geometry/TrackerCommonData/data/testDDPixPhase1FwdDiskAlgo.xml"/>
<Include ref="Geometry/TrackerCommonData/data/PhaseI/PixelForward/pixfwdDisks.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2015/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v3/materials.xml"/>
</IncludeSection>

</DDDefinition>