cms-sw · cmsbuild · Aug 16, 2017 · Aug 15, 2017 · Aug 15, 2017 · Aug 16, 2017
diff --git a/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc b/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc
@@ -15,14 +15,14 @@
 #include "DetectorDescription/Core/interface/DDsvalues.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 
+#include <cstddef>
 #include <fstream>
 #include <iomanip>
 #include <map>
 #include <memory>
 #include <ostream>
 #include <set>
 #include <string>
-#include <stddef.h>
 #include <utility>
 #include <vector>
 

diff --git a/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc b/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc
@@ -13,14 +13,14 @@
 #include "DetectorDescription/OfflineDBLoader/interface/DDCoreToDDXMLOutput.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
+#include <cstddef>
 #include <fstream>
 #include <iomanip>
 #include <map>
 #include <memory>
 #include <ostream>
 #include <set>
 #include <string>
-#include <stddef.h>
 #include <utility>
 #include <vector>
 

diff --git a/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc b/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc
@@ -4,10 +4,6 @@
 #include <DetectorDescription/Core/interface/DDSolidShapes.h>
 #include <DetectorDescription/Core/interface/DDSpecifics.h>
 #include <DetectorDescription/OfflineDBLoader/interface/DDCoreToDDXMLOutput.h>
-#include <stddef.h>
-#include <iomanip>
-#include <vector>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
@@ -22,6 +18,10 @@
 #include "Math/GenVector/DisplacementVector3D.h"
 #include "Math/GenVector/Rotation3D.h"
 
+#include <cstddef>
+#include <iomanip>
+#include <vector>
+
 void 
 DDCoreToDDXMLOutput::solid( const DDSolid& solid, std::ostream& xos ) 
 {

diff --git a/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc b/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc
@@ -1,12 +1,6 @@
 #include "DetectorDescription/Core/interface/DDPartSelection.h"
 #include "DetectorDescription/Core/interface/DDValue.h"
 #include "DetectorDescription/OfflineDBLoader/interface/GeometryInfoDump.h"
-#include <cassert>
-#include <fstream>
-#include <map>
-#include <set>
-#include <vector>
-
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
 #include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
@@ -15,6 +9,12 @@
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include <cassert>
+#include <fstream>
+#include <map>
+#include <set>
+#include <vector>
+
 GeometryInfoDump::GeometryInfoDump () { }
 
 GeometryInfoDump::~GeometryInfoDump () { }

diff --git a/DetectorDescription/Parser/src/DDDividedBox.cc b/DetectorDescription/Parser/src/DDDividedBox.cc
@@ -1,9 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedBox.h"
-
-#include <ostream>
-#include <string>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDAxes.h"
 #include "DetectorDescription/Core/interface/DDDivision.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
@@ -14,6 +9,10 @@
 #include "DetectorDescription/Parser/src/DDDividedGeometryObject.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <ostream>
+#include <string>
+#include <utility>
+
 class DDCompactView;
 
 DDDividedBoxX::DDDividedBoxX( const DDDivision& div, DDCompactView* cpv)

diff --git a/DetectorDescription/Parser/src/DDDividedCons.cc b/DetectorDescription/Parser/src/DDDividedCons.cc
@@ -1,9 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedCons.h"
-
-#include <iostream>
-#include <string>
-#include <utility>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
@@ -16,6 +11,10 @@
 #include "DetectorDescription/Parser/src/DDDividedGeometryObject.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <iostream>
+#include <string>
+#include <utility>
+
 class DDCompactView;
 
 DDDividedConsRho::DDDividedConsRho( const DDDivision& div, DDCompactView* cpv )

diff --git a/DetectorDescription/Parser/src/DDDividedGeometryObject.cc b/DetectorDescription/Parser/src/DDDividedGeometryObject.cc
@@ -1,8 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedGeometryObject.h"
-
-#include <iostream>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDName.h"
@@ -11,6 +7,9 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "Math/GenVector/RotationZ.h"
 
+#include <iostream>
+#include <utility>
+
 DDDividedGeometryObject::DDDividedGeometryObject( const DDDivision& div, DDCompactView* cpv ) 
   : div_( div ),
     ftype_(),

diff --git a/DetectorDescription/Parser/src/DDDividedPolycone.cc b/DetectorDescription/Parser/src/DDDividedPolycone.cc
@@ -1,11 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedPolycone.h"
-
-#include <stddef.h>
-#include <iostream>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
@@ -18,6 +11,12 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include <cstddef>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
+
 class DDCompactView;
 
 DDDividedPolyconeRho::DDDividedPolyconeRho( const DDDivision& div, DDCompactView* cpv )

diff --git a/DetectorDescription/Parser/src/DDDividedPolyhedra.cc b/DetectorDescription/Parser/src/DDDividedPolyhedra.cc
@@ -1,11 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedPolyhedra.h"
-
-#include <stddef.h>
-#include <iostream>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
@@ -18,6 +11,12 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include <cstddef>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
+
 class DDCompactView;
 
 DDDividedPolyhedraRho::DDDividedPolyhedraRho( const DDDivision& div, DDCompactView* cpv )

diff --git a/DetectorDescription/Parser/src/DDDividedTrd.cc b/DetectorDescription/Parser/src/DDDividedTrd.cc
@@ -1,10 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedTrd.h"
-
-#include <cmath>
-#include <ostream>
-#include <string>
-#include <utility>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDAxes.h"
@@ -17,6 +11,11 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include <cmath>
+#include <ostream>
+#include <string>
+#include <utility>
+
 class DDCompactView;
 
 DDDividedTrdX::DDDividedTrdX( const DDDivision& div, DDCompactView* cpv )

diff --git a/DetectorDescription/Parser/src/DDDividedTubs.cc b/DetectorDescription/Parser/src/DDDividedTubs.cc
@@ -1,8 +1,4 @@
 #include "DetectorDescription/Parser/src/DDDividedTubs.h"
-
-#include <string>
-#include <utility>
-
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDRotationMatrix.h"
@@ -15,6 +11,9 @@
 #include "DetectorDescription/Parser/src/DDDividedGeometryObject.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <string>
+#include <utility>
+
 class DDCompactView;
 
 DDDividedTubsRho::DDDividedTubsRho( const DDDivision& div, DDCompactView* cpv )

diff --git a/DetectorDescription/Parser/src/DDLAlgorithm.cc b/DetectorDescription/Parser/src/DDLAlgorithm.cc
@@ -1,9 +1,4 @@
 #include "DetectorDescription/Parser/src/DDLAlgorithm.h"
-
-#include <stddef.h>
-#include <map>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDAlgorithmHandler.h"
 #include "DetectorDescription/Core/interface/DDTypes.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
@@ -14,6 +9,10 @@
 #include "DetectorDescription/Parser/src/DDLVector.h"
 #include "DetectorDescription/Parser/src/DDXMLElement.h"
 
+#include <cstddef>
+#include <map>
+#include <utility>
+
 class DDCompactView;
 
 DDLAlgorithm::DDLAlgorithm( DDLElementRegistry* myreg )

diff --git a/DetectorDescription/Parser/src/DDLBooleanSolid.cc b/DetectorDescription/Parser/src/DDLBooleanSolid.cc
@@ -17,7 +17,8 @@ DDLBooleanSolid::DDLBooleanSolid( DDLElementRegistry* myreg )
 
 // Clear out rSolids.
 void
-DDLBooleanSolid::preProcessElement( const std::string& name, const std::string& nmspace, DDCompactView& cpv )
+DDLBooleanSolid::preProcessElement( const std::string& name, const std::string& nmspace,
+				    DDCompactView& cpv )
 {
   myRegistry_->getElement( "rSolid" )->clear();
 }

diff --git a/DetectorDescription/Parser/src/DDLBox.cc b/DetectorDescription/Parser/src/DDLBox.cc
@@ -1,14 +1,13 @@
 #include "DetectorDescription/Parser/src/DDLBox.h"
-
-#include <map>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDName.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/ClhepEvaluator.h"
 #include "DetectorDescription/Parser/interface/DDLElementRegistry.h"
 #include "DetectorDescription/Parser/src/DDLSolid.h"
 
+#include <map>
+#include <utility>
+
 class DDCompactView;
 
 DDLBox::DDLBox( DDLElementRegistry* myreg )

diff --git a/DetectorDescription/Parser/src/DDLCompositeMaterial.cc b/DetectorDescription/Parser/src/DDLCompositeMaterial.cc
@@ -1,8 +1,4 @@
 #include "DetectorDescription/Parser/src/DDLCompositeMaterial.h"
-
-#include <stddef.h>
-#include <map>
-#include <utility>
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 #include "DetectorDescription/Core/interface/ClhepEvaluator.h"
@@ -11,6 +7,10 @@
 #include "DetectorDescription/Parser/src/DDXMLElement.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <cstddef>
+#include <map>
+#include <utility>
+
 class DDCompactView;
 
 DDLCompositeMaterial::DDLCompositeMaterial( DDLElementRegistry* myreg )

diff --git a/DetectorDescription/Parser/src/DDLCone.cc b/DetectorDescription/Parser/src/DDLCone.cc
@@ -12,7 +12,8 @@ DDLCone::DDLCone( DDLElementRegistry* myreg )
 {}
 
 void
-DDLCone::processElement( const std::string& name, const std::string& nmspace, DDCompactView& cpv )
+DDLCone::processElement( const std::string& name, const std::string& nmspace,
+			 DDCompactView& cpv )
 {  
   ClhepEvaluator & ev = myRegistry_->evaluator();
   DDXMLAttribute atts = getAttributeSet();

diff --git a/DetectorDescription/Parser/src/DDLDivision.cc b/DetectorDescription/Parser/src/DDLDivision.cc
@@ -1,10 +1,4 @@
 #include "DetectorDescription/Parser/src/DDLDivision.h"
-
-#include <stddef.h>
-#include <map>
-#include <ostream>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDAxes.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDName.h"
@@ -22,6 +16,11 @@
 #include "DetectorDescription/Parser/src/DDXMLElement.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <cstddef>
+#include <map>
+#include <ostream>
+#include <utility>
+
 class DDCompactView;
 
 DDLDivision::DDLDivision( DDLElementRegistry* myreg )
@@ -100,7 +99,7 @@ DDLDivision::processElement( const std::string& name, const std::string& nmspace
 DDDividedGeometryObject*
 DDLDivision::makeDivider( const DDDivision& div, DDCompactView* cpv )
 {
-  DDDividedGeometryObject* dg = NULL;
+  DDDividedGeometryObject* dg = nullptr;
 
   switch (div.parent().solid().shape()) 
   {

diff --git a/DetectorDescription/Parser/src/DDLElementRegistry.cc b/DetectorDescription/Parser/src/DDLElementRegistry.cc
@@ -1,10 +1,3 @@
-#include <stddef.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Parser/interface/DDLElementRegistry.h"
 #include "DetectorDescription/Parser/src/DDLAlgorithm.h"
@@ -41,6 +34,13 @@
 #include "DetectorDescription/Parser/src/DDXMLElement.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include <cstddef>
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 DDLElementRegistry::DDLElementRegistry( void )
 {}
 

diff --git a/DetectorDescription/Parser/src/DDLElementaryMaterial.cc b/DetectorDescription/Parser/src/DDLElementaryMaterial.cc
@@ -1,14 +1,13 @@
 #include "DetectorDescription/Parser/src/DDLElementaryMaterial.h"
-
-#include <map>
-#include <utility>
-
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/ClhepEvaluator.h"
 #include "DetectorDescription/Parser/interface/DDLElementRegistry.h"
 #include "DetectorDescription/Parser/src/DDLMaterial.h"
 #include "DetectorDescription/Parser/src/DDXMLElement.h"
 
+#include <map>
+#include <utility>
+
 class DDCompactView;
 
 DDLElementaryMaterial::DDLElementaryMaterial( DDLElementRegistry* myreg )

diff --git a/DetectorDescription/Parser/src/DDLEllipsoid.cc b/DetectorDescription/Parser/src/DDLEllipsoid.cc
@@ -12,7 +12,8 @@ DDLEllipsoid::DDLEllipsoid( DDLElementRegistry* myreg )
 {}
 
 void
-DDLEllipsoid::processElement( const std::string& name, const std::string& nmspace, DDCompactView& cpv )
+DDLEllipsoid::processElement( const std::string& name, const std::string& nmspace,
+			      DDCompactView& cpv )
 { 
   ClhepEvaluator & ev = myRegistry_->evaluator();
   DDXMLAttribute atts = getAttributeSet();