Merge pull request #48943 from mmusich/mm_dev_trim_down_alcaprompt_15_0_X

[15.0.X] Trim down `ALCAPROMPT` step in the Prompt Calibration Loop

Author: cmsbuild

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHG_cff.py

@@ -3,32 +3,6 @@
 # ------------------------------------------------------------------------------
 # configure a filter to run only on the events selected by TkAlMinBias AlcaReco
 from Alignment.CommonAlignmentProducer.ALCARECOPromptCalibProdSiPixelAli_cff import *
-ALCARECOTkAlMinBiasFilterForSiPixelAliHG = ALCARECOTkAlMinBiasFilterForSiPixelAli.clone()
-
-
-from Alignment.CommonAlignmentProducer.LSNumberFilter_cfi import *
-
-# Ingredient: offlineBeamSpot
-from RecoVertex.BeamSpotProducer.BeamSpot_cfi import offlineBeamSpot
-
-# Ingredient: AlignmentTrackSelector
-# track selector for HighPurity tracks
-#-- AlignmentTrackSelector
-SiPixelAliHighPuritySelectorHG = SiPixelAliHighPuritySelector.clone()
-
-# track selection for alignment
-SiPixelAliTrackSelectorHG = SiPixelAliTrackSelector.clone(
-	src = 'SiPixelAliTrackFitterHG'
-)
-
-# Ingredient: SiPixelAliTrackRefitter0
-# refitting
-SiPixelAliTrackRefitterHG0 = SiPixelAliTrackRefitter0.clone(
-	src = 'SiPixelAliHighPuritySelectorHG'
-)
-SiPixelAliTrackRefitterHG1 = SiPixelAliTrackRefitterHG0.clone(
-	src = 'SiPixelAliTrackSelectorHG'
-)
 
 #-- Alignment producer
 SiPixelAliMilleAlignmentProducerHG = SiPixelAliMilleAlignmentProducer.clone(
@@ -40,37 +14,27 @@
 	)
       )
     ),
-    tjTkAssociationMapTag = 'SiPixelAliTrackRefitterHG1',
+    tjTkAssociationMapTag = 'SiPixelAliTrackRefitter1',
     algoConfig = MillePedeAlignmentAlgorithm.clone(
 	binaryFile = 'milleBinaryHG_0.dat',
 	treeFile = 'treeFileHG.root',
 	monitorFile = 'millePedeMonitorHG.root'
     )
 )
 
-# Ingredient: SiPixelAliTrackerTrackHitFilter
-SiPixelAliTrackerTrackHitFilterHG = SiPixelAliTrackerTrackHitFilter.clone(
-	src = 'SiPixelAliTrackRefitterHG0'
-)
-
-# Ingredient: SiPixelAliSiPixelAliTrackFitter
-SiPixelAliTrackFitterHG = SiPixelAliTrackFitter.clone(
-	src = 'SiPixelAliTrackerTrackHitFilterHG'
-)
-
 SiPixelAliMillePedeFileConverterHG = cms.EDProducer("MillePedeFileConverter",
                                                     fileDir = cms.string(SiPixelAliMilleAlignmentProducerHG.algoConfig.fileDir.value()),
                                                     inputBinaryFile = cms.string(SiPixelAliMilleAlignmentProducerHG.algoConfig.binaryFile.value()),
                                                     fileBlobLabel = cms.string(''))
 
-seqALCARECOPromptCalibProdSiPixelAliHG = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAliHG*
+seqALCARECOPromptCalibProdSiPixelAliHG = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAli*
                                                       LSNumberFilter*
                                                       offlineBeamSpot*
-                                                      SiPixelAliHighPuritySelectorHG*
-                                                      SiPixelAliTrackRefitterHG0*
-                                                      SiPixelAliTrackerTrackHitFilterHG*
-                                                      SiPixelAliTrackFitterHG*
-                                                      SiPixelAliTrackSelectorHG*
-                                                      SiPixelAliTrackRefitterHG1*
+                                                      SiPixelAliHighPuritySelector*
+                                                      SiPixelAliTrackRefitter0*
+                                                      SiPixelAliTrackerTrackHitFilter*
+                                                      SiPixelAliTrackFitter*
+                                                      SiPixelAliTrackSelector*
+                                                      SiPixelAliTrackRefitter1*
                                                       SiPixelAliMilleAlignmentProducerHG*
                                                       SiPixelAliMillePedeFileConverterHG)

Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripGains_cff.py

@@ -63,7 +63,9 @@
 
 # refit and BS can be dropped if done together with RECO.
 # track filter can be moved in acalreco if no otehr users
+from RecoTracker.MeasurementDet.MeasurementTrackerEventProducer_cfi import *
 ALCARECOTrackFilterRefit = cms.Sequence(ALCARECOCalibrationTracks +
+                                        MeasurementTrackerEvent +
                                         offlineBeamSpot +
                                         ALCARECOCalibrationTracksRefit )
 

Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripHitEfficiency_cff.py

@@ -1,4 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Calibration.TkAlCaRecoProducers.ALCARECOPromptCalibProdSiStripGains_cff import ALCARECOCalibrationTracks,ALCARECOCalibrationTracksRefit
 
 # ------------------------------------------------------------------------------
 # configure a filter to run only on the events selected by TkAlMinBias AlcaReco
@@ -9,19 +10,6 @@
     TriggerResultsTag = ("TriggerResults","","RECO")
 )
 
-# ------------------------------------------------------------------------------
-# This is the sequence for track refitting of the track saved by SiStripCalMinBias
-# to have access to transient objects produced during RECO step and not saved
-from Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi import *
-ALCARECOMonitoringTracks = AlignmentTrackSelector.clone(
-    #    src = 'generalTracks',
-    src = 'ALCARECOSiStripCalMinBias',
-    filter = True,
-    applyBasicCuts = True,
-    ptMin = 0.8,
-    nHitMin = 6,
-    chi2nMax = 10.)
-
 # FIXME: the beam-spot should be kept in the AlCaReco (if not already there) and dropped from here
 from RecoVertex.BeamSpotProducer.BeamSpot_cff import *
 from RecoTracker.IterativeTracking.InitialStep_cff import *
@@ -30,18 +18,13 @@
 from DQM.SiStripCommon.TkHistoMap_cff import *
 from RecoTracker.MeasurementDet.MeasurementTrackerEventProducer_cfi import *
 
-ALCARECOMonitoringTracksRefit = TrackRefitter.clone(
-         src = "ALCARECOMonitoringTracks",
-         NavigationSchool = cms.string("")
-)
-
 # ------------------------------------------------------------------------------
 # refit and BS can be dropped if done together with RECO.
 # track filter can be moved in acalreco if no otehr users
-ALCARECOTrackFilterRefit = cms.Sequence(ALCARECOMonitoringTracks +
-                                        MeasurementTrackerEvent +
-                                        offlineBeamSpot +
-                                        ALCARECOMonitoringTracksRefit)
+ALCARECOTrackFilterRefitForSiStripHitEff = cms.Sequence(ALCARECOCalibrationTracks  +
+                                                        MeasurementTrackerEvent +
+                                                        offlineBeamSpot +
+                                                        ALCARECOCalibrationTracksRefit)
 
 # ------------------------------------------------------------------------------
 # This is the module actually doing the calibration
@@ -52,8 +35,8 @@
     addLumi = True,
     commonMode = "siStripDigis:CommonMode",
     addCommonMode= False,
-    combinatorialTracks = "ALCARECOMonitoringTracksRefit",
-    trajectories        = "ALCARECOMonitoringTracksRefit",
+    combinatorialTracks = "ALCARECOCalibrationTracksRefit",
+    trajectories        = "ALCARECOCalibrationTracksRefit",
     siStripClusters     = "siStripClusters",
     siStripDigis        = "siStripDigis",
     trackerEvent        = "MeasurementTrackerEvent",
@@ -90,6 +73,6 @@
 # The actual sequence
 seqALCARECOPromptCalibProdSiStripHitEfficiency = cms.Sequence(
     ALCARECOCalMinBiasFilterForSiStripHitEff *
-    ALCARECOTrackFilterRefit *
+    ALCARECOTrackFilterRefitForSiStripHitEff *
     ALCARECOSiStripHitEff *
     MEtoEDMConvertSiStripHitEff)