adjustments to HG PCL workflow to use online inputs

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLTHGDiMuon_cff.py

@@ -12,8 +12,7 @@
 from Alignment.CommonAlignmentProducer.ALCARECOPromptCalibProdSiPixelAliHLT_cff import *
 from Alignment.CommonAlignmentProducer.LSNumberFilter_cfi import *
 
-# Ingredient: offlineBeamSpot
-from RecoVertex.BeamSpotProducer.BeamSpot_cfi import offlineBeamSpot
+
 
 # Ingredient: AlignmentTrackSelector
 # track selector for HighPurity tracks
@@ -128,7 +127,7 @@
 seqALCARECOPromptCalibProdSiPixelAliHLTHGDiMu = cms.Sequence(
     ALCARECOTkAlZMuMuFilterForSiPixelAliHLT*
     LSNumberFilter*
-    offlineBeamSpot*
+    onlineBeamSpot*
     SiPixelAliLooseSelectorHLTHGDimuon*
     SiPixelAliTrackRefitterHLTHGDimuon0*
     SiPixelAliTrackerTrackHitFilterHLTHGDimuon*

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLTHG_cff.py

@@ -12,9 +12,6 @@
 from Alignment.CommonAlignmentProducer.ALCARECOPromptCalibProdSiPixelAliHLT_cff import *
 from Alignment.CommonAlignmentProducer.LSNumberFilter_cfi import *
 
-# Ingredient: offlineBeamSpot
-from RecoVertex.BeamSpotProducer.BeamSpot_cfi import offlineBeamSpot
-
 # Ingredient: AlignmentTrackSelector
 # track selector for HighPurity tracks
 #-- AlignmentTrackSelector
@@ -75,7 +72,7 @@
 seqALCARECOPromptCalibProdSiPixelAliHLTHG = cms.Sequence(
     ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG*
     LSNumberFilter*
-    offlineBeamSpot*
+    onlineBeamSpot*
     SiPixelAliLooseSelectorHLTHG*
     SiPixelAliTrackRefitterHLTHG0*
     SiPixelAliTrackerTrackHitFilterHLTHG*

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLT_cff.py

@@ -15,6 +15,11 @@
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
 onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
 
+import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
+BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone(
+    timeThreshold = 999999 # for express allow >48h old payloads for replays. DO NOT CHANGE
+)
+
 # Ingredient: ALCARECOTkAlMinBiasHLT
 from  Alignment.CommonAlignmentProducer.ALCARECOTkAlMinBias_cff import ALCARECOTkAlMinBias
 ALCARECOTkAlMinBiasHLTTracks = ALCARECOTkAlMinBias.clone(
@@ -128,41 +133,41 @@
 SiPixelAliTrackRefitterHLT0 = TrackRefitter.clone(
     src = 'SiPixelAliLooseSelectorHLT',   #'ALCARECOTkAlMinBias'#'ALCARECOTkAlCosmicsCTF0T' #'ALCARECOTkAlMuonIsolated'
     NavigationSchool = '',            # to avoid filling hit pattern
-    TTRHBuilder = 'hltESPTTRHBWithTrackAngle'
+    TTRHBuilder = 'hltESPTTRHBWithTrackAngle',
+    beamSpot = 'onlineBeamSpot'
 )
 
 SiPixelAliTrackRefitterHLT1 = SiPixelAliTrackRefitter0.clone(
-	src = 'SiPixelAliTrackSelectorHLT'
+    src = 'SiPixelAliTrackSelectorHLT',
+    TTRHBuilder = 'hltESPTTRHBWithTrackAngle',
+    beamSpot = 'onlineBeamSpot'
 )
 
 #-- Alignment producer
 from Alignment.MillePedeAlignmentAlgorithm.MillePedeAlignmentAlgorithm_cfi import *
 from Alignment.CommonAlignmentProducer.AlignmentProducerAsAnalyzer_cff import AlignmentProducer
 SiPixelAliMilleAlignmentProducerHLT = SiPixelAliMilleAlignmentProducer.clone(
+    beamSpotTag = 'onlineBeamSpot',
     tjTkAssociationMapTag = 'SiPixelAliTrackRefitterHLT1',
     algoConfig = MillePedeAlignmentAlgorithm.clone(
         binaryFile = 'milleBinaryHLT_0.dat',
         treeFile = 'treeFileHLT.root',
         monitorFile = 'millePedeMonitorHLT.root'
     )
 )
-# Does anything else of the AlignmentProducer need to be overwritten ???
-
-
-
 
 # Ingredient: SiPixelAliTrackerTrackHitFilterHLT
 SiPixelAliTrackerTrackHitFilterHLT = SiPixelAliTrackerTrackHitFilter.clone(
 	src = 'SiPixelAliTrackRefitterHLT0'
 )
 
-
 # Ingredient: SiPixelAliTrackFitterHLT
 import RecoTracker.TrackProducer.CTFFinalFitWithMaterial_cff as fitWithMaterial
 SiPixelAliTrackFitterHLT = fitWithMaterial.ctfWithMaterialTracks.clone(
     src = 'SiPixelAliTrackerTrackHitFilterHLT',
-    # TTRHBuilder = 'hltESPTTRHBWithTrackAngle', #should already be default ???
-    NavigationSchool = ''
+    NavigationSchool = '',
+    TTRHBuilder = 'hltESPTTRHBWithTrackAngle',
+    beamSpot = 'onlineBeamSpot'
 )
 
 SiPixelAliMillePedeFileConverterHLT = cms.EDProducer( 

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracksZMuMu_Output_cff.py

@@ -12,10 +12,10 @@
         'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*',
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracksZMuMu_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
-        'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
-        'keep DcsStatuss_scalersRawToDigi_*_*',
-	'keep *_hltVerticesPFFilter_*_*')
+	'keep *_hltVerticesPFFilter_*_*',
+        'keep *_hltOnlineBeamSpot_*_*'
+    )
 )
 
 OutALCARECOTkAlHLTTracksZMuMu = OutALCARECOTkAlHLTTracksZMuMu_noDrop.clone()

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlHLTTracks_Output_cff.py

@@ -12,11 +12,9 @@
         'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*',
         'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlHLTTracks_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
-        'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
-        'keep DcsStatuss_scalersRawToDigi_*_*',
         'keep *_hltVerticesPFFilter_*_*',
-        'keep *_onlineBeamSpot_*_*')
+        'keep *_hltOnlineBeamSpot_*_*')
 )
 
 OutALCARECOTkAlHLTTracks = OutALCARECOTkAlHLTTracks_noDrop.clone()