Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29687 from fwyzard/branch_lintBuildFile_MagneticF…
…ield Clean up BuildFiles under MagneticField/
- Loading branch information
Showing
15 changed files
with
101 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| <use name="boost"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <library file="testMagneticField.cc" name="testMagneticField"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="MagneticField/VolumeBasedEngine"/> | ||
| <use name="boost"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <library file="testMagneticField.cc" name="testMagneticField"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="MagneticField/VolumeBasedEngine"/> | ||
| </library> | ||
| <library file="queryField.cc" name="queryField"> | ||
| <flags EDM_PLUGIN="1"/> | ||
|
|
||
| <library file="queryField.cc" name="queryField"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="DetectorDescription/Core"/> | ||
| <use name="DetectorDescription/DDCMS"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <use name="Utilities/BinningTools"/> | ||
| <use name="CondFormats/MFObjects"/> | ||
| <use name="clhep"/> | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="DetectorDescription/Core"/> | ||
| <use name="DetectorDescription/DDCMS"/> | ||
| <use name="FWCore/Utilities"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <use name="Utilities/BinningTools"/> | ||
| <use name="CondFormats/MFObjects"/> | ||
| <use name="clhep"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <library file="stubs/*.cc" name="testMagneticFieldGeomBuilder"> | ||
| <use name="boost"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="MagneticField/VolumeBasedEngine"/> | ||
| <use name="CondFormats/MFObjects"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <library file="stubs/*.cc" name="testMagneticFieldGeomBuilder"> | ||
| <use name="boost"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="MagneticField/VolumeBasedEngine"/> | ||
| <use name="CondFormats/MFObjects"/> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> | ||
| <flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/> | ||
| <flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| <bin file="Grid1D_t.cpp"> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <bin file="Grid1D_t.cpp"> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <flags NO_TESTRUN="1"/> | ||
| </bin> | ||
| <bin file="Grid3D_t.cpp"> | ||
| <use name="MagneticField/Interpolation"/> | ||
|
|
||
| <bin file="Grid3D_t.cpp"> | ||
| <use name="MagneticField/Interpolation"/> | ||
| </bin> | ||
| <bin file="BinaryTablesGeneration/GridFileReader.cpp" name="GridFileReader"> | ||
|
|
||
| <bin file="BinaryTablesGeneration/GridFileReader.cpp" name="GridFileReader"> | ||
| <flags NO_TESTRUN="1"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| </bin> | ||
| <bin file="BinaryTablesGeneration/prepareFieldTable.cpp, BinaryTablesGeneration/prepareMagneticFieldGrid.cc" name="prepareFieldTable"> | ||
|
|
||
| <bin file="BinaryTablesGeneration/prepareFieldTable.cpp, BinaryTablesGeneration/prepareMagneticFieldGrid.cc" name="prepareFieldTable"> | ||
| <flags NO_TESTRUN="1"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| <use name="clhep"/> | ||
| <use name="MagneticField/Interpolation"/> | ||
| </bin> | ||
| <flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/> | ||
|
|
||
| <flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <use name="boost"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <use name="boost"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <use name="DataFormats/Math"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/UniformEngine"/> | ||
| <use name="DataFormats/Math"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/UniformEngine"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/ParametrizedEngine"/> | ||
| <use name="CondFormats/RunInfo"/> | ||
| <library file="*.cc" name="MagneticFieldParametrizedEnginePlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <use name="MagneticField/ParametrizedEngine"/> | ||
| <use name="CondFormats/RunInfo"/> | ||
| <library file="*.cc" name="MagneticFieldParametrizedEnginePlugins"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <use name="FWCore/Framework"/> | ||
| <use name="CondFormats/DataRecord"/> | ||
| <use name="boost"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="CondFormats/DataRecord"/> | ||
| <use name="boost"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Engine"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <library file="UniformMagneticFieldESProducer.cc"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| <use name="FWCore/Framework"/> | ||
| <use name="FWCore/ParameterSet"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Records"/> | ||
| <library file="UniformMagneticFieldESProducer.cc"> | ||
| <flags EDM_PLUGIN="1"/> | ||
| </library> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="MagneticField/Layers"/> | ||
| <use name="MagneticField/VolumeGeometry"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <use name="DataFormats/GeometrySurface"/> | ||
| <use name="DataFormats/GeometryVector"/> | ||
| <use name="MagneticField/Engine"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| <lib name="1"/> | ||
| </export> |