Modernized HLTMuonPointingFilter #30987

Dr15Jones · 2020-07-30T18:01:40Z

PR description:

converted from legacy to global module
added ESGetTokens

This is part of #25090

PR validation:

The code compiles.

cmsbuild · 2020-07-30T18:02:05Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-07-30T18:08:04Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30987/17438

This PR adds an extra 16KB to repository

cmsbuild · 2020-07-30T18:08:24Z

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

HLTrigger/special

@cmsbuild, @Martin-Grunewald, @fwyzard can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

Dr15Jones · 2020-07-30T18:09:10Z

please test

cmsbuild · 2020-07-30T18:09:33Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-07-30-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/8439/console Started: 2020/07/30 20:15

fwyzard · 2020-07-30T19:09:39Z

@Dr15Jones thanks for taking care of this.

If I'm not mistaken, after your changes the only non-const data members are thePropagator and m_cacheRecordId.
Since Propagator::propagate() is const, I think we can use the propagator returned by the EventSetup directly, without making a copy.
Then the module could become global instead of stream ?

cmsbuild · 2020-07-30T19:31:46Z

+1
Tested at: 8a13a22
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8439/summary.html
CMSSW: CMSSW_11_2_X_2020-07-30-1100
SCRAM_ARCH: slc7_amd64_gcc820

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

added esConsumes to modules in RecoEgamma/ElectronIdentification #30962 @JamminJones: added esConsumes to modules in RecoEgamma/ElectronIdentification

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8439/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8439/git-merge-result

cmsbuild · 2020-07-30T19:31:49Z

Comparison job queued.

Dr15Jones · 2020-07-30T19:33:48Z

Since Propagator::propagate() is const, I think we can use the propagator returned by the EventSetup directly, without making a copy.

@fwyzard thanks for the suggestion. My ownly worry is are we actually sure that all the classes inheriting from Propagator are actually thread-safe? For example,
https://github.com/cms-sw/cmssw/blob/master/TrackPropagation/Geant4e/interface/Geant4ePropagator.h

looks problematic to me as it has non-const pointers as member data.

Dr15Jones · 2020-07-30T19:36:04Z

Ultimately I'm not the person who has to maintain the code so I'll happily convert it to global if you want.

fwyzard · 2020-07-30T19:46:14Z

@Martin-Grunewald what do you prefer ?

Dr15Jones · 2020-07-30T20:37:25Z

@makortel is of the opinion that Propagator is const thread safe and the clone is used to allowing calling the non-const interface.

cmsbuild · 2020-07-30T20:55:08Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8439/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2525444
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2525390
DQMHistoTests: Total skipped: 47
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 144 log files, 17 edm output root files, 34 DQM output files

fwyzard · 2020-07-30T21:11:55Z

So... does the fact that the module compiles with a const propagator means that it only uses the thread safe part of the interface ?

diff --git a/HLTrigger/special/plugins/HLTMuonPointingFilter.cc b/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
index edb68ca4336..b70aecbb737 100644
--- a/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
+++ b/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
@@ -44,9 +44,7 @@ HLTMuonPointingFilter::HLTMuonPointingFilter(const edm::ParameterSet& pset)
       // Get a surface (here a cylinder of radius 1290mm) ECAL
       theCyl(Cylinder::build(theRadius, Cylinder::PositionType{}, Cylinder::RotationType{})),
       thePosPlane(Plane::build(Plane::PositionType{0, 0, static_cast<float>(theMaxZ)}, Plane::RotationType{})),
-      theNegPlane(Plane::build(Plane::PositionType{0, 0, static_cast<float>(-theMaxZ)}, Plane::RotationType{})),
-      thePropagator(nullptr),
-      m_cacheRecordId(0) {
+      theNegPlane(Plane::build(Plane::PositionType{0, 0, static_cast<float>(-theMaxZ)}, Plane::RotationType{})) {
   LogDebug("HLTMuonPointing") << " SALabel : " << pset.getParameter<edm::InputTag>("SALabel")
                               << " Radius : " << theRadius << " Half lenght : " << theMaxZ
                               << " Min pixel hits : " << thePixHits << " Min tk layers measurements : " << theTkLayers
@@ -61,15 +59,12 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
   bool accept = false;
 
   const TrackingComponentsRecord& tkRec = eventSetup.get<TrackingComponentsRecord>();
-  if (not thePropagator or tkRec.cacheIdentifier() != m_cacheRecordId) {
-    // get the new propagator from the EventSetup and clone it (for thread safety)
-    ESHandle<Propagator> propagatorHandle = tkRec.getHandle(thePropagatorToken);
-    thePropagator.reset(propagatorHandle.product()->clone());
-    if (thePropagator->propagationDirection() != anyDirection)
-      throw cms::Exception("Configuration")
-          << "the propagator " << thePropagatorName
-          << " should be configured with PropagationDirection = \"anyDirection\"" << std::endl;
-    m_cacheRecordId = tkRec.cacheIdentifier();
+  ESHandle<Propagator> propagatorHandle = tkRec.getHandle(thePropagatorToken);
+  Propagator const& propagator = *propagatorHandle.product();
+  if (propagator.propagationDirection() != anyDirection) {
+    throw cms::Exception("Configuration")
+        << "the propagator " << thePropagatorName
+        << " should be configured with PropagationDirection = \"anyDirection\"" << std::endl;
   }
 
   ESHandle<MagneticField> theMGField = eventSetup.getHandle(theMGFieldToken);
@@ -95,7 +90,7 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
 
     LogDebug("HLTMuonPointing") << " InnerTSOS " << innerTSOS;
 
-    TrajectoryStateOnSurface tsosAtCyl = thePropagator->propagate(*innerTSOS.freeState(), *theCyl);
+    TrajectoryStateOnSurface tsosAtCyl = propagator.propagate(*innerTSOS.freeState(), *theCyl);
 
     if (tsosAtCyl.isValid()) {
       LogDebug("HLTMuonPointing") << " extrap TSOS " << tsosAtCyl << " number of pixel hits " << pixelHits
@@ -117,9 +112,9 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
                                     << " number of muon hits " << nMuonHits;
         TrajectoryStateOnSurface tsosAtPlane;
         if (tsosAtCyl.globalPosition().z() > 0)
-          tsosAtPlane = thePropagator->propagate(*innerTSOS.freeState(), *thePosPlane);
+          tsosAtPlane = propagator.propagate(*innerTSOS.freeState(), *thePosPlane);
         else
-          tsosAtPlane = thePropagator->propagate(*innerTSOS.freeState(), *theNegPlane);
+          tsosAtPlane = propagator.propagate(*innerTSOS.freeState(), *theNegPlane);
 
         if (tsosAtPlane.isValid()) {
           if (tsosAtPlane.globalPosition().perp() < theRadius) {
diff --git a/HLTrigger/special/plugins/HLTMuonPointingFilter.h b/HLTrigger/special/plugins/HLTMuonPointingFilter.h
index 5c9ab21997d..ab8d54a2c27 100644
--- a/HLTrigger/special/plugins/HLTMuonPointingFilter.h
+++ b/HLTrigger/special/plugins/HLTMuonPointingFilter.h
@@ -67,8 +67,5 @@ private:
   const Cylinder::CylinderPointer theCyl;
   const Plane::PlanePointer thePosPlane;
   const Plane::PlanePointer theNegPlane;
-
-  std::unique_ptr<Propagator> thePropagator;
-  unsigned long long m_cacheRecordId;
 };
 #endif  // Muon_HLTMuonPointingFilter_h

Dr15Jones · 2020-07-30T21:27:59Z

So... does the fact that the module compiles with a const propagator means that it only uses the thread safe part of the interface ?

That is the thought.

cmsbuild · 2020-07-31T16:37:59Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-07-31T16:43:34Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30987/17484

This PR adds an extra 16KB to repository

cmsbuild · 2020-07-31T16:43:54Z

Pull request #30987 was updated. @cmsbuild, @Martin-Grunewald, @fwyzard can you please check and sign again.

Dr15Jones · 2020-07-31T16:44:50Z

please test

cmsbuild · 2020-07-31T16:45:13Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-07-31-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/8479/console Started: 2020/07/31 18:51

cmsbuild · 2020-07-31T18:02:01Z

+1
Tested at: fe9be5e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8479/summary.html
CMSSW: CMSSW_11_2_X_2020-07-31-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-07-31T18:02:04Z

Comparison job queued.

cmsbuild · 2020-07-31T19:26:12Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a6bc4d/8479/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 2 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2525448
DQMHistoTests: Total failures: 5
DQMHistoTests: Total nulls: 1
DQMHistoTests: Total successes: 2525395
DQMHistoTests: Total skipped: 47
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.004 KiB( 33 files compared)
DQMHistoSizes: changed ( 10224.0 ): 0.004 KiB MessageLogger/Warnings
Checked 144 log files, 17 edm output root files, 34 DQM output files

Martin-Grunewald · 2020-08-02T05:59:33Z

+1

cmsbuild · 2020-08-02T06:00:00Z

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

silviodonato · 2020-08-03T08:01:40Z

+1

cmsbuild added this to the CMSSW_11_2_X milestone Jul 30, 2020

cmsbuild added code-checks-pending comparison-pending hlt-pending orp-pending pending-signatures tests-pending labels Jul 30, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 30, 2020

cmsbuild added tests-started and removed tests-pending labels Jul 30, 2020

cmsbuild added tests-approved and removed tests-started labels Jul 30, 2020

cmsbuild added comparison-available and removed comparison-pending labels Jul 30, 2020

cmsbuild added comparison-pending tests-pending labels Jul 31, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 31, 2020

cmsbuild added tests-started and removed tests-pending labels Jul 31, 2020

cmsbuild added tests-approved and removed tests-started labels Jul 31, 2020

cmsbuild added comparison-available and removed comparison-pending labels Jul 31, 2020

cmsbuild added fully-signed hlt-approved and removed hlt-pending pending-signatures labels Aug 2, 2020

cmsbuild added orp-approved and removed orp-pending labels Aug 3, 2020

cmsbuild merged commit c3cdff8 into cms-sw:master Aug 3, 2020

Dr15Jones deleted the modernizeHLTMuonPointingFilter branch August 4, 2020 13:17

missirol mentioned this pull request Nov 11, 2021

Modules prohibiting concurrent lumis in RelVal workflows #25090

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modernized HLTMuonPointingFilter #30987

Modernized HLTMuonPointingFilter #30987

Dr15Jones commented Jul 30, 2020 •

edited

Loading

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 30, 2020 •

edited

Loading

fwyzard commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

fwyzard commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

fwyzard commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

Dr15Jones commented Jul 31, 2020

cmsbuild commented Jul 31, 2020 •

edited

Loading

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

Martin-Grunewald commented Aug 2, 2020

cmsbuild commented Aug 2, 2020

silviodonato commented Aug 3, 2020

Modernized HLTMuonPointingFilter #30987

Modernized HLTMuonPointingFilter #30987

Conversation

Dr15Jones commented Jul 30, 2020 • edited Loading

PR description:

PR validation:

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 30, 2020 • edited Loading

fwyzard commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

fwyzard commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 30, 2020

fwyzard commented Jul 30, 2020

Dr15Jones commented Jul 30, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

Dr15Jones commented Jul 31, 2020

cmsbuild commented Jul 31, 2020 • edited Loading

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

cmsbuild commented Jul 31, 2020

Martin-Grunewald commented Aug 2, 2020

cmsbuild commented Aug 2, 2020

silviodonato commented Aug 3, 2020

Dr15Jones commented Jul 30, 2020 •

edited

Loading

cmsbuild commented Jul 30, 2020 •

edited

Loading

cmsbuild commented Jul 31, 2020 •

edited

Loading