Merge pull request #36147 from hyunyong/MuonAlignment_ASAN_bug_fix

MuonAlignment ASAN bug fix
cms-sw · Nov 24, 2021 · ad0c327 · ad0c327
2 parents 0e2c382 + f7b1887
commit ad0c327
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h b/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h
@@ -41,10 +41,10 @@ class MuonAlignmentInputDB : public MuonAlignmentInputMethod {
                        const Alignments* dtAlignments,
                        const Alignments* cscAlignments,
                        const Alignments* gemAlignments,
-                       const Alignments* globalPositionRcd,
                        const AlignmentErrorsExtended* dtAlignmentErrorsExtended,
                        const AlignmentErrorsExtended* cscAlignmentErrorsExtended,
-                       const AlignmentErrorsExtended* gemAlignmentErrorsExtended);
+                       const AlignmentErrorsExtended* gemAlignmentErrorsExtended,
+                       const Alignments* globalPositionRcd);
   ~MuonAlignmentInputDB() override;
 
   // ---------- const member functions ---------------------
@@ -67,10 +67,10 @@ class MuonAlignmentInputDB : public MuonAlignmentInputMethod {
   const Alignments* dtAlignments_;
   const Alignments* cscAlignments_;
   const Alignments* gemAlignments_;
-  const Alignments* globalPositionRcd_;
   const AlignmentErrorsExtended* dtAlignmentErrorsExtended_;
   const AlignmentErrorsExtended* cscAlignmentErrorsExtended_;
   const AlignmentErrorsExtended* gemAlignmentErrorsExtended_;
+  const Alignments* globalPositionRcd_;
 
   const bool m_getAPEs;
 };

diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc
@@ -56,7 +56,7 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> {
   bool m_done;
   std::string m_input, m_output;
 
-  std::string m_dtLabel, m_cscLabel, m_gemLabel;
+  std::string m_dtLabel, m_cscLabel, m_gemLabel, m_dtAPELabel, m_cscAPELabel, m_gemAPELabel;
   double m_shiftErr, m_angleErr;
   std::string m_fileName;
   bool m_getAPEs;
@@ -76,6 +76,11 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> {
   edm::ESGetToken<Alignments, DTAlignmentRcd> dtAliToken_;
   edm::ESGetToken<Alignments, CSCAlignmentRcd> cscAliToken_;
   edm::ESGetToken<Alignments, GEMAlignmentRcd> gemAliToken_;
+
+  edm::ESGetToken<AlignmentErrorsExtended, DTAlignmentErrorExtendedRcd> dtAPEToken_;
+  edm::ESGetToken<AlignmentErrorsExtended, CSCAlignmentErrorExtendedRcd> cscAPEToken_;
+  edm::ESGetToken<AlignmentErrorsExtended, GEMAlignmentErrorExtendedRcd> gemAPEToken_;
+
   const edm::ESGetToken<Alignments, GlobalPositionRcd> gprToken_;
 };
 
@@ -116,6 +121,9 @@ MuonGeometryDBConverter::MuonGeometryDBConverter(const edm::ParameterSet &iConfi
     m_dtLabel = iConfig.getParameter<std::string>("dtLabel");
     m_cscLabel = iConfig.getParameter<std::string>("cscLabel");
     m_gemLabel = iConfig.getParameter<std::string>("gemLabel");
+    m_dtAPELabel = iConfig.getParameter<std::string>("dtAPELabel");
+    m_cscAPELabel = iConfig.getParameter<std::string>("cscAPELabel");
+    m_gemAPELabel = iConfig.getParameter<std::string>("gemAPELabel");
     m_shiftErr = iConfig.getParameter<double>("shiftErr");
     m_angleErr = iConfig.getParameter<double>("angleErr");
     m_getAPEs = iConfig.getParameter<bool>("getAPEs");
@@ -125,6 +133,10 @@ MuonGeometryDBConverter::MuonGeometryDBConverter(const edm::ParameterSet &iConfi
     cscAliToken_ = esConsumes(edm::ESInputTag("", m_cscLabel));
     gemAliToken_ = esConsumes(edm::ESInputTag("", m_gemLabel));
 
+    dtAPEToken_ = esConsumes(edm::ESInputTag("", m_dtAPELabel));
+    cscAPEToken_ = esConsumes(edm::ESInputTag("", m_cscAPELabel));
+    gemAPEToken_ = esConsumes(edm::ESInputTag("", m_gemAPELabel));
+
     dtGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML));
     cscGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML));
     gemGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML));
@@ -173,6 +185,9 @@ void MuonGeometryDBConverter::analyze(const edm::Event &iEvent, const edm::Event
                                        &iSetup.getData(dtAliToken_),
                                        &iSetup.getData(cscAliToken_),
                                        &iSetup.getData(gemAliToken_),
+                                       &iSetup.getData(dtAPEToken_),
+                                       &iSetup.getData(cscAPEToken_),
+                                       &iSetup.getData(gemAPEToken_),
                                        &iSetup.getData(gprToken_));
       MuonAlignment *muonAlignment = new MuonAlignment(iSetup, inputMethod);
       if (m_getAPEs) {
@@ -216,6 +231,9 @@ void MuonGeometryDBConverter::fillDescriptions(edm::ConfigurationDescriptions &d
   desc.add<std::string>("dtLabel", "");
   desc.add<std::string>("cscLabel", "");
   desc.add<std::string>("gemLabel", "");
+  desc.add<std::string>("dtAPELabel", "");
+  desc.add<std::string>("cscAPELabel", "");
+  desc.add<std::string>("gemAPELabel", "");
   desc.add<double>("shiftErr", 1000.0);
   desc.add<double>("angleErr", 6.28);
   desc.add<bool>("getAPEs", true);

diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc
@@ -58,20 +58,20 @@ MuonAlignmentInputDB::MuonAlignmentInputDB(const DTGeometry* dtGeometry,
                                            const Alignments* dtAlignments,
                                            const Alignments* cscAlignments,
                                            const Alignments* gemAlignments,
-                                           const Alignments* globalPositionRcd,
                                            const AlignmentErrorsExtended* dtAlignmentErrorsExtended,
                                            const AlignmentErrorsExtended* cscAlignmentErrorsExtended,
-                                           const AlignmentErrorsExtended* gemAlignmentErrorsExtended)
+                                           const AlignmentErrorsExtended* gemAlignmentErrorsExtended,
+                                           const Alignments* globalPositionRcd)
     : dtGeometry_(dtGeometry),
       cscGeometry_(cscGeometry),
       gemGeometry_(gemGeometry),
       dtAlignments_(dtAlignments),
       cscAlignments_(cscAlignments),
       gemAlignments_(gemAlignments),
-      globalPositionRcd_(globalPositionRcd),
       dtAlignmentErrorsExtended_(dtAlignmentErrorsExtended),
       cscAlignmentErrorsExtended_(cscAlignmentErrorsExtended),
       gemAlignmentErrorsExtended_(gemAlignmentErrorsExtended),
+      globalPositionRcd_(globalPositionRcd),
       m_getAPEs(true) {}
 
 // MuonAlignmentInputDB::MuonAlignmentInputDB(const MuonAlignmentInputDB& rhs)