Reorder includes

lsst · May 10, 2016 · d452173 · d452173
1 parent 8135c1e
commit d452173
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 25 deletions.
diff --git a/examples/timeConvolveGpu.cc b/examples/timeConvolveGpu.cc
@@ -43,7 +43,6 @@
 #include <ctime>
 
 #include "lsst/utils/Utils.h"
-#include <cmath>
 #include "lsst/daf/base.h"
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging/Trace.h"

diff --git a/examples/timeWarpGpu.cc b/examples/timeWarpGpu.cc
@@ -44,7 +44,6 @@
 
 #include "lsst/utils/Utils.h"
 #include "lsst/pex/exceptions.h"
-#include <cmath>
 #include "lsst/daf/base.h"
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging/Trace.h"

diff --git a/include/lsst/afw/image/Color.h b/include/lsst/afw/image/Color.h
@@ -9,7 +9,6 @@
 
 #include <cmath>
 #include <limits>
-#include <cmath>
 #include "lsst/afw/image/Filter.h"
 
 namespace lsst {

diff --git a/python/lsst/afw/display/saturated.cc b/python/lsst/afw/display/saturated.cc
@@ -3,8 +3,8 @@
  *
  * Handle saturated pixels when making colour images
  */
-#include "boost/format.hpp"
 #include <cmath>
+#include "boost/format.hpp"
 #include "lsst/afw/detection.h"
 #include "lsst/afw/image/MaskedImage.h"
 #include "Rgb.h"

diff --git a/src/detection/Footprint.cc b/src/detection/Footprint.cc
@@ -29,6 +29,7 @@
 #include <string>
 #include <typeinfo>
 #include <algorithm>
+#include <cmath>
 #include "boost/format.hpp"
 #include "lsst/pex/logging/Trace.h"
 #include "lsst/pex/exceptions.h"
@@ -43,7 +44,6 @@
 #include "lsst/afw/table/io/CatalogVector.h"
 #include "lsst/afw/table/io/InputArchive.h"
 #include "lsst/afw/table/io/OutputArchive.h"
-#include <cmath>
 
 namespace lsst {
 namespace afw {

diff --git a/src/detection/Psf.cc b/src/detection/Psf.cc
@@ -3,7 +3,6 @@
 #include <typeinfo>
 #include <cmath>
 
-#include <cmath>
 #include "lsst/afw/detection/Psf.h"
 #include "lsst/afw/math/offsetImage.h"
 

diff --git a/src/fits.cc b/src/fits.cc
@@ -2,6 +2,7 @@
 
 #include <cstdio>
 #include <complex>
+#include <cmath>
 #include <sstream>
 
 #include "fitsio.h"
@@ -16,7 +17,6 @@ extern "C" {
 #include "boost/format.hpp"
 #include "boost/scoped_array.hpp"
 
-#include <cmath>
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging/Log.h"
 #include "lsst/afw/fits.h"

diff --git a/src/geom/Box.cc b/src/geom/Box.cc
@@ -23,7 +23,6 @@
 #include <cmath>
 #include <limits>
 
-#include <cmath>
 #include "lsst/afw/geom/Box.h"
 
 namespace geom = lsst::afw::geom;

diff --git a/src/geom/ellipses/ConformalShear.cc b/src/geom/ellipses/ConformalShear.cc
@@ -21,12 +21,12 @@
  * the GNU General Public License along with this program.  If not, 
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
+#include <cmath>
+
 #include "lsst/afw/geom/ellipses/ConformalShear.h"
 #include "lsst/afw/geom/ellipses/ReducedShear.h"
 #include "lsst/afw/geom/ellipses/Distortion.h"
 
-#include <cmath>
-
 namespace lsst { namespace afw { namespace geom { namespace ellipses {
 
 double ConformalShear::getAxisRatio() const {

diff --git a/src/image/ImagePca.cc b/src/image/ImagePca.cc
@@ -28,8 +28,8 @@
  * @brief Utilities to support PCA analysis of a set of images
  */
 #include <algorithm>
-#include <memory>
 #include <cmath>
+#include <memory>
 
 #include "Eigen/Core"
 #include "Eigen/SVD"

diff --git a/src/math/Approximate.cc b/src/math/Approximate.cc
@@ -28,12 +28,12 @@
  */
 #include <limits>
 #include <algorithm>
+#include <cmath>
+#include <memory>
 #include <numeric>
 #include "Eigen/Core"
 #include "Eigen/LU"
 #include "boost/format.hpp"
-#include <memory>
-#include <cmath>
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/math/FunctionLibrary.h"
 #include "lsst/afw/image/MaskedImage.h"

diff --git a/src/math/Background.cc b/src/math/Background.cc
@@ -31,9 +31,8 @@
  */
 #include <iostream>
 #include <limits>
-#include <vector>
-#include <cmath>
 #include <cmath>
+#include <vector>
 #include "lsst/afw/image/MaskedImage.h"
 #include "lsst/afw/math/Interpolate.h"
 #include "lsst/afw/math/Background.h"

diff --git a/src/math/BackgroundMI.cc b/src/math/BackgroundMI.cc
@@ -33,7 +33,6 @@
 #include <limits>
 #include <vector>
 #include <cmath>
-#include <cmath>
 #include "lsst/afw/image/MaskedImage.h"
 #include "lsst/afw/math/Interpolate.h"
 #include "lsst/afw/math/Approximate.h"

diff --git a/src/math/Stack.cc b/src/math/Stack.cc
@@ -34,7 +34,6 @@
 #include <memory>
 
 #include "lsst/base.h"
-#include <cmath>
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/math/Stack.h"
 #include "lsst/afw/math/MaskedVector.h"

diff --git a/src/math/Statistics.cc b/src/math/Statistics.cc
@@ -38,7 +38,6 @@
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/image/Image.h"
 #include "lsst/afw/math/Statistics.h"
-#include <cmath>
 #include "lsst/afw/geom/Angle.h"
 
 using namespace std;

diff --git a/src/table/Match.cc b/src/table/Match.cc
@@ -27,7 +27,6 @@
 
 #include "boost/scoped_array.hpp"
 
-#include <cmath>
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging/Trace.h"
 #include "lsst/pex/logging/Log.h"

diff --git a/src/table/io/FitsSchemaInputMapper.cc b/src/table/io/FitsSchemaInputMapper.cc
@@ -2,6 +2,7 @@
 
 #include <cstdio>
 #include <array>
+#include <cmath>
 
 #include "boost/regex.hpp"
 #include "boost/lexical_cast.hpp"
@@ -11,7 +12,6 @@
 #include "boost/multi_index/ordered_index.hpp"
 #include "boost/multi_index/hashed_index.hpp"
 #include "boost/multi_index/member.hpp"
-#include <cmath>
 
 #include "lsst/pex/logging.h"
 #include "lsst/afw/table/io/FitsSchemaInputMapper.h"

diff --git a/tests/convolveGPU.cc b/tests/convolveGPU.cc
@@ -43,7 +43,6 @@
 #include <ctime>
 
 #include "lsst/daf/base.h"
-#include <cmath>
 #include "lsst/utils/Utils.h"
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging/Trace.h"

diff --git a/tests/statistics.cc b/tests/statistics.cc
@@ -39,7 +39,6 @@
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/image/Image.h"
 #include "lsst/afw/math/Statistics.h"
-#include <cmath>
 
 using namespace std;
 

diff --git a/tests/testFitsTables.cc b/tests/testFitsTables.cc
@@ -9,11 +9,11 @@
 #include <iostream>
 #include <iterator>
 #include <algorithm>
+#include <cmath>
 #include <map>
 
 #include "boost/filesystem.hpp"
 
-#include <cmath>
 #include "lsst/afw/table/Source.h"
 
 struct EqualityCompare {

diff --git a/tests/testTableArchives.cc b/tests/testTableArchives.cc
@@ -10,12 +10,12 @@
 #include <iostream>
 #include <iterator>
 #include <algorithm>
+#include <cmath>
 #include <map>
 
 #include "boost/filesystem.hpp"
 #include "Eigen/Core"
 
-#include <cmath>
 #include "lsst/afw/table/io/Persistable.h"
 #include "lsst/afw/table/io/ArchiveIndexSchema.h"
 #include "lsst/afw/table/io/OutputArchive.h"

diff --git a/tests/testWarpGpu.cc b/tests/testWarpGpu.cc
@@ -40,7 +40,6 @@
 #include <cmath>
 
 #include "lsst/daf/base.h"
-#include <cmath>
 #include "lsst/utils/Utils.h"
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/exceptions.h"