Rawp v3

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/ALCARECOPromptCalibProdSiPixelAliHLT_cff.py

@@ -13,10 +13,8 @@
 
 # Ingredient: onlineBeamSpot
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
-onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
-
-import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
-BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone(
+onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone(
+    useBSOnlineRecords = True,
     timeThreshold = 999999 # for express allow >48h old payloads for replays. DO NOT CHANGE
 )
 

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracksZMuMu_Output_cff.py

@@ -13,6 +13,8 @@
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep *_TriggerResults_*_*',
+        'keep *_hltPixelVertices_*_*',
+        'keep *_ALCARECOTkAlHLTPixelZMuMuVertexTracks_*_*',
 	'keep *_hltVerticesPFFilter_*_*',
         'keep *_hltOnlineBeamSpot_*_*'
     )

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,6 +13,7 @@
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep *_TriggerResults_*_*',
+        'keep *_hltPixelVertices_*_*',
         'keep *_hltVerticesPFFilter_*_*',
         'keep *_hltOnlineBeamSpot_*_*')
 )

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/python/LSNumberFilter_cfi.py

@@ -6,5 +6,6 @@
     veto_HLT_Menu = [
         "LumiScan",
         "PPS",
-        "ECALTiming"]
+        "ECALTiming",
+        "ECAL"]
     )

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()) {