Use CMSUnits instead: See cms-sw#27637

vargasa · Aug 2, 2019 · 2ed7341 · 2ed7341
1 parent 0c4a74d
commit 2ed7341
Show file tree

Hide file tree

Showing 29 changed files with 54 additions and 59 deletions.
diff --git a/DetectorDescription/DDCMS/plugins/DDAngular.cc b/DetectorDescription/DDCMS/plugins/DDAngular.cc
@@ -1,5 +1,5 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <Math/Rotation3D.h>
@@ -9,8 +9,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 using DD3Vector = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;
 using DDAxisAngle = ROOT::Math::AxisAngle;

diff --git a/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc b/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc
@@ -2,9 +2,9 @@
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDGEMAngular.cc b/DetectorDescription/DDCMS/plugins/DDGEMAngular.cc
@@ -1,9 +1,9 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 //#define EDM_ML_DEBUG
 

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalCell.cc b/DetectorDescription/DDCMS/plugins/DDHGCalCell.cc
@@ -1,5 +1,4 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalWafer.cc b/DetectorDescription/DDCMS/plugins/DDHGCalWafer.cc
@@ -1,11 +1,11 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define EDM_ML_DEBUG
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalWafer8.cc b/DetectorDescription/DDCMS/plugins/DDHGCalWafer8.cc
@@ -6,7 +6,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/DDCMS/plugins/DDLinear.cc b/DetectorDescription/DDCMS/plugins/DDLinear.cc
@@ -1,5 +1,5 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <Math/Cartesian3D.h>
@@ -8,7 +8,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 using DD3Vector = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;
 

diff --git a/DetectorDescription/DDCMS/plugins/DDMuonAngular.cc b/DetectorDescription/DDCMS/plugins/DDMuonAngular.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */,
                       cms::DDParsingContext& context,

diff --git a/DetectorDescription/DDCMS/plugins/DDPixBarLayerAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixBarLayerAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& description, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   PlacedVolume pv;

diff --git a/DetectorDescription/DDCMS/plugins/DDPixBarLayerUpgradeAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixBarLayerUpgradeAlgo.cc
@@ -1,9 +1,9 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(dd4hep::Detector&, cms::DDParsingContext& ctxt, xml_h e, dd4hep::SensitiveDetector&) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDPixFwdDiskAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixFwdDiskAlgo.cc
@@ -8,11 +8,11 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
 #include <sstream>
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDPixPhase1FwdDiskAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixPhase1FwdDiskAlgo.cc
@@ -7,11 +7,11 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
 #include <sstream>
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDTECCoolAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECCoolAlgo.cc
@@ -1,6 +1,6 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTECModuleAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECModuleAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static void doPos(cms::DDParsingContext& ctxt,
                   dd4hep::Volume toPos,

diff --git a/DetectorDescription/DDCMS/plugins/DDTECOptoHybAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECOptoHybAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTECPhiAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECPhiAlgo.cc
@@ -1,15 +1,14 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
-  std::cout << "******** My DDTECPhiAlgo!!!!!!\n";
 
   cms::DDNamespace ns(ctxt, e, true);
   DDAlgoArguments args(ctxt, e);

diff --git a/DetectorDescription/DDCMS/plugins/DDTECPhiAltAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECPhiAltAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTIBLayerAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTIBLayerAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */,
                       cms::DDParsingContext& context,

diff --git a/DetectorDescription/DDCMS/plugins/DDTIDModuleAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTIDModuleAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTIDModulePosAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTIDModulePosAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTIDRingAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTIDRingAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTOBAxCableAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTOBAxCableAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTOBRadCableAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTOBRadCableAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTrackerAngular.cc b/DetectorDescription/DDCMS/plugins/DDTrackerAngular.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTrackerPhiAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTrackerPhiAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDTrackerPhiAltAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTrackerPhiAltAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/Geometry/HcalAlgo/plugins/dd4hep/DDHCalAngular.cc b/Geometry/HcalAlgo/plugins/dd4hep/DDHCalAngular.cc
@@ -1,11 +1,11 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define EDM_ML_DEBUG
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,