cms-sw · VinInn · Sep 25, 2021 · Sep 29, 2021 · Sep 30, 2021 · Sep 30, 2021
diff --git a/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py b/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py
@@ -130,6 +130,7 @@ def getSequence(process, collection,
                 "minimumHits": 10,
                 })
     elif collection in ("ALCARECOTkAlCosmicsCTF0T",
+                        "ALCARECOTkAlCosmicsCosmicTF0T",
                         "ALCARECOTkAlCosmicsInCollisions"):
         isCosmics = True
         options["TrackSelector"]["HighPurity"] = {} # drop high purity cut
@@ -336,7 +337,7 @@ def getSequence(process, collection,
                                   **(mod[2])), src
         modules.append(getattr(process, src))
     else:
-        if mods[-1][-1]["method"] is "load" and \
+        if mods[-1][-1]["method"] == "load" and \
                 not mods[-1][-1].get("clone", False):
             print("Name of the last module needs to be modifiable.")
             sys.exit(1)

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
@@ -51,6 +51,7 @@ class AlignmentMonitorMuonSystemMap1D : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -155,6 +156,7 @@ AlignmentMonitorMuonSystemMap1D::AlignmentMonitorMuonSystemMap1D(const edm::Para
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_maxTrackPt(cfg.getParameter<double>("maxTrackPt")),
@@ -271,6 +273,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -287,7 +290,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
           m_counter_trackdxy++;
 
           MuonResidualsFromTrack muonResidualsFromTrack(
-              iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+              builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
           processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent);
         }
       }  // end if track has acceptable momentum

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
@@ -49,6 +49,7 @@ class AlignmentMonitorMuonVsCurvature : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -88,6 +89,7 @@ AlignmentMonitorMuonVsCurvature::AlignmentMonitorMuonVsCurvature(const edm::Para
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_minTrackP(cfg.getParameter<double>("minTrackP")),
@@ -201,6 +203,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -211,7 +214,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
 
       if (track->pt() > m_minTrackPt && track->p() > m_minTrackP && fabs(track->dxy(beamSpot->position())) < m_maxDxy) {
         MuonResidualsFromTrack muonResidualsFromTrack(
-            iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+            builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack, traj);
       }  // end if track pT is within range
     }    // end loop over tracks

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
@@ -49,6 +49,7 @@ class AlignmentMonitorSegmentDifferences : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -121,6 +122,7 @@ AlignmentMonitorSegmentDifferences::AlignmentMonitorSegmentDifferences(const edm
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_minTrackP(cfg.getParameter<double>("minTrackP")),
@@ -376,6 +378,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -386,7 +389,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
 
       if (track->pt() > m_minTrackPt && track->p() > m_minTrackP && fabs(track->dxy(beamSpot->position())) < m_maxDxy) {
         MuonResidualsFromTrack muonResidualsFromTrack(
-            iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+            builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack);
       }
     }  // end loop over tracks

diff --git a/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc b/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc
@@ -26,6 +26,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 // products
@@ -105,7 +106,8 @@ TrackerToMuonPropagator::TrackerToMuonPropagator(const edm::ParameterSet& iConfi
   m_globalMuonTracks = iConfig.getParameter<edm::InputTag>("globalMuonTracks");
   m_refitTracker = iConfig.getParameter<bool>("refitTrackerTrack");
   if (m_refitTracker) {
-    m_trackTransformer = new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("trackerTrackTransformer"));
+    m_trackTransformer =
+        new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("trackerTrackTransformer"), consumesCollector());
   } else
     m_trackTransformer = nullptr;
 

diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc
@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
 
 // the following include is necessary to clone all track branches
@@ -37,6 +37,6 @@ struct CSCBeamHaloConfigSelector {
   AlignmentCSCBeamHaloSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
+typedef ObjectSelector<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCBeamHaloSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc
@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
 
 // the following include is necessary to clone all track branches
@@ -35,6 +35,6 @@ struct CSCOverlapConfigSelector {
   AlignmentCSCOverlapSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
+typedef ObjectSelector<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCOverlapSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc
@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h"
@@ -39,6 +39,6 @@ struct CSCTrackConfigSelector {
   AlignmentCSCTrackSelector theBaseSelector;
 };
 
-typedef ObjectSelectorStream<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
+typedef ObjectSelector<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCTrackSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc
@@ -14,7 +14,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
@@ -48,6 +48,6 @@ struct MuonConfigSelector {
   AlignmentMuonSelector theSelector;
 };
 
-typedef ObjectSelectorStream<MuonConfigSelector> AlignmentMuonSelectorModule;
+typedef ObjectSelector<MuonConfigSelector> AlignmentMuonSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentMuonSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h"
@@ -60,6 +60,6 @@ struct TrackConfigSelector {
   AlignmentTwoBodyDecayTrackSelector theTwoBodyDecaySelector;
 };
 
-typedef ObjectSelectorStream<TrackConfigSelector> AlignmentTrackSelectorModule;
+typedef ObjectSelector<TrackConfigSelector> AlignmentTrackSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentTrackSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentTracksFromVertexSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentTracksFromVertexSelectorModule.cc
@@ -1,6 +1,6 @@
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentTracksFromVertexSelector.h"
@@ -32,10 +32,10 @@ struct TrackFromVertexConfigSelector {
   AlignmentTrackFromVertexSelector theBaseSelector;
 };
 
-class AlignmentTrackFromVertexSelectorModule : public ObjectSelectorStream<TrackFromVertexConfigSelector> {
+class AlignmentTrackFromVertexSelectorModule : public ObjectSelector<TrackFromVertexConfigSelector> {
 public:
   AlignmentTrackFromVertexSelectorModule(const edm::ParameterSet &ps)
-      : ObjectSelectorStream<TrackFromVertexConfigSelector>(ps) {}
+      : ObjectSelector<TrackFromVertexConfigSelector>(ps) {}
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
     edm::ParameterSetDescription desc;
     desc.setComment("Alignment Tracks Selector from Vertices");

diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc
@@ -93,6 +93,11 @@ MillePedeAlignmentAlgorithm::MillePedeAlignmentAlgorithm(const edm::ParameterSet
       theDir(theConfig.getUntrackedParameter<std::string>("fileDir")),
       theAlignmentParameterStore(nullptr),
       theAlignables(),
+      theTrajectoryFactory(
+          TrajectoryFactoryPlugin::get()->create(theConfig.getParameter<edm::ParameterSet>("TrajectoryFactory")
+                                                     .getParameter<std::string>("TrajectoryFactoryName"),
+                                                 theConfig.getParameter<edm::ParameterSet>("TrajectoryFactory"),
+                                                 iC)),
       theMinNumHits(cfg.getParameter<unsigned int>("minNumHits")),
       theMaximalCor2D(cfg.getParameter<double>("max2Dcorrelation")),
       firstIOV_(cfg.getUntrackedParameter<AlignmentAlgorithmBase::RunNumber>("firstIOV")),
@@ -273,9 +278,6 @@ void MillePedeAlignmentAlgorithm::initialize(const edm::EventSetup &setup,
       theMonitor = std::make_unique<MillePedeMonitor>(tTopo, (theDir + moniFile).c_str());
 
     // Get trajectory factory. In case nothing found, FrameWork will throw...
-    const edm::ParameterSet fctCfg(theConfig.getParameter<edm::ParameterSet>("TrajectoryFactory"));
-    const std::string fctName(fctCfg.getParameter<std::string>("TrajectoryFactoryName"));
-    theTrajectoryFactory = TrajectoryFactoryPlugin::get()->create(fctName, fctCfg);
   }
 
   if (this->isMode(myPedeSteerBit)) {

diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/mpsvalidate/bigModule.py b/Alignment/MillePedeAlignmentAlgorithm/python/mpsvalidate/bigModule.py
@@ -106,20 +106,20 @@ def plot(MillePedeUser, alignables, config):
             for i in range(3):
                 # get first and last bin with content and chose the one which
                 # has a greater distance to the center
-                if (abs(numberOfBins / 2 - plot.histo[i].FindFirstBinAbove()) > abs(plot.histo[i].FindLastBinAbove() - numberOfBins / 2)):
+                if (abs(numberOfBins // 2 - plot.histo[i].FindFirstBinAbove()) > abs(plot.histo[i].FindLastBinAbove() - numberOfBins // 2)):
                     plot.maxBinShift[i] = abs(
-                        numberOfBins / 2 - plot.histo[i].FindFirstBinAbove())
+                        numberOfBins // 2 - plot.histo[i].FindFirstBinAbove())
                     # set the maxShift value
                     plot.maxShift[i] = plot.histo[i].GetBinCenter(
                         plot.histo[i].FindFirstBinAbove())
                 else:
                     plot.maxBinShift[i] = abs(
-                        plot.histo[i].FindLastBinAbove() - numberOfBins / 2)
+                        plot.histo[i].FindLastBinAbove() - numberOfBins // 2)
                     # set the maxShift value
                     plot.maxShift[i] = plot.histo[i].GetBinCenter(
                         plot.histo[i].FindLastBinAbove())
                 # skip empty histogram
-                if (abs(plot.maxBinShift[i]) == numberOfBins / 2 + 1):
+                if (abs(plot.maxBinShift[i]) == numberOfBins // 2 + 1):
                     plot.maxBinShift[i] = 0
 
             # three types of ranges
@@ -179,10 +179,10 @@ def plot(MillePedeUser, alignables, config):
             # count entries which are not shown anymore
             for i in range(3):
                 # bin 1 to begin of histogram
-                for j in range(1, numberOfBins / 2 - plot.binShift[i]):
+                for j in range(1, numberOfBins // 2 - plot.binShift[i]):
                     plot.hiddenEntries[i] += plot.histo[i].GetBinContent(j)
                 # from the end of shown bins to the end of histogram
-                for j in range(numberOfBins / 2 + plot.binShift[i], plot.histo[i].GetNbinsX()):
+                for j in range(numberOfBins // 2 + plot.binShift[i], plot.histo[i].GetNbinsX()):
                     plot.hiddenEntries[i] += plot.histo[i].GetBinContent(j)
 
             # apply new range