Merge pull request #34542 from hyunyong/esConsumes_MuAl_PR_CMSSW_12_0…

…_X_2021-07-13-1100 Migrate to esConsumes AlignmentProducerAsAnalyzer and MuonMillepedeTrackRefitter modules
cms-sw · Jul 26, 2021 · 4bbdac2 · 4bbdac2
2 parents 49cd0eb + 4f0b143
commit 4bbdac2
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 1,500 deletions.
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
@@ -248,7 +248,6 @@ class AlignmentProducerBase {
   const bool saveToDB_, saveApeToDB_, saveDeformationsToDB_;
   const bool useSurvey_;
   const bool enableAlignableUpdates_;
-  std::string idealGeometryLabel;
 
   /*** ESTokens ***/
   const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;

diff --git a/Alignment/CommonAlignmentProducer/python/AlignmentProducerAsAnalyzer_cff.py b/Alignment/CommonAlignmentProducer/python/AlignmentProducerAsAnalyzer_cff.py
@@ -76,28 +76,12 @@
                     # update alignables if triggered by corresponding input IOV boundary
                     enableAlignableUpdates = cms.bool(False),
                     )
-DTGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("DTGeometryESModule",
-    appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
-    applyAlignment = cms.bool(False), 
-    alignmentsLabel = cms.string(''),
-    fromDDD = cms.bool(True)
-)
-CSCGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("CSCGeometryESModule",
-    appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
-    debugV = cms.untracked.bool(False),
-    useGangedStripsInME1a = cms.bool(False),
-    alignmentsLabel = cms.string(''),
-    useOnlyWiresInME1a = cms.bool(False),
-    useRealWireGeometry = cms.bool(True),
-    useCentreTIOffsets = cms.bool(False),
-    applyAlignment = cms.bool(False), 
-    fromDDD = cms.bool(True),
-    fromDD4hep = cms.bool(False)
-)
-GEMGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("GEMGeometryESModule",
-    appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
-    applyAlignment = cms.bool(False),
-    alignmentsLabel = cms.string(''),
-    fromDDD = cms.bool(True),
-    fromDD4Hep = cms.bool(False)
-)
+import Geometry.DTGeometryBuilder.dtGeometryDB_cfi
+DTGeometryAlignmentProducerAsAnalyzer = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
+DTGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
+import Geometry.CSCGeometryBuilder.cscGeometryDB_cfi
+CSCGeometryAlignmentProducerAsAnalyzer = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
+CSCGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
+import   Geometry.GEMGeometryBuilder.gemGeometryDB_cfi
+GEMGeometryAlignmentProducerAsAnalyzer = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
+GEMGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
@@ -47,13 +47,12 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed
       saveDeformationsToDB_{config.getParameter<bool>("saveDeformationsToDB")},
       useSurvey_{config.getParameter<bool>("useSurvey")},
       enableAlignableUpdates_{config.getParameter<bool>("enableAlignableUpdates")},
-      idealGeometryLabel("idealForAlignmentProducerBase"),
       ttopoToken_(iC.esConsumes<edm::Transition::BeginRun>()),
       geomDetToken_(iC.esConsumes<edm::Transition::BeginRun>()),
       ptpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
-      //dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
-      //cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
-      //gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
+      dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
+      cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
+      gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
       tkAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
       dtAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
       cscAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
@@ -436,12 +435,9 @@ void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, cons
   }
 
   if (doMuon_) {
-    iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonDTGeometry_);
-    iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonCSCGeometry_);
-    iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonGEMGeometry_);
-    //muonDTGeometry_ = iSetup.getHandle(dtGeomToken_);
-    //muonCSCGeometry_ = iSetup.getHandle(cscGeomToken_);
-    //muonGEMGeometry_ = iSetup.getHandle(gemGeomToken_);
+    muonDTGeometry_ = iSetup.getHandle(dtGeomToken_);
+    muonCSCGeometry_ = iSetup.getHandle(cscGeomToken_);
+    muonGEMGeometry_ = iSetup.getHandle(gemGeomToken_);
   }
 }
 

diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml b/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml
@@ -53,21 +53,3 @@
   <use name="root"/>
   <flags EDM_PLUGIN="1"/>
 </library>
-
-<library name="MuonMillepedeAlgorithm" file="MuonMillepedeAlgorithm.cc,MuonMillepedeTrackRefitter.cc">
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
-  <use name="MagneticField/Engine"/>
-  <use name="MagneticField/Records"/>
-  <use name="DataFormats/GeometrySurface"/>
-  <use name="DataFormats/MuonDetId"/>
-  <use name="DataFormats/TrackReco"/>
-  <use name="TrackingTools/PatternTools"/>
-  <use name="TrackingTools/TransientTrack"/>
-  <use name="RecoMuon/TransientTrackingRecHit"/>
-  <use name="Alignment/CommonAlignment"/>
-  <use name="Alignment/CommonAlignmentAlgorithm"/>
-  <use name="Alignment/MuonAlignment"/>
-  <use name="CommonTools/UtilAlgos"/>
-  <use name="clhep"/>
-  <flags EDM_PLUGIN="1"/>
-</library>