Skip to content

Commit

Permalink
Clean up BuildFiles under Geometry/
Browse files Browse the repository at this point in the history
Clean up BuildFile.xml filea with `xmllint --format`.
  • Loading branch information
fwyzard committed May 5, 2020
1 parent 3297972 commit e91a8d3
Show file tree
Hide file tree
Showing 88 changed files with 834 additions and 810 deletions.
17 changes: 8 additions & 9 deletions Geometry/CMSCommonData/test/BuildFile.xml
@@ -1,13 +1,12 @@
<library file="DDFilteredViewAnalyzer.cc" name="testDDFilteredViewAnalyzer">
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="Geometry/Records"/>
<use name="DetectorDescription/Core"/>
<flags EDM_PLUGIN="1"/>
<library file="DDFilteredViewAnalyzer.cc" name="testDDFilteredViewAnalyzer">
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="Geometry/Records"/>
<use name="DetectorDescription/Core"/>
<flags EDM_PLUGIN="1"/>
</library>

<bin file="TestIntegration.cpp" name="GeometryDOMCount">
<flags TEST_RUNNER_ARGS=" /bin/bash Geometry/CMSCommonData/test run_DOMCount.sh" />
<use name="FWCore/Utilities" />
<flags TEST_RUNNER_ARGS=" /bin/bash Geometry/CMSCommonData/test run_DOMCount.sh"/>
<use name="FWCore/Utilities"/>
</bin>

16 changes: 8 additions & 8 deletions Geometry/CSCGeometry/BuildFile.xml
@@ -1,10 +1,10 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<use name="clhep"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<use name="clhep"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
55 changes: 30 additions & 25 deletions Geometry/CSCGeometry/test/BuildFile.xml
@@ -1,32 +1,37 @@
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/Records"/>
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="CommonTools/UtilAlgos"/>
<use name="root"/>
<library file="stubs/CSCGeometryAnalyzer.cc" name="testCSCGeometry">
<flags EDM_PLUGIN="1"/>
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/Records"/>
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="CommonTools/UtilAlgos"/>
<use name="root"/>
<library file="stubs/CSCGeometryAnalyzer.cc" name="testCSCGeometry">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCGeometryAsChambers.cc" name="testCSCGeometryAsChambers">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCGeometryAsLayers.cc" name="testCSCGeometryAsLayers">
<flags EDM_PLUGIN="1"/>

<library file="stubs/CSCGeometryAsChambers.cc" name="testCSCGeometryAsChambers">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCGeometryOfWires.cc" name="testCSCGeometryOfWires">
<flags EDM_PLUGIN="1"/>

<library file="stubs/CSCGeometryAsLayers.cc" name="testCSCGeometryAsLayers">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCGeometryOfStrips.cc" name="testCSCGeometryOfStrips">
<flags EDM_PLUGIN="1"/>

<library file="stubs/CSCGeometryOfWires.cc" name="testCSCGeometryOfWires">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCLayerGeometryInside.cc" name="testCSCLayerGeometryInside">
<flags EDM_PLUGIN="1"/>

<library file="stubs/CSCGeometryOfStrips.cc" name="testCSCGeometryOfStrips">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/CSCGACwithB.cc" name="testCSCGACwithB">
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<flags EDM_PLUGIN="1"/>

<library file="stubs/CSCLayerGeometryInside.cc" name="testCSCLayerGeometryInside">
<flags EDM_PLUGIN="1"/>
</library>

<library file="stubs/CSCGACwithB.cc" name="testCSCGACwithB">
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<flags EDM_PLUGIN="1"/>
</library>
21 changes: 10 additions & 11 deletions Geometry/CSCGeometryBuilder/BuildFile.xml
@@ -1,14 +1,13 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/MuonDetId"/>
<use name="DetectorDescription/Core"/>
<use name="FWCore/MessageLogger"/>
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/MuonNumbering"/>
<use name="DetectorDescription/DDCMS"/>
<use name="dd4hep"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/MuonDetId"/>
<use name="DetectorDescription/Core"/>
<use name="FWCore/MessageLogger"/>
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/MuonNumbering"/>
<use name="DetectorDescription/DDCMS"/>
<use name="dd4hep"/>
<export>
<lib name="1"/>
</export>

39 changes: 19 additions & 20 deletions Geometry/CSCGeometryBuilder/plugins/BuildFile.xml
@@ -1,24 +1,23 @@
<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/GeometryObjects"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="Geometry/MuonNumbering"/>
<use name="Geometry/Records"/>

<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/GeometryObjects"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="Geometry/MuonNumbering"/>
<use name="Geometry/Records"/>
<library name="CSCGeometryPlugins" file="CSCGeometryESModule.cc">
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="Geometry/RPCGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/CSCGeometryBuilder"/>
<flags EDM_PLUGIN="1"/>
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="Geometry/RPCGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/CSCGeometryBuilder"/>
<flags EDM_PLUGIN="1"/>
</library>

<library name="CSCGeometryValidationPlugins" file="CSCGeometryValidate.cc">
<use name="Fireworks/Core"/>
<use name="Geometry/CSCGeometry"/>
<use name="rootgeom"/>
<flags EDM_PLUGIN="1"/>
</library>
<use name="Fireworks/Core"/>
<use name="Geometry/CSCGeometry"/>
<use name="rootgeom"/>
<flags EDM_PLUGIN="1"/>
</library>
2 changes: 1 addition & 1 deletion Geometry/CaloEventSetup/BuildFile.xml
@@ -1,3 +1,3 @@
<use name="Geometry/Records"/>
<use name="Geometry/Records"/>
<export>
</export>
28 changes: 14 additions & 14 deletions Geometry/CaloEventSetup/plugins/BuildFile.xml
@@ -1,15 +1,15 @@
<library file="*.cc" name="GeometryCaloEventSetupPlugins">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="Geometry/Records"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/EcalAlgo"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/HcalTowerAlgo"/>
<use name="Geometry/HGCalGeometry"/>
<use name="CondFormats/Alignment"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="zlib"/>
<library file="*.cc" name="GeometryCaloEventSetupPlugins">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="Geometry/Records"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/EcalAlgo"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/HcalTowerAlgo"/>
<use name="Geometry/HGCalGeometry"/>
<use name="CondFormats/Alignment"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="zlib"/>
</library>
34 changes: 20 additions & 14 deletions Geometry/CaloEventSetup/test/BuildFile.xml
@@ -1,5 +1,5 @@
<use name="FWCore/Framework"/>
<library file="CaloGeometryAnalyzer.cc" name="testCaloGeometryESProducer">
<use name="FWCore/Framework"/>
<library file="CaloGeometryAnalyzer.cc" name="testCaloGeometryESProducer">
<use name="rootgraphics"/>
<use name="Geometry/Records"/>
<use name="Geometry/EcalAlgo"/>
Expand All @@ -10,50 +10,56 @@
<use name="Geometry/CaloTopology"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDetId"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DumpEcalTrigTowerMapping.cc" name="testEcalTrigTowerMappingSProducer">

<library file="DumpEcalTrigTowerMapping.cc" name="testEcalTrigTowerMappingSProducer">
<use name="Geometry/Records"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/CaloGeometry"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDetId"/>
<use name="rootgraphics"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="TestEcalGetWindow.cc" name="testEcalGetWindow">

<library file="TestEcalGetWindow.cc" name="testEcalGetWindow">
<use name="Geometry/CaloTopology"/>
<use name="rootgraphics"/>
<use name="Geometry/Records"/>
<use name="Geometry/CaloGeometry"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDetId"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="CaloAlignmentRcdRead.cc" name="CaloAlignmentRcdRead">

<library file="CaloAlignmentRcdRead.cc" name="CaloAlignmentRcdRead">
<use name="Utilities/General"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/AlignmentRecord"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="CaloAlignmentRcdWrite.cc" name="CaloAlignmentRcdWrite">

<library file="CaloAlignmentRcdWrite.cc" name="CaloAlignmentRcdWrite">
<use name="Utilities/General"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/AlignmentRecord"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="TestWriteESAlignments.cc" name="TestWriteESAlignments">

<library file="TestWriteESAlignments.cc" name="TestWriteESAlignments">
<use name="Utilities/General"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/AlignmentRecord"/>
<use name="Geometry/EcalAlgo"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/Records"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
<bin file="dumpEEIndices2D.cpp">

<bin file="dumpEEIndices2D.cpp">
<use name="rootgraphics"/>
<use name="Geometry/CaloGeometry"/>
<use name="DataFormats/HcalDetId"/>
Expand Down
12 changes: 6 additions & 6 deletions Geometry/CaloGeometry/BuildFile.xml
@@ -1,8 +1,8 @@
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/GeometryVector"/>
<use name="clhep"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/GeometryVector"/>
<use name="clhep"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
26 changes: 13 additions & 13 deletions Geometry/CaloTopology/BuildFile.xml
@@ -1,15 +1,15 @@
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/ForwardDetId"/>
<use name="DataFormats/Common"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/HcalCommonData"/>
<use name="Geometry/HGCalCommonData"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="boost"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/ForwardDetId"/>
<use name="DataFormats/Common"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/HcalCommonData"/>
<use name="Geometry/HGCalCommonData"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="boost"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
20 changes: 10 additions & 10 deletions Geometry/CaloTopology/test/BuildFile.xml
@@ -1,10 +1,10 @@
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/ForwardDetId"/>
<use name="DataFormats/CaloTowers"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/Records"/>
<use name="Geometry/HcalCommonData"/>
<use name="Geometry/HcalTowerAlgo"/>

<flags EDM_PLUGIN="1"/>
<library file="*.cc" name="testGeometryCaloTopology"> </library>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/ForwardDetId"/>
<use name="DataFormats/CaloTowers"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/Records"/>
<use name="Geometry/HcalCommonData"/>
<use name="Geometry/HcalTowerAlgo"/>
<flags EDM_PLUGIN="1"/>
<library file="*.cc" name="testGeometryCaloTopology">
</library>
2 changes: 1 addition & 1 deletion Geometry/CommonDetUnit/BuildFile.xml
@@ -1 +1 @@
<use name="Geometry/CommonTopologies"/>
<use name="Geometry/CommonTopologies"/>
20 changes: 11 additions & 9 deletions Geometry/CommonTopologies/BuildFile.xml
@@ -1,11 +1,13 @@
<use name="FWCore/MessageLogger"/>
<use name="CondFormats/Alignment"/>
<use name="DataFormats/GeometryCommonDetAlgo"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/DetId"/>
<use name="FWCore/Utilities"/>
<use name="vdt_headers"/>
<use name="FWCore/MessageLogger"/>
<use name="CondFormats/Alignment"/>
<use name="DataFormats/GeometryCommonDetAlgo"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/DetId"/>
<use name="FWCore/Utilities"/>
<use name="vdt_headers"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
# <flags CXXFLAGS="-O3 -ffast-math -funsafe-loop-optimizations"/>
<!--
<flags CXXFLAGS="-O3 -ffast-math -funsafe-loop-optimizations"/>
-->

0 comments on commit e91a8d3

Please sign in to comment.