Implement Phase 2 Muon HLT validation #46860
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cms-bot internal usage |
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46860/42890 |
|
A new Pull Request was created by @Parsifal-2045 for master. It involves the following packages:
@Martin-Grunewald, @antoniovagnerini, @civanch, @cmsbuild, @kpedro88, @mdhildreth, @mmusich, @rseidita can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
mmusich
reviewed
Dec 4, 2024
cmsbuild
added
operations-pending
code-checks-pending
and removed
hlt-rejected
code-checks-approved
labels
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46860/42892
|
|
Pull request #46860 was updated. @antoniovagnerini, @antoniovilela, @civanch, @cmsbuild, @davidlange6, @fabiocos, @kpedro88, @mandrenguyen, @mdhildreth, @rappoccio, @rseidita can you please check and sign again. |
|
@cmsbuild please test |
|
@Parsifal-2045 thank you for the prompt updates. |
|
+1 Size: This PR adds an extra 12KB to repository Comparison SummarySummary:
|
cmsbuild
added
operations-approved
tests-approved
and removed
operations-pending
tests-started
labels
|
+1 |
|
+1 i also not a fun of duplications but we already have such cases for Phase1 and Phase2 in other corners of CMSSW with the advantage of independence of the production Phase1 code from Phase2 developments. |
cmsbuild
added
simulation-approved
fully-signed
and removed
simulation-pending
pending-signatures
labels
|
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. @rappoccio, @sextonkennedy, @antoniovilela, @mandrenguyen (and backports should be raised in the release meeting by the corresponding L2) |
|
+1 |
|
@Parsifal-2045 this PR causes linking issues in CLANG_X IBs: https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/el8_amd64_gcc12/CMSSW_15_0_CLANG_X_2024-12-08-2300/SimMuon/MCTruth: |
diff --git a/SimMuon/MCTruth/plugins/Phase2SeedToTrackProducer.h b/SimMuon/MCTruth/plugins/Phase2SeedToTrackProducer.h
deleted file mode 100644
index 12fe7141af5..00000000000
--- a/SimMuon/MCTruth/plugins/Phase2SeedToTrackProducer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SimMuon_MCTruth_Phase2SeedToTrackProducer_h
-#define SimMuon_MCTruth_Phase2SeedToTrackProducer_h
-
-/** \class SeedToTrackProducer
- *
- * SeedToTrackProducerBase class specialized for Phase 2
- * Muon seeds
- *
- * \author Luca Ferragina (INFN BO), 2024
- */
-
-#include "SimMuon/MCTruth/plugins/SeedToTrackProducerBase.h"
-#include "DataFormats/MuonSeed/interface/L2MuonTrajectorySeedCollection.h"
-
-typedef SeedToTrackProducerBase<L2MuonTrajectorySeedCollection> Phase2SeedToTrackProducer;
-
-#endif
diff --git a/SimMuon/MCTruth/plugins/SealModule.cc b/SimMuon/MCTruth/plugins/SealModule.cc
index b2988b656c8..cf557981fe9 100644
--- a/SimMuon/MCTruth/plugins/SealModule.cc
+++ b/SimMuon/MCTruth/plugins/SealModule.cc
@@ -2,10 +2,6 @@
#include "FWCore/PluginManager/interface/ModuleDef.h"
#include "SimMuon/MCTruth/interface/CSCTruthTest.h"
#include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
-#include "SimMuon/MCTruth/plugins/SeedToTrackProducer.h"
-#include "SimMuon/MCTruth/plugins/Phase2SeedToTrackProducer.h"
DEFINE_FWK_MODULE(MuonAssociatorEDProducer);
DEFINE_FWK_MODULE(CSCTruthTest);
-DEFINE_FWK_MODULE(SeedToTrackProducer);
-DEFINE_FWK_MODULE(Phase2SeedToTrackProducer);
diff --git a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h b/SimMuon/MCTruth/plugins/SeedToTrackProducer.h
deleted file mode 100644
index c70eb1f14e8..00000000000
--- a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SimMuon_MCTruth_SeedToTrackProducer_h
-#define SimMuon_MCTruth_SeedToTrackProducer_h
-
-/** \class SeedToTrackProducer
- *
- * SeedToTrackProducerBase class specialized for Phase 1
- * Muon seeds
- *
- * \author Luca Ferragina (INFN BO), 2024
- */
-
-#include "SimMuon/MCTruth/plugins/SeedToTrackProducerBase.h"
-#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
-
-typedef SeedToTrackProducerBase<TrajectorySeedCollection> SeedToTrackProducer;
-
-#endif
diff --git a/SimMuon/MCTruth/plugins/SeedToTrackProducerBase.cc b/SimMuon/MCTruth/plugins/SeedToTrackProducerBase.cc
index fb824635d83..f0096a01b81 100644
--- a/SimMuon/MCTruth/plugins/SeedToTrackProducerBase.cc
+++ b/SimMuon/MCTruth/plugins/SeedToTrackProducerBase.cc
@@ -6,15 +6,12 @@
*/
#include "SimMuon/MCTruth/plugins/SeedToTrackProducerBase.h"
-
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
#include "DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h"
-
-template class SeedToTrackProducerBase<std::vector<TrajectorySeed>>;
-template class SeedToTrackProducerBase<std::vector<L2MuonTrajectorySeed>>;
+#include "DataFormats/MuonSeed/interface/L2MuonTrajectorySeedCollection.h"
//
// constructors and destructor
@@ -152,3 +149,12 @@ TrajectoryStateOnSurface SeedToTrackProducerBase<SeedCollection>::seedTransientS
trajectoryStateTransform::transientState(tmpTSOD, &(tmpGeomDet->surface()), &mgField);
return tmpTSOS;
}
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+typedef SeedToTrackProducerBase<TrajectorySeedCollection> SeedToTrackProducer;
+typedef SeedToTrackProducerBase<L2MuonTrajectorySeedCollection> Phase2SeedToTrackProducer;
+
+DEFINE_FWK_MODULE(SeedToTrackProducer);
+DEFINE_FWK_MODULE(Phase2SeedToTrackProducer);
solves, by the way I think we should get rid of the |
|
@mmusich could you please open a PR with this fix? Thanks! |
|
We're also getting segfaults in ROOT6 wf 24034.0 that may be related. CMSSW_15_0_ROOT6_X_2024-12-08-2300: Preceded by |
isn't it already addressed at #46896 ? |
Yes, looks like it. Somehow I missed that PR while checking if it had already been addressed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description:
This PR implements the full Muon HLT Validation for Phase 2.
When a Phase 2 workflow is run, the validation module's output changes from Phase 1 objects to the corresponding Phase 2 ones. The HLT full event content has been updated accordingly and a few more plots have been added (e.g separate efficiency measurements in the barrel, overlap, and endcap).
Changes presented in the HLT Upgrade meeting on 3/12/2024.
PR validation:
Verified that validation plots are filled with sensible information using ZMM and TTbar RelVals and private production via runTheMatrix using workflows 29834 (TTbar) and 29850 (ZMM) at 200 PU.