Merge branch 'master' into ECON_SLink_Diff

Author: yulunmiao

Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -147,7 +147,7 @@ def getSequence(process, collection,
     if collection in ("ALCARECOTkAlMinBias", "generalTracks",
                       "ALCARECOTkAlMinBiasHI", "hiGeneralTracks",
                       "ALCARECOTkAlJetHT", "ALCARECOTkAlDiMuonVertexTracks",
-                      "hltMergedTracks"):
+                      "hltMergedTracks", "ALCARECOTkAlHLTTracks"):
         options["TrackSelector"]["Alignment"].update({
                 "ptMin": 1.0,
                 "pMin": 8.,
@@ -200,7 +200,8 @@ def getSequence(process, collection,
     elif collection in ("ALCARECOTkAlZMuMu",
                         "ALCARECOTkAlZMuMuHI",
                         "ALCARECOTkAlZMuMuPA",
-                        "ALCARECOTkAlDiMuon"):
+                        "ALCARECOTkAlDiMuon",
+                        "ALCARECOTkAlHLTTracksZMuMu"):
         options["TrackSelector"]["Alignment"].update({
                 "ptMin": 15.0,
                 "etaMin": -3.0,

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracksZMuMu_Output_cff.py

@@ -13,11 +13,26 @@
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep *_TriggerResults_*_*',
+        'keep *_hltPixelVertices_*_*',
+        'keep recoTracks_ALCARECOTkAlHLTPixelZMuMuVertexTracks_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlHLTPixelZMuMuVertexTracks_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlHLTPixelZMuMuVertexTracks_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlHLTPixelZMuMuVertexTracks_*_*',
 	'keep *_hltVerticesPFFilter_*_*',
-        'keep *_hltOnlineBeamSpot_*_*'
+        'keep *_hltOnlineBeamSpot_*_*',
+        'keep DCSRecord_onlineMetaDataDigis_*_*'
     )
 )
 
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlHLTTracksZMuMu_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlHLTTracksZMuMu_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
 OutALCARECOTkAlHLTTracksZMuMu = OutALCARECOTkAlHLTTracksZMuMu_noDrop.clone()
 OutALCARECOTkAlHLTTracksZMuMu.outputCommands.insert(0, "drop *")
 

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracksZMuMu_cff.py

@@ -55,6 +55,22 @@
 ALCARECOTkAlHLTTracksZMuMu.TwoBodyDecaySelector.applyAcoplanarityFilter = False
 ALCARECOTkAlHLTTracksZMuMu.TwoBodyDecaySelector.numberOfCandidates = 1
 
-seqALCARECOTkAlHLTTracksZMuMu = cms.Sequence(ALCARECOTkAlHLTTracksZMuMuHLT+ALCARECOTkAlHLTTracksZMuMuDCSFilter+ALCARECOTkAlHLTTracksZMuMuGoodMuons+ALCARECOTkAlHLTTracksZMuMuRelCombIsoMuons+ALCARECOTkAlHLTTracksZMuMu)
+##################################################################
+# Tracks from the selected vertex
+#################################################################
+import Alignment.CommonAlignmentProducer.AlignmentTracksFromVertexSelector_cfi as _TracksFromPixelVertex
+ALCARECOTkAlHLTPixelZMuMuVertexTracks = _TracksFromPixelVertex.AlignmentTracksFromVertexSelector.clone(
+    src = 'hltPixelTracks',
+    vertices = 'hltPixelVertices',
+    leptonTracks = 'ALCARECOTkAlHLTTracksZMuMu',
+    useClosestVertexToDilepton = True,
+)
+
+seqALCARECOTkAlHLTTracksZMuMu = cms.Sequence(ALCARECOTkAlHLTTracksZMuMuHLT+
+                                             ALCARECOTkAlHLTTracksZMuMuDCSFilter+
+                                             ALCARECOTkAlHLTTracksZMuMuGoodMuons+
+                                             ALCARECOTkAlHLTTracksZMuMuRelCombIsoMuons+
+                                             ALCARECOTkAlHLTTracksZMuMu+
+                                             ALCARECOTkAlHLTPixelZMuMuVertexTracks)
 
 

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracks_Output_cff.py

@@ -13,9 +13,21 @@
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep *_TriggerResults_*_*',
+        'keep *_hltPixelVertices_*_*',
         'keep *_hltVerticesPFFilter_*_*',
-        'keep *_hltOnlineBeamSpot_*_*')
+        'keep *_hltOnlineBeamSpot_*_*',
+        'keep DCSRecord_onlineMetaDataDigis_*_*'
+    )
 )
 
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlHLTTracks_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlHLTTracks_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
 OutALCARECOTkAlHLTTracks = OutALCARECOTkAlHLTTracks_noDrop.clone()
 OutALCARECOTkAlHLTTracks.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py

@@ -49,6 +49,7 @@
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+from Configuration.Eras.Modifier_run3_oxygen_cff import run3_oxygen
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBias,
                                     trackQualities = cms.vstring("highPurity")
 )
@@ -66,7 +67,7 @@
 )
 
 seqALCARECOTkAlMinBiasHI = cms.Sequence(ALCARECOTkAlMinBiasTriggerResultsHI*~ALCARECOTkAlMinBiasNOTHLT+ALCARECOTkAlMinBiasDCSFilter+ALCARECOTkAlMinBias)
-pp_on_AA.toReplaceWith(seqALCARECOTkAlMinBias,seqALCARECOTkAlMinBiasHI)
+(pp_on_AA | run3_oxygen).toReplaceWith(seqALCARECOTkAlMinBias,seqALCARECOTkAlMinBiasHI)
 
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 phase2_tracker.toModify(ALCARECOTkAlMinBias, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc

@@ -78,15 +78,14 @@ AlignmentTrackFromVertexSelector::Tracks AlignmentTrackFromVertexSelector::selec
   // get collection of reconstructed vertices from event
   edm::Handle<reco::VertexCollection> vertexHandle = evt.getHandle(vertexToken_);
 
-  // get collection of the di-lepton traxks
-  const auto& leptonTracks = evt.get(diLeptonToken_);
-
   // fill the vector of keys
   if (vertexHandle.isValid()) {
     const reco::VertexCollection* vertices = vertexHandle.product();
     const reco::Vertex* theVtx = nullptr;
 
     if (useClosestVertex_) {
+      // get collection of the di-lepton traxks
+      const auto& leptonTracks = evt.get(diLeptonToken_);
       theVtx = findClosestVertex(leptonTracks, vertices, setup);
     } else {
       if ((*vertices).at(vertexIndex_).isValid()) {

Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h

@@ -95,6 +95,18 @@ class MuonResidualsFromTrack {
   TMatrixD choleskyCorrMatrix(DetId chamberId);
 
 private:
+  //Due to large constructor code, UBSAN with GCC14 hangs and never returns
+  //Moving large constructor code to a private function fixes this issue
+  void init(edm::ESHandle<TransientTrackingRecHitBuilder> builder,
+            edm::ESHandle<MagneticField> magneticField,
+            edm::ESHandle<GlobalTrackingGeometry> globalGeometry,
+            edm::ESHandle<DetIdAssociator> muonDetIdAssociator_,
+            edm::ESHandle<Propagator> prop,
+            const Trajectory *traj,
+            const reco::Track *recoTrack,
+            AlignableNavigator *navigator,
+            double maxResidual);
+
   TrajectoryStateCombiner m_tsoscomb;
 
   int m_tracker_numHits;

Alignment/MuonAlignmentAlgorithms/src/MuonResidualsFromTrack.cc

@@ -31,6 +31,26 @@ MuonResidualsFromTrack::MuonResidualsFromTrack(edm::ESHandle<TransientTrackingRe
                                                AlignableNavigator* navigator,
                                                double maxResidual)
     : m_recoTrack(recoTrack) {
+  init(trackerRecHitBuilder,
+       magneticField,
+       globalGeometry,
+       muonDetIdAssociator_,
+       prop,
+       traj,
+       recoTrack,
+       navigator,
+       maxResidual);
+}
+
+void MuonResidualsFromTrack::init(edm::ESHandle<TransientTrackingRecHitBuilder> trackerRecHitBuilder,
+                                  edm::ESHandle<MagneticField> magneticField,
+                                  edm::ESHandle<GlobalTrackingGeometry> globalGeometry,
+                                  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_,
+                                  edm::ESHandle<Propagator> prop,
+                                  const Trajectory* traj,
+                                  const reco::Track* recoTrack,
+                                  AlignableNavigator* navigator,
+                                  double maxResidual) {
   bool m_debug = false;
 
   if (m_debug) {

Alignment/OfflineValidation/README.md

@@ -118,7 +118,7 @@ For details read [`README_JetHT.md`](https://github.com/cms-sw/cmssw/blob/master
 For details read [`README_MTS.md`](https://github.com/cms-sw/cmssw/blob/master/Alignment/OfflineValidation/README_MTS.md)
 
 ## Pixel BaryCenter
-For details read [`README_MTS.md`](https://github.com/cms-sw/cmssw/blob/master/Alignment/OfflineValidation/README_PixBary.md)
+For details read [`README_PixBary.md`](https://github.com/cms-sw/cmssw/blob/master/Alignment/OfflineValidation/README_PixBary.md)
 
 ## Generic validation (dataset validation)
 For details read [`README_Generic.md`](https://github.com/cms-sw/cmssw/blob/master/Alignment/OfflineValidation/README_Generic.md)

Alignment/OfflineValidation/README_PixBary.md

@@ -7,11 +7,17 @@ The following parameters are expected/accepted in the json/yaml configuration fi
 ```
 validations:
     PixBary:
-        single:
+        <step_type>:
             <job_name>:
                 <options>
 ```
 
+The following steps are supported:
+- single (run the analyzer to compute the barycentre)
+- extract (retrieve the barycentre from the `single` output)
+
+### Single PixBary jobs
+Runs PixelBaryCentreAnalyzer_cfg.py.
 The following options are understood:
 
 Variable | Default value | Explanation/Options
@@ -20,3 +26,11 @@ firstRun | 290550 | The first run to process (inclusive)
 lastRun | 325175 | The last run to process (inclusive)
 lumisPerRun | 1 | The number of LumiSections tested for a change in the TrackerAlignmentRcd in each run
 alignments | None | List of alignments for which this validation is run
+
+### Extract PixBary jobs
+Runs extractBarycentre.py.
+The following options are understood:
+
+Variable | Default value | Explanation/Options
+-------- | ------------- | --------------------
+styles   | [csv, twiki]  | List of styles to be used; see `extractBarycentre.py -h`