GlobalSystemOfUnits -> SystemOfUnits to avoid numerous single charact…

…er symbols in global scope
trackreco · May 1, 2024 · 52291ba · 52291ba
1 parent 265f2c7
commit 52291ba
Show file tree

Hide file tree

Showing 162 changed files with 415 additions and 300 deletions.
diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h
@@ -9,7 +9,7 @@
 
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h"
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 class CocoaSolidShapeTubs : public CocoaSolidShape {
 public:
@@ -18,8 +18,8 @@ class CocoaSolidShapeTubs : public CocoaSolidShape {
                       ALIfloat pRMin,
                       ALIfloat pRMax,
                       ALIfloat pDz,
-                      ALIfloat pSPhi = 0. * deg,
-                      ALIfloat pDPhi = 360. * deg);
+                      ALIfloat pSPhi = 0. * CLHEP::deg,
+                      ALIfloat pDPhi = 360. * CLHEP::deg);
   ~CocoaSolidShapeTubs() override{};
   ALIfloat getInnerRadius() const { return theInnerRadius; }
   ALIfloat getOuterRadius() const { return theOuterRadius; }

diff --git a/Alignment/CocoaModel/src/ALIUnitsTable.cc b/Alignment/CocoaModel/src/ALIUnitsTable.cc
@@ -1,6 +1,6 @@
 
 #include "Alignment/CocoaModel/interface/ALIUnitsTable.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include <iomanip>
 #include <cstdlib>
@@ -114,6 +114,7 @@ void ALIUnitDefinition::PrintDefinition() {
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void ALIUnitDefinition::BuildUnitsTable() {
+  using namespace CLHEP;
   //Length
   std::make_shared<ALIUnitDefinition>("kilometer", "km", "Length", kilometer);
   std::make_shared<ALIUnitDefinition>("meter", "m", "Length", meter);

diff --git a/Alignment/CocoaModel/src/OptOCubeSplitter.cc b/Alignment/CocoaModel/src/OptOCubeSplitter.cc
@@ -9,7 +9,7 @@
 #include "Alignment/CocoaModel/interface/LightRay.h"
 #include "Alignment/CocoaModel/interface/ALIPlane.h"
 #include "Alignment/CocoaUtilities/interface/ALIUtils.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #ifdef COCOA_VIS
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #include "Alignment/CocoaVisMgr/interface/ALIColour.h"
@@ -180,7 +180,7 @@ ALIPlane OptOCubeSplitter::getMiddlePlate() {
         acos(0.) /
         2.;  //default is 45o  !!! this creates problem in 'isr_medidas_globales.txt': laser goes along X and does not intersect cube if angles Y 0, anglePlanes 45
     if (ALIUtils::debug >= 4)
-      std::cout << "anglePlanes default = " << anglePlanes / deg << std::endl;
+      std::cout << "anglePlanes default = " << anglePlanes / CLHEP::deg << std::endl;
   }
   CLHEP::Hep3Vector Axis(0., 0., 1.);
   CLHEP::Hep3Vector XAxis(1., 0., 0.);
@@ -247,6 +247,8 @@ void OptOCubeSplitter::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeBox(
-      "Box", go * 5. * cm / m, go * 5. * cm / m, go * 5. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeBox("Box",
+                                         go * 5. * CLHEP::cm / CLHEP::m,
+                                         go * 5. * CLHEP::cm / CLHEP::m,
+                                         go * 5. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptODistancemeter.cc b/Alignment/CocoaModel/src/OptODistancemeter.cc
@@ -14,7 +14,7 @@
 #include "Alignment/CocoaVisMgr/interface/ALIVRMLMgr.h"
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #endif
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
@@ -99,6 +99,8 @@ void OptODistancemeter::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 2. * cm / m, go * 5. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 2. * CLHEP::cm / CLHEP::m,
+                                          go * 5. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptODistancemeter3dim.cc b/Alignment/CocoaModel/src/OptODistancemeter3dim.cc
@@ -13,7 +13,7 @@
 #include "Alignment/CocoaVisMgr/interface/ALIVRMLMgr.h"
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #endif
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
@@ -72,6 +72,8 @@ void OptODistancemeter3dim::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 2. * cm / m, go * 5. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 2. * CLHEP::cm / CLHEP::m,
+                                          go * 5. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptOLaser.cc b/Alignment/CocoaModel/src/OptOLaser.cc
@@ -12,7 +12,7 @@
 #include "Alignment/CocoaVisMgr/interface/ALIVRMLMgr.h"
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #endif
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
@@ -53,6 +53,8 @@ void OptOLaser::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 1. * cm / m, go * 5. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 1. * CLHEP::cm / CLHEP::m,
+                                          go * 5. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptOLens.cc b/Alignment/CocoaModel/src/OptOLens.cc
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdlib>
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #ifdef COCOA_VIS
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #include "Alignment/CocoaVisMgr/interface/ALIColour.h"
@@ -48,6 +48,8 @@ void OptOLens::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 5. * cm / m, go * 1. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 5. * CLHEP::cm / CLHEP::m,
+                                          go * 1. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptOPinhole.cc b/Alignment/CocoaModel/src/OptOPinhole.cc
@@ -14,7 +14,7 @@
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #include "Alignment/CocoaVisMgr/interface/ALIColour.h"
 #endif
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
@@ -61,6 +61,8 @@ void OptOPinhole::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 1. * cm / m, go * 1. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 1. * CLHEP::cm / CLHEP::m,
+                                          go * 1. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OptOSource.cc b/Alignment/CocoaModel/src/OptOSource.cc
@@ -14,7 +14,7 @@
 #include "Alignment/CocoaVisMgr/interface/ALIVRMLMgr.h"
 #include "Alignment/IgCocoaFileWriter/interface/IgCocoaFileMgr.h"
 #endif
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
@@ -61,6 +61,8 @@ void OptOSource::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeTubs(
-      "Tubs", go * 0. * cm / m, go * 1. * cm / m, go * 2. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeTubs("Tubs",
+                                          go * 0. * CLHEP::cm / CLHEP::m,
+                                          go * 1. * CLHEP::cm / CLHEP::m,
+                                          go * 2. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
diff --git a/Alignment/CocoaModel/src/OpticalObject.cc b/Alignment/CocoaModel/src/OpticalObject.cc
@@ -42,7 +42,7 @@
 #include "CondFormats/OptAlignObjects/interface/OpticalAlignInfo.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include <cstdlib>
 #include <iostream>
@@ -1999,7 +1999,7 @@ const double OpticalObject::getEntryRMangle(const ALIstring& coorstr) const {
 
 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 void OpticalObject::constructMaterial() {
-  theMaterial = new CocoaMaterialElementary("Hydrogen", 70.8 * mg / cm3, "H", 1.00794f, 1);
+  theMaterial = new CocoaMaterialElementary("Hydrogen", 70.8 * CLHEP::mg / CLHEP::cm3, "H", 1.00794f, 1);
 }
 
 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -2008,8 +2008,10 @@ void OpticalObject::constructSolidShape() {
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
   gomgr->getGlobalOptionValue("VisScale", go);
 
-  theSolidShape = new CocoaSolidShapeBox(
-      "Box", go * 5. * cm / m, go * 5. * cm / m, go * 5. * cm / m);  //COCOA internal units are meters
+  theSolidShape = new CocoaSolidShapeBox("Box",
+                                         go * 5. * CLHEP::cm / CLHEP::m,
+                                         go * 5. * CLHEP::cm / CLHEP::m,
+                                         go * 5. * CLHEP::cm / CLHEP::m);  //COCOA internal units are meters
 }
 
 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

diff --git a/Alignment/CocoaToDDL/src/CocoaUnitsTable.cc b/Alignment/CocoaToDDL/src/CocoaUnitsTable.cc
@@ -1,6 +1,6 @@
 
 #include "Alignment/CocoaToDDL/interface/CocoaUnitsTable.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include <iomanip>
 #include <cmath>  // include floating-point std::abs functions
@@ -122,6 +122,7 @@ void CocoaUnitDefinition::PrintDefinition() {
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void CocoaUnitDefinition::BuildUnitsTable() {
+  using namespace CLHEP;
   //Length
   new CocoaUnitDefinition("meter", "m", "Length", meter);
   new CocoaUnitDefinition("centimeter", "cm", "Length", centimeter);

diff --git a/Alignment/CocoaToDDL/src/UnitConverter.cc b/Alignment/CocoaToDDL/src/UnitConverter.cc
@@ -1,6 +1,6 @@
 #include "Alignment/CocoaToDDL/interface/UnitConverter.h"
 #include "Alignment/CocoaToDDL/interface/CocoaUnitsTable.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include <sstream>
 
 /*
@@ -26,7 +26,7 @@ std::string UnitConverter::ucstring() {
 
   if (angl_) {
     str.precision(11);
-    double x = (*(bu_->GetValue())) / deg;
+    double x = (*(bu_->GetValue())) / CLHEP::deg;
     str << x << std::string("*deg") << '\0';
     return std::string(str.str());
 

diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc
@@ -13,15 +13,15 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
 #include "globals.hh"  // Global Constants and typedefs
 
 LaserBeamsTEC1::LaserBeamsTEC1() : theParticleGun(nullptr), theDRand48Engine(nullptr) {
   G4int nPhotonsGun = 1;
   G4int nPhotonsBeam = 1;
-  G4double Energy = 1.15 * eV;
+  G4double Energy = 1.15 * CLHEP::eV;
   // call constructor with options
   LaserBeamsTEC1(nPhotonsGun, nPhotonsBeam, Energy);
 }
@@ -52,10 +52,10 @@ LaserBeamsTEC1::LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
   G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   theParticleGun->SetParticleDefinition(theOpticalPhoton);
-  theParticleGun->SetParticleTime(0.0 * ns);
-  theParticleGun->SetParticlePosition(G4ThreeVector(-500.0 * cm, 0.0 * cm, 0.0 * cm));
+  theParticleGun->SetParticleTime(0.0 * CLHEP::ns);
+  theParticleGun->SetParticlePosition(G4ThreeVector(-500.0 * CLHEP::cm, 0.0 * CLHEP::cm, 0.0 * CLHEP::cm));
   theParticleGun->SetParticleMomentumDirection(G4ThreeVector(5.0, 3.0, 0.0));
-  theParticleGun->SetParticleEnergy(10.0 * keV);
+  theParticleGun->SetParticleEnergy(10.0 * CLHEP::keV);
   setOptPhotonPolar(90.0);
 
   // initialize the random number engine
@@ -88,6 +88,7 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event *myEvent) {
 
   // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are
   // positioned
+  using CLHEP::mm;
   G4double LaserPositionZ = 2057.5 * mm;
 
   // Radius of the inner and outer Laser ring
@@ -128,7 +129,7 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event *myEvent) {
 
         // set the properties of the newly created particle
         theParticleGun->SetParticleDefinition(theOpticalPhoton);
-        theParticleGun->SetParticleTime(0.0 * ns);
+        theParticleGun->SetParticleTime(0.0 * CLHEP::ns);
         theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
         theParticleGun->SetParticleEnergy(thePhotonEnergy);
 

diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc
@@ -13,15 +13,15 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
 #include "globals.hh"  // Global Constants and typedefs
 
 LaserBeamsTEC2::LaserBeamsTEC2() : theParticleGun(nullptr), theDRand48Engine(nullptr) {
   G4int nPhotonsGun = 1;
   G4int nPhotonsBeam = 1;
-  G4double Energy = 1.15 * eV;
+  G4double Energy = 1.15 * CLHEP::eV;
   // call constructor with options
   LaserBeamsTEC2(nPhotonsGun, nPhotonsBeam, Energy);
 }
@@ -52,10 +52,10 @@ LaserBeamsTEC2::LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
   G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   theParticleGun->SetParticleDefinition(theOpticalPhoton);
-  theParticleGun->SetParticleTime(0.0 * ns);
-  theParticleGun->SetParticlePosition(G4ThreeVector(-500.0 * cm, 0.0 * cm, 0.0 * cm));
+  theParticleGun->SetParticleTime(0.0 * CLHEP::ns);
+  theParticleGun->SetParticlePosition(G4ThreeVector(-500.0 * CLHEP::cm, 0.0 * CLHEP::cm, 0.0 * CLHEP::cm));
   theParticleGun->SetParticleMomentumDirection(G4ThreeVector(5.0, 3.0, 0.0));
-  theParticleGun->SetParticleEnergy(10.0 * keV);
+  theParticleGun->SetParticleEnergy(10.0 * CLHEP::keV);
   setOptPhotonPolar(90.0);
 
   // initialize the random number engine
@@ -88,6 +88,7 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event *myEvent) {
 
   // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are
   // positioned
+  using CLHEP::mm;
   G4double LaserPositionZ = -2057.5 * mm;
 
   // Radius of the inner and outer Laser ring
@@ -128,7 +129,7 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event *myEvent) {
 
         // set the properties of the newly created particle
         theParticleGun->SetParticleDefinition(theOpticalPhoton);
-        theParticleGun->SetParticleTime(0.0 * ns);
+        theParticleGun->SetParticleTime(0.0 * CLHEP::ns);
         theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
         theParticleGun->SetParticleEnergy(thePhotonEnergy);
 

diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc
@@ -128,7 +128,7 @@ Ring 0 L0 : Width Tray 6:266.6, 5&4:325.6, 3:330.6, 2:341.6, 1:272.6
 #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
 #include "CLHEP/Vector/LorentzVector.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include "TH2F.h"
 

diff --git a/CondTools/BeamSpot/plugins/BeamProfile2DBWriter.cc b/CondTools/BeamSpot/plugins/BeamProfile2DBWriter.cc
@@ -30,7 +30,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 //

diff --git a/DetectorDescription/Core/test/clhepToROOTMath.cpp b/DetectorDescription/Core/test/clhepToROOTMath.cpp
@@ -2,8 +2,8 @@
 #include <iomanip>
 #include <iostream>
 
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
+#include <CLHEP/Units/SystemOfUnits.h>
 #include "CLHEP/Vector/Rotation.h"
 #include "CLHEP/Vector/RotationInterfaces.h"
 #include "CLHEP/Vector/ThreeVector.h"
@@ -15,6 +15,7 @@
 
 typedef CLHEP::Hep3Vector H3V;
 typedef CLHEP::HepRotation HRM;
+using CLHEP::deg;
 
 using namespace std;
 

diff --git a/DetectorDescription/DDCMS/test/DDUnits.cppunit.cc b/DetectorDescription/DDCMS/test/DDUnits.cppunit.cc
@@ -3,8 +3,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "DataFormats/Math/interface/GeantUnits.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"