solve conflict

.gitignore

@@ -4,3 +4,4 @@ __init__.py
 .#*
 #*#
 *~
+*.pb

Alignment/CocoaApplication/src/CocoaAnalyzer.cc

@@ -2,7 +2,7 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/DataRecord/interface/OpticalAlignmentsRcd.h"
 #include "CondFormats/OptAlignObjects/interface/OpticalAlignMeasurementInfo.h"
-#include "DataFormats/Math/interface/CMSUnits.h"
+#include <DD4hep/DD4hepUnits.h>
 #include "DetectorDescription/DDCMS/interface/DDCompactView.h"
 #include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -51,8 +51,6 @@ class CocoaAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
   std::string theCocoaDaqRootFileName_;
 };
 
-using namespace cms_units::operators;
-
 CocoaAnalyzer::CocoaAnalyzer(edm::ParameterSet const& pset) {
   theCocoaDaqRootFileName_ = pset.getParameter<std::string>("cocoaDaqRootFile");
   int maxEvents = pset.getParameter<int32_t>("maxEvents");
@@ -180,41 +178,41 @@ void CocoaAnalyzer::readXMLFile(const edm::EventSetup& evts) {
       const dd4hep::Direction& transl = myPlacedVolume.position();
 
       if (ALIUtils::debug >= 4) {
-        edm::LogInfo("Alignment") << "Local translation in cm = " << transl;
+        edm::LogInfo("Alignment") << "Local translation in dd4hep units = " << transl;
       }
 
       // B) READ INFO FROM XMLS
       // X
       oaInfo.x_.name_ = "X";
       oaInfo.x_.dim_type_ = "centre";
-      oaInfo.x_.value_ = transl.x() / (1._m);  // COCOA units are m
+      oaInfo.x_.value_ = transl.x() / dd4hep::m;  // COCOA units are m
       oaInfo.x_.error_ = cms::getParameterValueFromSpecParSections<double>(allSpecParSections,
                                                                            nodePath,
                                                                            "centre_X_sigma",
                                                                            0) /
-                         (1._m);  // COCOA units are m
+                         dd4hep::m;  // COCOA units are m
       oaInfo.x_.quality_ = static_cast<int>(
           cms::getParameterValueFromSpecParSections<double>(allSpecParSections, nodePath, "centre_X_quality", 0));
       // Y
       oaInfo.y_.name_ = "Y";
       oaInfo.y_.dim_type_ = "centre";
-      oaInfo.y_.value_ = transl.y() / (1._m);  // COCOA units are m
+      oaInfo.y_.value_ = transl.y() / dd4hep::m;  // COCOA units are m
       oaInfo.y_.error_ = cms::getParameterValueFromSpecParSections<double>(allSpecParSections,
                                                                            nodePath,
                                                                            "centre_Y_sigma",
                                                                            0) /
-                         (1._m);  // COCOA units are m
+                         dd4hep::m;  // COCOA units are m
       oaInfo.y_.quality_ = static_cast<int>(
           cms::getParameterValueFromSpecParSections<double>(allSpecParSections, nodePath, "centre_Y_quality", 0));
       // Z
       oaInfo.z_.name_ = "Z";
       oaInfo.z_.dim_type_ = "centre";
-      oaInfo.z_.value_ = transl.z() / (1._m);  // COCOA units are m
+      oaInfo.z_.value_ = transl.z() / dd4hep::m;  // COCOA units are m
       oaInfo.z_.error_ = cms::getParameterValueFromSpecParSections<double>(allSpecParSections,
                                                                            nodePath,
                                                                            "centre_Z_sigma",
                                                                            0) /
-                         (1._m);  // COCOA units are m
+                         dd4hep::m;  // COCOA units are m
       oaInfo.z_.quality_ = static_cast<int>(
           cms::getParameterValueFromSpecParSections<double>(allSpecParSections, nodePath, "centre_Z_quality", 0));
 
@@ -328,7 +326,8 @@ void CocoaAnalyzer::readXMLFile(const edm::EventSetup& evts) {
           double dimFactor = 1.;
           const std::string& type = dims[i];
           if (type == "centre" || type == "length") {
-            dimFactor = 1. / (1._m);  // was converted to cm with getParameterValueFromSpecPar, COCOA unit is m
+            dimFactor =
+                1. / dd4hep::m;  // was converted to dd4hep unit with getParameterValueFromSpecPar, COCOA unit is m
           } else if (type == "angles" || type == "angle" || type == "nodim") {
             dimFactor = 1.;
           }
@@ -546,7 +545,7 @@ void CocoaAnalyzer::correctOpticalAlignmentParameter(OpticalAlignParam& myXMLPar
     double dimFactor = 1.;
 
     if (type == "centre" || type == "length") {
-      dimFactor = 1. / 1._m;  // in DB it is in cm
+      dimFactor = 1. / dd4hep::m;  // in DB values are stored in dd4hep unit
     } else if (type == "angles" || type == "angle" || type == "nodim") {
       dimFactor = 1.;
     } else {

Alignment/CocoaFit/BuildFile.xml

@@ -15,6 +15,7 @@
 <use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/Records"/>
+<use name="dd4hep"/>
 <export>
   <lib name="1"/>
 </export>

Alignment/CocoaFit/src/CocoaDBMgr.cc

@@ -3,7 +3,7 @@
 #include "CondFormats/Alignment/interface/AlignTransform.h"
 #include "CondFormats/Alignment/interface/AlignTransformErrorExtended.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
-#include "DataFormats/Math/interface/CMSUnits.h"
+#include <DD4hep/DD4hepUnits.h>
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -32,8 +32,6 @@
 
 #include "CondCore/CondDB/interface/Serialization.h"
 
-using namespace cms_units::operators;
-
 CocoaDBMgr* CocoaDBMgr::instance = nullptr;
 
 //----------------------------------------------------------------------
@@ -186,26 +184,26 @@ OpticalAlignInfo CocoaDBMgr::GetOptAlignInfoFromOptO(OpticalObject* opto) {
     OpticalAlignParam translationXDataForDB;
     translationXDataForDB.name_ = translationX->name();
     translationXDataForDB.dim_type_ = translationX->type();
-    translationXDataForDB.value_ = centreLocal.x() * 1._m;              // m in COCOA, cm in DB
-    translationXDataForDB.error_ = GetEntryError(translationX) * 1._m;  // m in COCOA, cm in DB
+    translationXDataForDB.value_ = centreLocal.x() * dd4hep::m;              // m in COCOA, dd4hep unit in DB
+    translationXDataForDB.error_ = GetEntryError(translationX) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
     translationXDataForDB.quality_ = translationX->quality();
     data.x_ = translationXDataForDB;
 
     const Entry* const translationY = theCoordinateEntryVector.at(1);
     OpticalAlignParam translationYDataForDB;
     translationYDataForDB.name_ = translationY->name();
     translationYDataForDB.dim_type_ = translationY->type();
-    translationYDataForDB.value_ = centreLocal.y() * 1._m;              // m in COCOA, cm in DB
-    translationYDataForDB.error_ = GetEntryError(translationY) * 1._m;  // m in COCOA, cm in DB
+    translationYDataForDB.value_ = centreLocal.y() * dd4hep::m;              // m in COCOA, dd4hep unit in DB
+    translationYDataForDB.error_ = GetEntryError(translationY) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
     translationYDataForDB.quality_ = translationY->quality();
     data.y_ = translationYDataForDB;
 
     const Entry* const translationZ = theCoordinateEntryVector.at(2);
     OpticalAlignParam translationZDataForDB;
     translationZDataForDB.name_ = translationZ->name();
     translationZDataForDB.dim_type_ = translationZ->type();
-    translationZDataForDB.value_ = centreLocal.z() * 1._m;              // m in COCOA, cm in DB
-    translationZDataForDB.error_ = GetEntryError(translationZ) * 1._m;  // m in COCOA, cm in DB
+    translationZDataForDB.value_ = centreLocal.z() * dd4hep::m;              // m in COCOA, dd4hep unit in DB
+    translationZDataForDB.error_ = GetEntryError(translationZ) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
     translationZDataForDB.quality_ = translationZ->quality();
     data.z_ = translationZDataForDB;
 
@@ -249,8 +247,8 @@ OpticalAlignInfo CocoaDBMgr::GetOptAlignInfoFromOptO(OpticalObject* opto) {
     extraEntry.value_ = myDBExtraEntry->value();
     extraEntry.error_ = myDBExtraEntry->sigma();
     if (extraEntry.dim_type_ == "centre" || extraEntry.dim_type_ == "length") {
-      extraEntry.value_ *= 1._m;  // m in COCOA, cm in DB
-      extraEntry.error_ *= 1._m;  // m in COCOA, cm in DB
+      extraEntry.value_ *= dd4hep::m;  // m in COCOA, dd4hep unit in DB
+      extraEntry.error_ *= dd4hep::m;  // m in COCOA, dd4hep unit in DB
     }
     extraEntry.quality_ = myDBExtraEntry->quality();
     data.extraEntries_.emplace_back(extraEntry);
@@ -365,12 +363,15 @@ AlignTransformErrorExtended* CocoaDBMgr::GetAlignInfoErrorFromOptO(OpticalObject
   CLHEP::HepMatrix errm(3, 3);
   const std::vector<Entry*>& theCoordinateEntryVector = opto->CoordinateEntryList();
   std::cout << "@@@ CocoaDBMgr::GetAlignInfoFromOptOfill errm " << opto->name() << std::endl;
-  errm(0, 0) = GetEntryError(theCoordinateEntryVector[0]) * 1._m;                               // m in COCOA, cm in DB
-  errm(1, 1) = GetEntryError(theCoordinateEntryVector[1]) * 1._m;                               // m in COCOA, cm in DB
-  errm(2, 2) = GetEntryError(theCoordinateEntryVector[2]) * 1._m;                               // m in COCOA, cm in DB
-  errm(0, 1) = GetEntryError(theCoordinateEntryVector[0], theCoordinateEntryVector[1]) * 1._m;  // m in COCOA, cm in DB
-  errm(0, 2) = GetEntryError(theCoordinateEntryVector[0], theCoordinateEntryVector[2]) * 1._m;  // m in COCOA, cm in DB
-  errm(1, 2) = GetEntryError(theCoordinateEntryVector[1], theCoordinateEntryVector[2]) * 1._m;  // m in COCOA, cm in DB
+  errm(0, 0) = GetEntryError(theCoordinateEntryVector[0]) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
+  errm(1, 1) = GetEntryError(theCoordinateEntryVector[1]) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
+  errm(2, 2) = GetEntryError(theCoordinateEntryVector[2]) * dd4hep::m;  // m in COCOA, dd4hep unit in DB
+  errm(0, 1) = GetEntryError(theCoordinateEntryVector[0], theCoordinateEntryVector[1]) *
+               dd4hep::m;  // m in COCOA, dd4hep unit in DB
+  errm(0, 2) = GetEntryError(theCoordinateEntryVector[0], theCoordinateEntryVector[2]) *
+               dd4hep::m;  // m in COCOA, dd4hep unit in DB
+  errm(1, 2) = GetEntryError(theCoordinateEntryVector[1], theCoordinateEntryVector[2]) *
+               dd4hep::m;  // m in COCOA, dd4hep unit in DB
   //   errm(1,0) = errm(0,1);
   // errm(2,0) = errm(0,2);
   // errm(2,1) = errm(1,2);

Alignment/CommonAlignment/plugins/APVModeFilter.cc

@@ -42,7 +42,6 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
@@ -74,6 +73,9 @@ class APVModeFilter : public edm::stream::EDFilter<> {
 
   // ----------member data ---------------------------
 
+  // esConsumes
+  const edm::ESGetToken<SiStripLatency, SiStripLatencyRcd> latencyToken_;
+
   /// bits of interest for the APV mode
   static constexpr std::array<size_t, 2> bits_ = {{1, 3}};
   static constexpr BitMask deco_ = BitMask(0);   /// deco mode bit mask (0000)
@@ -96,7 +98,8 @@ constexpr APVModeFilter::BitMask APVModeFilter::multi_;
 // constructors and destructor
 //
 APVModeFilter::APVModeFilter(const edm::ParameterSet& iConfig)
-    : mode_(convertMode(iConfig.getUntrackedParameter<std::string>("apvMode"))) {
+    : latencyToken_(esConsumes<edm::Transition::BeginRun>()),
+      mode_(convertMode(iConfig.getUntrackedParameter<std::string>("apvMode"))) {
   edm::LogInfo("Alignment") << "@SUB=APVModeFilter::APVModeFilter"
                             << "Selecting events with APV mode '"
                             << iConfig.getUntrackedParameter<std::string>("apvMode") << "'.";
@@ -111,10 +114,8 @@ bool APVModeFilter::filter(edm::Event&, const edm::EventSetup&) { return mode_ =
 
 // ------------ method called when starting to processes a run  ------------
 void APVModeFilter::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
-  edm::ESHandle<SiStripLatency> siStripLatency;
-  iSetup.get<SiStripLatencyRcd>().get(siStripLatency);
-  auto product = siStripLatency.product();
-  modeCurrentRun_ = convertMode(product->singleMode());
+  const auto& siStripLatency = &iSetup.getData(latencyToken_);
+  modeCurrentRun_ = convertMode(siStripLatency->singleMode());
 }
 
 APVModeFilter::BitMask APVModeFilter::convertMode(const std::string& mode) const {

Alignment/CommonAlignment/plugins/MagneticFieldFilter.cc

@@ -27,7 +27,6 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
@@ -52,6 +51,10 @@ class MagneticFieldFilter : public edm::stream::EDFilter<> {
   float currentToField(const float& current) const;
 
   // ----------member data ---------------------------
+
+  // esConsumes
+  const edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
+
   /// see: https://hypernews.cern.ch/HyperNews/CMS/get/magnetic-field/63/1/1/1.html
   static constexpr float linearCoeffCurrentToField_ = 2.084287e-04;
   /// see: https://hypernews.cern.ch/HyperNews/CMS/get/magnetic-field/63/1/1/1.html
@@ -71,7 +74,9 @@ constexpr float MagneticFieldFilter::constantTermCurrentToField_;
 // constructor
 //
 MagneticFieldFilter::MagneticFieldFilter(const edm::ParameterSet& iConfig)
-    : magneticField_(iConfig.getUntrackedParameter<int>("magneticField")), magneticFieldCurrentRun_(-10000) {}
+    : runInfoToken_(esConsumes<edm::Transition::BeginRun>()),
+      magneticField_(iConfig.getUntrackedParameter<int>("magneticField")),
+      magneticFieldCurrentRun_(-10000) {}
 
 //
 // member functions
@@ -85,9 +90,7 @@ bool MagneticFieldFilter::filter(edm::Event&, const edm::EventSetup&) {
 // ------------ method called when starting to processes a run  ------------
 
 void MagneticFieldFilter::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
-  edm::ESHandle<RunInfo> sum;
-  iSetup.get<RunInfoRcd>().get(sum);
-  auto summary = sum.product();
+  const auto& summary = &iSetup.getData(runInfoToken_);
   // convert from Tesla to kGauss (multiply with 10) and
   // round off to whole kGauss (add 0.5 and cast to int) as is done in
   // 'MagneticField::computeNominalValue()':

Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h

@@ -2,9 +2,8 @@
 #define LhcTrackAnalyzer_h
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -51,7 +50,7 @@
 // class decleration
 //
 
-class LhcTrackAnalyzer : public edm::EDAnalyzer {
+class LhcTrackAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit LhcTrackAnalyzer(const edm::ParameterSet&);
   ~LhcTrackAnalyzer() override;