diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py
index eb0a677a42482..da47ae9462e05 100644
--- a/Configuration/PyReleaseValidation/python/relval_standard.py
+++ b/Configuration/PyReleaseValidation/python/relval_standard.py
@@ -122,12 +122,7 @@
workflows[4.77] = ['ZElSkim2012D',['ZElSkim2012D','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.78] = ['',['WElSkim2012D','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
-workflows[140.51] = ['RunHI2010',['RunHI2010','REPACKHID','RECOHID11St3','HARVESTDHI']]
-workflows[140.52] = ['',['RunHI2010','RECOHID10','RECOHIR10D11','HARVESTDHI']]
-workflows[140.53] = ['RunHI2011',['RunHI2011','RECOHID11','HARVESTDHI']]
-workflows[140.54] = ['',['RunPA2013','RECO_PPbData','HARVEST_PPbData']]
-workflows[140.55] = ['RunHI2015repackVR',['RunHI2015VR','HYBRIDRepackHI2015VR','HYBRIDZSHI2015','RECOHID15','HARVESTDHI15']]
workflows[140.56] = ['RunHI2018',['RunHI2018','RECOHID18','HARVESTDHI18']]
workflows[140.5611] = ['RunHI2018reMINIAOD',['RunHI2018AOD','REMINIAODHID18','HARVESTHI18MINIAOD']]
workflows[140.57] = ['RunHI2018Reduced',['RunHI2018Reduced','RECOHID18','HARVESTDHI18']]
@@ -814,14 +809,9 @@
### HI test ###
-### Run I cond., 2011
-workflows[140] = ['',['HydjetQ_B12_5020GeV_2011','DIGIHI2011','RECOHI2011','HARVESTHI2011']]
-### Run II cond., 2015
-workflows[145] = ['',['HydjetQ_B12_5020GeV_2015','DIGIHI2015','RECOHI2015','HARVESTHI2015']]
### Run II cond., 2017
workflows[148] = ['',['HydjetQ_MinBias_XeXe_5442GeV_2017','DIGIHI2017','RECOHI2017','HARVESTHI2017']]
### Run II cond., 2018
-workflows[150] = ['',['HydjetQ_B12_5020GeV_2018','DIGIHI2018','RECOHI2018','HARVESTHI2018']]
workflows[158] = ['',['HydjetQ_B12_5020GeV_2018_ppReco','DIGIHI2018PPRECO','RECOHI2018PPRECOMB','ALCARECOHI2018PPRECO','HARVESTHI2018PPRECO']]
workflows[158.01] = ['HydjetQB12ppRECOin2018reMINIAOD',['HydjetQ_reminiaodPbPb2018_INPUT','REMINIAODHI2018PPRECOMB','HARVESTHI2018PPRECOMINIAOD']]
workflows[158.1] = ['',['QCD_Pt_80_120_13_HI','DIGIHI2018PPRECO','RECOHI2018PPRECO','HARVESTHI2018PPRECO']]
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
index a8609437b1b70..abd39dbdb198b 100644
--- a/Configuration/PyReleaseValidation/python/relval_steps.py
+++ b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1141,10 +1141,7 @@ def genS(fragment,howMuch):
U2000by1={'--relval': '2000,1'}
U80by1={'--relval': '80,1'}
-hiDefaults2011 = {'--conditions':'auto:run1_mc_hi','--scenario':'HeavyIons'}
-hiDefaults2015 = {'--conditions':'auto:run2_mc_hi', '--era':'Run2_HI','--scenario':'HeavyIons'}
hiDefaults2017 = {'--conditions':'auto:phase1_2017_realistic', '--era':'Run2_2017_pp_on_XeXe'}
-hiDefaults2018 = {'--conditions':'auto:phase1_2018_realistic_hi', '--era':'Run2_2018','--scenario':'HeavyIons'}
hiDefaults2018_ppReco = {'--conditions':'auto:phase1_2018_realistic_hi', '--era':'Run2_2018_pp_on_AA'}
hiDefaults2022_ppReco = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb'}
hiDefaults2022_ppReco_approxClusters = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters'}
@@ -1152,10 +1149,7 @@ def genS(fragment,howMuch):
hiDefaults2023_ppReco_approxClusters = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023'}
steps['Hydjet2Q_MinBias_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet2_Quenched_MinBias_5020GeV_cfi',U2000by1)])
-steps['HydjetQ_B12_5020GeV_2011']=merge([{'-n':1,'--beamspot':'RealisticHI2011Collision'},hiDefaults2011,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
-steps['HydjetQ_B12_5020GeV_2015']=merge([{'-n':1,'--beamspot':'RealisticHICollisionFixZ2015'},hiDefaults2015,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_MinBias_XeXe_5442GeV_2017']=merge([{'-n':1},hiDefaults2017,gen2017('Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi',U2000by1)])
-steps['HydjetQ_B12_5020GeV_2018']=merge([{'-n':1},hiDefaults2018,gen2018prod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_B12_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_B12_5020GeV_2022_ppReco']=merge([{'-n':1},hiDefaults2022_ppReco,gen2022hiprod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_MinBias_5020GeV_2022_ppReco']=merge([{'-n':1},hiDefaults2022_ppReco,gen2022hiprod('Hydjet_Quenched_MinBias_5020GeV_cfi',U2000by1)])
@@ -1918,10 +1912,7 @@ def lhegensim2018ml(fragment,howMuch):
steps['DIGIHI2022PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2022PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2018PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
-steps['DIGIHI2018']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2017, step2Upg2015Defaults])
-steps['DIGIHI2015']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2015, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
-steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2011, {'--pileup':'HiMixNoPU'}, step2Defaults])
steps['DIGIHI2023MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2023_ppReco, {'--pileup':'HiMix'}, PUHI2023, step2Upg2015Defaults])
steps['DIGIHI2022MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2022_ppReco, {'--pileup':'HiMix'}, PUHI2022, step2Upg2015Defaults])
steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2018_ppReco, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])
@@ -3241,7 +3232,6 @@ def gen2023HiMix(fragment,howMuch):
'--eventcontent':'ALCARECO'
}])
-steps['RECOHI2018']=merge([hiDefaults2018,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults])
steps['RECOHI2017']=merge([hiDefaults2017,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM'},step3Up2015Defaults])
steps['RECOHI2015']=merge([hiDefaults2015,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults])
steps['RECOHI2011']=merge([hiDefaults2011,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Defaults])
@@ -3843,23 +3833,10 @@ def gen2023HiMix(fragment,howMuch):
'--filetype':'DQM',
'-n':100},hiDefaults2018_ppReco])
-steps['HARVESTHI2018']=merge([hiDefaults2018,{'-s':'HARVESTING:validationHarvesting+dqmHarvestingFakeHLT',
- '--mc':'',
- '--era' : 'Run2_2017',
- '--filetype':'DQM',
- '--scenario':'HeavyIons'}])
steps['HARVESTHI2017']=merge([hiDefaults2017,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT',
'--mc':'',
'--era' : 'Run2_2017_pp_on_XeXe',
'--filetype':'DQM'}])
-steps['HARVESTHI2015']=merge([hiDefaults2015,{'-s':'HARVESTING:validationHarvesting+dqmHarvestingFakeHLT',
- '--mc':'',
- '--era' : 'Run2_2016,Run2_HI',
- '--filetype':'DQM',
- '--scenario':'HeavyIons'}])
-steps['HARVESTHI2011']=merge([hiDefaults2011,{'-s':'HARVESTING:validationHarvesting+dqmHarvestingFakeHLT',
- '--mc':'',
- '--filetype':'DQM'}])
steps['HARVESTPPREF2017']=merge([ppRefDefaults2017,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT',
'--mc':'',
diff --git a/Configuration/StandardSequences/python/ReconstructionHeavyIons_cff.py b/Configuration/StandardSequences/python/ReconstructionHeavyIons_cff.py
deleted file mode 100644
index 4ebf51cca6251..0000000000000
--- a/Configuration/StandardSequences/python/ReconstructionHeavyIons_cff.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#--------------------------------------------------------------------------
-# LOCAL RECO
-
-# Tracker
-from RecoVertex.BeamSpotProducer.BeamSpot_cfi import *
-from RecoLuminosity.LumiProducer.bunchSpacingProducer_cfi import *
-from RecoLocalTracker.Configuration.RecoLocalTrackerHeavyIons_cff import *
-from RecoTracker.MeasurementDet.MeasurementTrackerEventProducer_cfi import *
-from RecoTracker.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *
-
-# Ecal
-from RecoLocalCalo.Configuration.ecalLocalRecoSequence_cff import *
-from RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi import *
-
-# Hcal
-from RecoLocalCalo.Configuration.hcalLocalReco_cff import *
-from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
-
-#castor
-from RecoLocalCalo.CastorReco.CastorSimpleReconstructor_cfi import *
-
-# Muons
-from RecoLocalMuon.Configuration.RecoLocalMuon_cff import *
-
-#--------------------------------------------------------------------------
-# HIGH LEVEL RECO
-
-from RecoHI.Configuration.Reconstruction_HI_cff import *
-from RecoHI.Configuration.Reconstruction_hiPF_cff import *
-from RecoLocalCalo.Castor.Castor_cff import *
-from RecoHI.HiEgammaAlgos.HiElectronSequence_cff import *
-#--------------------------------------------------------------------------
-
-from RecoTracker.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *
-siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(
- src = 'siPixelClustersPreSplitting'
- )
-
-caloRecoTask = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask)
-muonRecoTask = cms.Task(trackerlocalrecoTask,MeasurementTrackerEventPreSplitting,siPixelClusterShapeCachePreSplitting,muonlocalrecoTask)
-localRecoTask = cms.Task(bunchSpacingProducer,offlineBeamSpot,muonRecoTask,caloRecoTask,castorreco)
-
-#hbherecoMB = hbheprerecoMB.clone()
-#hcalLocalRecoSequenceNZS.replace(hbheprerecoMB,hbherecoMB)
-
-caloRecoNZSTask = cms.Task(caloRecoTask,hcalLocalRecoTaskNZS)
-localReco_HcalNZSTask = cms.Task(bunchSpacingProducer,offlineBeamSpot,muonRecoTask,caloRecoNZSTask)
-
-#--------------------------------------------------------------------------
-# Main Sequence
-reconstruct_PbPbTask = cms.Task(localRecoTask,CastorFullRecoTask,globalRecoPbPbTask)
-reconstructionHeavyIons = cms.Sequence(reconstruct_PbPbTask)
-
-reconstructionHeavyIons_HcalNZSTask = cms.Task(localReco_HcalNZSTask,globalRecoPbPbTask)
-
-reconstructionHeavyIons_withRegitMu = cms.Sequence(reconstructionHeavyIons*regionalMuonRecoPbPb)
-#--------------------------------------------------------------------------
diff --git a/RecoHI/Configuration/python/RecoHI_EventContent_cff.py b/RecoHI/Configuration/python/RecoHI_EventContent_cff.py
deleted file mode 100644
index 87ff2ed1461bf..0000000000000
--- a/RecoHI/Configuration/python/RecoHI_EventContent_cff.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# include event content from RecoHI packages
-from RecoHI.HiTracking.RecoHiTracker_EventContent_cff import *
-from RecoHI.HiJetAlgos.RecoHiJets_EventContent_cff import *
-from RecoHI.HiEgammaAlgos.RecoHiEgamma_EventContent_cff import *
-from RecoHI.HiCentralityAlgos.RecoHiCentrality_EventContent_cff import *
-from RecoHI.HiEvtPlaneAlgos.RecoHiEvtPlane_EventContent_cff import *
-from RecoHI.HiMuonAlgos.RecoHiMuon_EventContent_cff import *
-
-# combine RECO, AOD, FEVT content from all RecoHI packages
-# RecoHI event contents to be included by Configuration.EventContent.EventContentHeavyIons_cff
-
-# AOD content
-RecoHIAOD = cms.PSet(
- outputCommands = cms.untracked.vstring()
-)
-RecoHIAOD.outputCommands.extend(RecoHiTrackerAOD.outputCommands)
-RecoHIAOD.outputCommands.extend(RecoHiJetsAOD.outputCommands)
-RecoHIAOD.outputCommands.extend(RecoHiEgammaAOD.outputCommands)
-RecoHIAOD.outputCommands.extend(RecoHiEvtPlaneAOD.outputCommands)
-RecoHIAOD.outputCommands.extend(RecoHiCentralityAOD.outputCommands)
-RecoHIAOD.outputCommands.extend(RecoHiMuonAOD.outputCommands)
-
-# RECO content
-RecoHIRECO = cms.PSet(
- outputCommands = cms.untracked.vstring()
-)
-RecoHIRECO.outputCommands.extend(RecoHiTrackerRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiTrackerLocalRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiJetsRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiEgammaRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiEvtPlaneRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiCentralityRECO.outputCommands)
-RecoHIRECO.outputCommands.extend(RecoHiMuonRECO.outputCommands)
-
-# FEVT content
-RecoHIFEVT = cms.PSet(
- outputCommands = cms.untracked.vstring()
-)
-RecoHIFEVT.outputCommands.extend(RecoHiTrackerFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiTrackerLocalFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiJetsFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiEgammaFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiEvtPlaneFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiCentralityFEVT.outputCommands)
-RecoHIFEVT.outputCommands.extend(RecoHiMuonFEVT.outputCommands)
-
diff --git a/RecoHI/Configuration/python/Reconstruction_HI_cff.py b/RecoHI/Configuration/python/Reconstruction_HI_cff.py
deleted file mode 100644
index ee2073a4840f8..0000000000000
--- a/RecoHI/Configuration/python/Reconstruction_HI_cff.py
+++ /dev/null
@@ -1,109 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#--------------------------------------------------------------------------
-# HIGH LEVEL RECO
-
-# Tracking
-from RecoHI.HiTracking.HiTracking_cff import * # two additional steps
-
-# Egamma
-from RecoHI.HiEgammaAlgos.HiEgamma_cff import *
-from RecoHI.HiEgammaAlgos.HiElectronSequence_cff import *
-ecalDrivenElectronSeeds.SCEtCut = 15.0
-ecalDrivenGsfElectrons.preselection.minSCEtBarrel = 15.0
-ecalDrivenGsfElectrons.preselection.minSCEtEndcaps = 15.0
-
-# Jet Reconstruction
-from RecoHI.HiJetAlgos.HiRecoJets_cff import *
-
-# Muon Reco
-from RecoHI.HiMuonAlgos.HiRecoMuon_cff import *
-# keep regit seperate for the moment
-from RecoHI.HiMuonAlgos.HiRegionalRecoMuon_cff import *
-
-from RecoHI.Configuration.Reconstruction_hiPF_cff import *
-
-# Heavy Ion Event Characterization
-from RecoHI.HiCentralityAlgos.HiCentrality_cfi import *
-from RecoHI.HiCentralityAlgos.CentralityBin_cfi import *
-from RecoHI.HiCentralityAlgos.HiClusterCompatibility_cfi import *
-from RecoHI.HiEvtPlaneAlgos.HiEvtPlane_cfi import *
-
-# HCAL noise producer
-from RecoMET.METProducers.hcalnoiseinfoproducer_cfi import *
-hcalnoise.trackCollName = 'hiGeneralTracks'
-
-from RecoLocalCalo.Configuration.hcalGlobalReco_cff import *
-
-#post PF egamma stuff
-from RecoHI.HiEgammaAlgos.HiEgammaPostPF_cff import *
-
-from RecoHI.HiJetAlgos.HiRecoPFJets_cff import *
-
-#reduced rechits
-from RecoEcal.EgammaClusterProducers.reducedRecHitsSequence_cff import *
-from RecoEcal.EgammaCoreTools.EcalNextToDeadChannelESProducer_cff import *
-from RecoLocalCalo.HcalRecProducers.HcalHitSelection_cfi import *
-reducedHcalRecHitsTask = cms.Task( reducedHcalRecHits )
-reducedHcalRecHitsSequence = cms.Sequence( reducedHcalRecHitsTask )
-reducedRecHitsTask = cms.Task ( reducedEcalRecHitsTask , reducedHcalRecHitsTask )
-reducedRecHits = cms.Sequence ( reducedRecHitsTask )
-interestingTrackEcalDetIds.TrackCollection = "hiGeneralTracks"
-
-
-# Global + High-Level Reco Sequence
-globalRecoPbPbTask = cms.Task(hiTracking_wSplittingTask
- , hcalGlobalRecoTask
- , hiParticleFlowLocalRecoTask
- , hiEcalClustersTask
- , hiRecoJetsTask
- , muonRecoPbPbTask
- , hiElectronTask
- , hiEgammaTask
- , hiParticleFlowRecoTask
- , egammaHighLevelRecoPostPFTask
- , hiCentrality
- #, centralityBin # temporarily removed
- , hiClusterCompatibility
- , hiEvtPlane
- , hcalnoise
- , muonRecoHighLevelPbPbTask
- , particleFlowLinksTask
- , hiRecoPFJetsTask
- , reducedRecHitsTask
- )
-globalRecoPbPb = cms.Sequence(globalRecoPbPbTask)
-
-globalRecoPbPb_wPhase1Task = globalRecoPbPbTask.copy()
-globalRecoPbPb_wPhase1Task.replace(hiTracking_wSplittingTask, hiTracking_wSplitting_Phase1Task)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toReplaceWith(globalRecoPbPbTask, globalRecoPbPb_wPhase1Task)
-
-
-globalRecoPbPb_wConformalPixelTask = cms.Task(hiTracking_wConformalPixelTask
- , hiParticleFlowLocalRecoTask
- , hiEcalClustersTask
- , hiRecoJetsTask
- , muonRecoPbPbTask
- , hiElectronTask
- , hiEgammaTask
- , hiParticleFlowRecoTask
- , egammaHighLevelRecoPostPFTask
- , hiCentrality
- , hiClusterCompatibility
- , hiEvtPlane
- , hcalnoise
- , muonRecoHighLevelPbPbTask
- , particleFlowLinksTask
- , hiRecoPFJetsTask
- , reducedRecHitsTask
- )
-globalRecoPbPb_wConformalPixel = cms.Sequence(globalRecoPbPb_wConformalPixelTask)
-
-#--------------------------------------------------------------------------
-# Full sequence (LOCAL RECO + HIGH LEVEL RECO)
-# in Configuration.StandardSequences.ReconstructionHeavyIons_cff
-
-# Modify zero-suppression sequence here
-from RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi import *
-siStripZeroSuppression.storeCM = True
diff --git a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py b/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
deleted file mode 100644
index 8dd03b2e2ad5c..0000000000000
--- a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# include particle flow local reconstruction
-from RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff import *
-
-# run a trimmed down PF sequence with heavy-ion vertex, no conversions, nucl int, etc.
-
-from RecoParticleFlow.PFProducer.particleFlowEGamma_cff import *
-particleFlowEGamma.vertexCollection = "hiSelectedVertex"
-gedGsfElectronCores.ctfTracks = "hiGeneralTracks"
-gedGsfElectronsTmp.ctfTracksTag = "hiGeneralTracks"
-gedGsfElectronsTmp.vtxTag = "hiSelectedVertex"
-gedGsfElectronsTmp.preselection.minSCEtBarrel = 15.0
-gedGsfElectronsTmp.preselection.minSCEtEndcaps = 15.0
-gedGsfElectronsTmp.fillConvVtxFitProb = False
-
-gedPhotonsTmp.primaryVertexProducer = "hiSelectedVertex"
-gedPhotonsTmp.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
-gedPhotons.primaryVertexProducer = "hiSelectedVertex"
-gedPhotons.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
-photonIDValueMaps.vertices = "hiSelectedVertex"
-from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
-
-photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer = "gedPhotonsTmp")
-
-#These are set for consistency w/ HiElectronSequence, but these cuts need to be studied
-gedGsfElectronsTmp.preselection.maxHOverEBarrelCone = 0.25
-gedGsfElectronsTmp.preselection.maxHOverEEndcapsCone = 0.25
-gedGsfElectronsTmp.preselection.maxHOverEBarrelBc = 0.0
-gedGsfElectronsTmp.preselection.maxHOverEEndcapsBc = 0.0
-gedGsfElectronsTmp.preselection.maxEOverPBarrel = 2.
-gedGsfElectronsTmp.preselection.maxEOverPEndcaps = 2.
-
-ootPhotonsTmp.primaryVertexProducer = "hiSelectedVertex"
-ootPhotonsTmp.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
-ootPhotons.primaryVertexProducer = "hiSelectedVertex"
-ootPhotons.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
-
-from RecoParticleFlow.Configuration.RecoParticleFlow_cff import *
-
-mvaElectrons.vertexTag = "hiSelectedVertex"
-
-particleFlowBlock.elementImporters = cms.VPSet(
- cms.PSet( importerName = cms.string("GSFTrackImporter"),
- source = cms.InputTag("pfTrackElec"),
- gsfsAreSecondary = cms.bool(False),
- superClustersArePF = cms.bool(True) ),
- cms.PSet( importerName = cms.string("SuperClusterImporter"),
- source_eb = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel"),
- source_ee = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower"),
- maximumHoverE = cms.double(0.5),
- minSuperClusterPt = cms.double(10.0),
- minPTforBypass = cms.double(100.0),
- hbheRecHitsTag = cms.InputTag("hbhereco"),
- maxSeverityHB = cms.int32(9),
- maxSeverityHE = cms.int32(9),
- usePFThresholdsFromDB = cms.bool(True),
- superClustersArePF = cms.bool(True) ),
- # all secondary track importers
- cms.PSet( importerName = cms.string("GeneralTracksImporter"),
- source = cms.InputTag("pfTrack"),
- muonSrc = cms.InputTag("hiMuons1stStep"),
- trackQuality = cms.string("highPurity"),
- cleanBadConvertedBrems = cms.bool(False),
- useIterativeTracking = cms.bool(False),
- DPtOverPtCuts_byTrackAlgo = cms.vdouble(-1.0,-1.0,-1.0,
- 1.0,1.0),
- NHitCuts_byTrackAlgo = cms.vuint32(3,3,3,3,3),
- muonMaxDPtOPt = cms.double(1),
- vetoEndcap = cms.bool(False)
- ),
- # to properly set SC based links you need to run ECAL importer
- # after you've imported all SCs to the block
- cms.PSet( importerName = cms.string("ECALClusterImporter"),
- source = cms.InputTag("particleFlowClusterECAL"),
- BCtoPFCMap = cms.InputTag('particleFlowSuperClusterECAL:PFClusterAssociationEBEE') ),
- cms.PSet( importerName = cms.string("GenericClusterImporter"),
- source = cms.InputTag("particleFlowClusterHCAL") ),
- cms.PSet( importerName = cms.string("GenericClusterImporter"),
- source = cms.InputTag("particleFlowClusterHO") ),
- cms.PSet( importerName = cms.string("GenericClusterImporter"),
- source = cms.InputTag("particleFlowClusterHF") ),
- cms.PSet( importerName = cms.string("GenericClusterImporter"),
- source = cms.InputTag("particleFlowClusterPS") )
- )
-
-particleFlowTmp.postMuonCleaning = False
-particleFlowTmp.vertexCollection = "hiSelectedVertex"
-particleFlowTmp.muons = "hiMuons1stStep"
-particleFlowTmp.usePFConversions = False
-
-pfNoPileUpIso.enable = False
-pfPileUpIso.enable = False
-pfNoPileUp.enable = False
-pfPileUp.enable = False
-particleFlow.Muons = "muons:hiMuons1stStep2muonsMap"
-
-
-# local reco must run before electrons (RecoHI/HiEgammaAlgos), due to PF integration
-hiParticleFlowLocalRecoTask = cms.Task(particleFlowClusterTask)
-hiParticleFlowLocalReco = cms.Sequence(hiParticleFlowLocalRecoTask)
-
-particleFlowTmpTask = cms.Task(particleFlowTmp)
-particleFlowTmpSeq = cms.Sequence(particleFlowTmpTask)
-
-#PF Reco runs after electrons
-hiParticleFlowRecoTask = cms.Task( pfGsfElectronMVASelectionTask
- , particleFlowBlock
- , particleFlowEGammaFullTask
- , photonIsolationHIProducerGED
- , particleFlowTmpTask
- , fixedGridRhoFastjetAllTmp
- , particleFlowTmpPtrs
- , particleFlowEGammaFinalTask
- , pfParticleSelectionTask
- )
-hiParticleFlowReco = cms.Sequence(hiParticleFlowRecoTask)
-
-particleFlowLinksTask = cms.Task( particleFlow,particleFlowPtrs,chargedHadronPFTrackIsolation,particleBasedIsolationTask)
-particleFlowLinks = cms.Sequence(particleFlowLinksTask)
diff --git a/RecoHI/Configuration/python/customise_PF.py b/RecoHI/Configuration/python/customise_PF.py
deleted file mode 100644
index 6c96201cf5a00..0000000000000
--- a/RecoHI/Configuration/python/customise_PF.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-def customise(process):
-
- # Customize process to run PF *without* electrons
-
- # add particle flow local reconstruction
- process.load("RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff")
- process.localReco += process.particleFlowCluster
-
- process.load("RecoParticleFlow.PFTracking.pfTrack_cfi")
- process.pfTrack.UseQuality = cms.bool(True)
- process.pfTrack.TrackQuality = cms.string('highPurity')
- process.pfTrack.TkColList = cms.VInputTag("hiGeneralTracks")
- process.pfTrack.PrimaryVertexLabel = cms.InputTag("hiSelectedVertex")
- process.pfTrack.MuColl = cms.InputTag("hiMuons1stStep")
- process.pfTrack.GsfTracksInEvents = cms.bool(False)
-
- # run a trimmed down PF sequence with heavy-ion vertex, no conversions, nucl int, etc.
- process.load("RecoParticleFlow.Configuration.RecoParticleFlow_cff")
-
- process.particleFlowBlock.useConvBremPFRecTracks = cms.bool(False)
- process.particleFlowBlock.useIterTracking = cms.bool(False)
- process.particleFlowBlock.useNuclear = cms.bool(False)
- process.particleFlowBlock.useConversions = cms.bool(False)
-
- process.particleFlowTmp.vertexCollection = cms.InputTag("hiSelectedVertex")
- process.particleFlowTmp.muons = cms.InputTag("hiMuons1stStep")
- process.particleFlowTmp.usePFConversions = cms.bool(False)
-
- process.electronsCiCLoose.verticesCollection = cms.InputTag("hiSelectedVertex")
-
- # define new high-level RECO sequence and add to top-level sequence
- process.highLevelRecoPbPb = cms.Sequence(process.pfTrack
- * process.pfGsfElectronCiCSelectionSequence
- * process.particleFlowBlock
- * process.particleFlowTmp
- )
-
- process.reconstructionHeavyIons *= process.highLevelRecoPbPb
-
- return process
diff --git a/RecoHI/Configuration/python/peripheralHLTFilter_cff.py b/RecoHI/Configuration/python/peripheralHLTFilter_cff.py
deleted file mode 100644
index e7794cb7b389b..0000000000000
--- a/RecoHI/Configuration/python/peripheralHLTFilter_cff.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import HLTrigger.HLTfilters.hltHighLevel_cfi
-hltPerhiphHI = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone(
- HLTPaths = ["HLT_HISinglePhoton*_Eta*_Cent50_100_*",
- "HLT_HISinglePhoton*_Eta*_Cent30_100_*",
- "HLT_HIFullTrack*_L1Centrality30100_*",
- "HLT_HIPuAK4CaloJet*_Eta5p1_Cent50_100_v*",
- "HLT_HIPuAK4CaloJet*_Eta5p1_Cent30_100_v*",
- "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent50_100_v*",
- "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent30_100_v*",
- "HLT_HIL1Centralityext30100MinimumumBiasHF*",
- "HLT_HIL1Centralityext50100MinimumumBiasHF*",
- "HLT_HIQ2*005_Centrality3050_v*",
- "HLT_HIQ2*005_Centrality5070_v*",
- "HLT_HICastor*",
- "HLT_HIL1Castor*",
- "HLT_HIUPC*"],
- throw = False,
- andOr = True
-)
-
-peripheralHLTFilterSequence = cms.Sequence( hltPerhiphHI )
diff --git a/RecoHI/HiEgammaAlgos/python/HiEgammaPostPF_cff.py b/RecoHI/HiEgammaAlgos/python/HiEgammaPostPF_cff.py
deleted file mode 100644
index 96546c27f1c00..0000000000000
--- a/RecoHI/HiEgammaAlgos/python/HiEgammaPostPF_cff.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from RecoEgamma.EgammaIsolationAlgos.interestingEgammaIsoDetIdsSequence_cff import *
-from RecoEgamma.PhotonIdentification.photonId_cff import *
-from RecoEgamma.ElectronIdentification.electronIdSequence_cff import *
-from RecoEgamma.EgammaHFProducers.hfEMClusteringSequence_cff import *
-from RecoEgamma.EgammaIsolationAlgos.egmIsolationDefinitions_cff import *
-
-
-eidRobustLoose.verticesCollection = "hiSelectedVertex"
-eidRobustTight.verticesCollection = "hiSelectedVertex"
-eidRobustHighEnergy.verticesCollection = "hiSelectedVertex"
-eidLoose.verticesCollection = "hiSelectedVertex"
-eidTight.verticesCollection = "hiSelectedVertex"
-hfRecoEcalCandidate.VertexCollection = "hiSelectedVertex"
-
-egammaHighLevelRecoPostPFTask = cms.Task(interestingEgammaIsoDetIdsTask,egmIsolationTask,photonIDTask,photonIDTaskGED,eIdTask,hfEMClusteringTask)
-egammaHighLevelRecoPostPF = cms.Sequence(egammaHighLevelRecoPostPFTask)
diff --git a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py
deleted file mode 100644
index 0165aee2305ea..0000000000000
--- a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# clustering sequence
-from RecoHI.HiEgammaAlgos.HiIslandClusteringSequence_cff import *
-from RecoEcal.EgammaClusterProducers.hybridClusteringSequence_cff import *
-from RecoEcal.EgammaClusterProducers.multi5x5ClusteringSequence_cff import *
-from RecoEcal.EgammaClusterProducers.multi5x5PreshowerClusteringSequence_cff import *
-from RecoEcal.EgammaClusterProducers.preshowerClusteringSequence_cff import *
-from RecoHI.HiEgammaAlgos.HiIsolationCommonParameters_cff import *
-from RecoEcal.EgammaClusterProducers.particleFlowSuperClusterECAL_cfi import *
-
-particleFlowSuperClusterECAL.regressionConfig.vertexCollection = 'hiSelectedVertex'
-
-hiEcalClusteringTask = cms.Task(islandClusteringTask,hybridClusteringTask,multi5x5ClusteringTask,multi5x5PreshowerClusteringTask,preshowerClusteringTask,particleFlowSuperClusterECAL)
-hiEcalClusteringSequence = cms.Sequence(hiEcalClusteringTask)
-
-
-# reco photon producer
-from RecoEgamma.EgammaPhotonProducers.photonSequence_cff import *
-
-# use island for the moment
-photonCore.scHybridBarrelProducer = "correctedIslandBarrelSuperClusters"
-photonCore.scIslandEndcapProducer = "correctedIslandEndcapSuperClusters"
-photonCore.minSCEt = 8.0
-photons.minSCEtBarrel = 5.0
-photons.minSCEtEndcap = 15.0
-photons.minR9Barrel = 10. #0.94
-photons.minR9Endcap = 10. #0.95
-photons.maxHoverEEndcap = 0.5 #0.5
-photons.maxHoverEBarrel = 0.99 #0.5
-photons.primaryVertexProducer = 'hiSelectedVertex' # replace the primary vertex
-photons.isolationSumsCalculatorSet.trackProducer = isolationInputParameters.track # cms.InputTag("highPurityTracks")
-
-from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
-hiPhotonTask = cms.Task(photonTask,photonIsolationHIProducer)
-hiPhotonSequence = cms.Sequence(hiPhotonTask)
-
-# HI Ecal reconstruction
-hiEcalClustersTask = cms.Task(hiEcalClusteringTask)
-hiEcalClusters = cms.Sequence(hiEcalClustersTask)
-hiEgammaTask = cms.Task(hiPhotonTask)
-hiEgammaSequence = cms.Sequence(hiEgammaTask)
-
-# HI Spike Clean Sequence
-import RecoHI.HiEgammaAlgos.hiSpikeCleaner_cfi
-hiSpikeCleanedSC = RecoHI.HiEgammaAlgos.hiSpikeCleaner_cfi.hiSpikeCleaner.clone()
-cleanPhotonCore = photonCore.clone(
- scHybridBarrelProducer = "hiSpikeCleanedSC"
-)
-cleanPhotons = photons.clone(
- photonCoreProducer = cms.InputTag("cleanPhotonCore")
-)
-
-hiPhotonCleaningTask = cms.Task(hiSpikeCleanedSC,
- cleanPhotonCore,
- cleanPhotons)
-hiPhotonCleaningSequence = cms.Sequence(hiPhotonCleaningTask)
diff --git a/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py b/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py
deleted file mode 100644
index 259fd7f9f714c..0000000000000
--- a/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-
-# creates the recoGsfTracks_electronGsfTracks__RECO = input GSF tracks
-from TrackingTools.GsfTracking.GsfElectronTracking_cff import *
-ecalDrivenElectronSeeds.initialSeedsVector = ["hiPixelTrackSeeds"]
-electronCkfTrackCandidates.src = "ecalDrivenElectronSeeds"
-
-ecalDrivenElectronSeeds.maxHOverEBarrel = 0.25
-ecalDrivenElectronSeeds.maxHOverEEndcaps = 0.25
-
-electronGsfTrackingHiTask = cms.Task(ecalDrivenElectronSeeds ,
- electronCkfTrackCandidates ,
- electronGsfTracks)
-
-from RecoEgamma.EgammaElectronProducers.gsfElectronSequence_cff import *
-
-ecalDrivenGsfElectrons.ctfTracksTag = "hiGeneralTracks"
-ecalDrivenGsfElectronCores.ctfTracks = "hiGeneralTracks"
-ecalDrivenGsfElectrons.vtxTag = "hiSelectedVertex"
-
-ecalDrivenGsfElectrons.preselection.maxHOverEBarrelCone = 0.25
-ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsCone = 0.25
-ecalDrivenGsfElectrons.preselection.maxHOverEBarrelBc = 0.
-ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsBc = 0.
-ecalDrivenGsfElectrons.fillConvVtxFitProb = False
-
-
-from RecoParticleFlow.PFTracking.pfTrack_cfi import *
-pfTrack.UseQuality = True
-pfTrack.TrackQuality = 'highPurity'
-pfTrack.TkColList = ["hiGeneralTracks"]
-pfTrack.PrimaryVertexLabel = "hiSelectedVertex"
-pfTrack.MuColl = "hiMuons1stStep"
-
-from RecoParticleFlow.PFTracking.pfTrackElec_cfi import *
-pfTrackElec.applyGsfTrackCleaning = True
-pfTrackElec.PrimaryVertexLabel = "hiSelectedVertex"
-
-hiElectronTask = cms.Task(electronGsfTrackingHiTask ,
- pfTrack ,
- pfTrackElec ,
- gsfEcalDrivenElectronTask
- )
-hiElectronSequence = cms.Sequence(hiElectronTask)
diff --git a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py
deleted file mode 100644
index 72a10eb316d9f..0000000000000
--- a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# AOD content
-RecoHiEgammaAOD = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep floatedmValueMap_*_*_*',
- 'keep recoGsfElectrons_gedGsfElectronsTmp_*_*',
- 'keep recoSuperClusters_correctedIslandBarrelSuperClusters_*_*',
- 'keep recoSuperClusters_correctedIslandEndcapSuperClusters_*_*',
- 'keep recoPhotons_gedPhotonsTmp_*_*',
- 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducer_*_*',
- 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerGED_*_*',
- 'keep recoElectronSeeds_ecalDrivenElectronSeeds_*_*',
- 'keep recoTrackExtras_electronGsfTracks_*_*')
-)
-
-# RECO content
-RecoHiEgammaRECO = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep recoSuperClusters_cleanedHybridSuperClusters_*_*',
- 'keep recoSuperClusters_correctedEndcapSuperClustersWithPreshower_*_*',
- 'keep recoSuperClusters_correctedHybridSuperClusters_*_*',
- 'keep recoSuperClusters_correctedMulti5x5SuperClustersWithPreshower_*_*',
- 'keep recoSuperClusters_hybridSuperClusters_*_*',
- 'keep recoSuperClusters_islandSuperClusters_*_*',
- 'keep recoSuperClusters_mergedSuperClusters_*_*',
- 'keep recoSuperClusters_multi5x5SuperClusters_*_*',
- 'keep recoSuperClusters_multi5x5SuperClustersCleaned_*_*',
- 'keep recoSuperClusters_multi5x5SuperClustersUncleaned_*_*',
- 'keep recoSuperClusters_multi5x5SuperClustersWithPreshower_*_*',
- 'keep recoSuperClusters_particleFlowEGamma_*_*',
- 'keep recoSuperClusters_particleFlowSuperClusterECAL_*_*',
- 'keep recoSuperClusters_uncleanedHybridSuperClusters_*_*',
- 'keep recoSuperClusters_uncleanedOnlyCorrectedHybridSuperClusters_*_*',
- 'keep recoSuperClusters_uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower_*_*',
- 'keep recoSuperClusters_uncleanedOnlyMulti5x5SuperClustersWithPreshower_*_*',
- 'keep recoCaloClusters_particleFlowEGamma_*_*',
- 'keep recoCaloClusters_cleanedHybridSuperClusters_*_*',
- 'keep recoCaloClusters_hybridSuperClusters_*_*',
- 'keep recoCaloClusters_uncleanedHybridSuperClusters_*_*',
- 'keep recoCaloClusters_islandBasicClusters_*_*',
- 'keep recoCaloClusters_multi5x5BasicClustersCleaned_*_*',
- 'keep recoCaloClusters_multi5x5BasicClustersUncleaned_*_*',
- 'keep recoCaloClusters_multi5x5SuperClusters_*_*',
- 'keep recoCaloClusters_particleFlowSuperClusterECAL_*_*',
- 'keep recoCaloClusters_multi5x5SuperClusters_*_*',
- 'keep EcalRecHitsSorted_ecalRecHit_*_*',
- 'keep EcalRecHitsSorted_ecalPreshowerRecHit_*_*',
- 'keep EBSrFlagsSorted_ecalDigis__*',
- 'keep EESrFlagsSorted_ecalDigis__*',
- 'keep recoPFCandidates_particleFlowEGamma_*_*',
- 'keep recoPFCandidates_particleFlowTmp_*_*',
- 'keep recoGsfElectrons_ecalDrivenGsfElectrons_*_*',
- 'keep recoGsfElectrons_electronsWithPresel_*_*',
- 'keep recoGsfElectrons_gedGsfElectronsTmp_*_*',
- 'keep recoGsfElectrons_mvaElectrons_*_*')
-)
-RecoHiEgammaRECO.outputCommands.extend(RecoHiEgammaAOD.outputCommands)
-
-# FEVT content
-RecoHiEgammaFEVT = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep recoSuperClusters_*_*_*',
- 'keep recoCaloClusters_*_*_*',
- 'keep EcalRecHitsSorted_*_*_*',
- 'keep recoPFCandidates_*_*_*',
- 'keep recoElectronSeeds_*_*_*',
- 'keep recoGsfElectrons_*_*_*')
-)
-RecoHiEgammaFEVT.outputCommands.extend(RecoHiEgammaRECO.outputCommands)
diff --git a/RecoHI/HiJetAlgos/python/RecoHiJets_EventContent_cff.py b/RecoHI/HiJetAlgos/python/RecoHiJets_EventContent_cff.py
deleted file mode 100644
index 51a3247abdf4b..0000000000000
--- a/RecoHI/HiJetAlgos/python/RecoHiJets_EventContent_cff.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# AOD content
-RecoHiJetsAOD = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep *_ak4CaloJets_*_*',
- 'keep *_akPu3CaloJets_*_*',
- 'keep *_akPu4CaloJets_*_*',
- 'keep *_akPu5CaloJets_*_*',
- 'keep *_iterativeConePu5CaloJets_*_*',
- 'keep *_ak4PFJets_*_*',
- 'keep *_akPu3PFJets_*_*',
- 'keep *_akPu4PFJets_*_*',
- 'keep *_akPu5PFJets_*_*',
- 'keep *_akCs3PFJets_*_*',
- 'keep *_akCs4PFJets_*_*',
- 'keep *_*HiGenJets_*_*',
- 'keep *_*PFTowers_*_*',
- 'keep *_*hiFJRhoProducer_*_*',
- 'keep CaloTowersSorted_towerMaker_*_*',
- 'keep recoPFCandidates_particleFlowTmp_*_*')
-)
-
-# RECO content
-RecoHiJetsRECO = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep *_kt4PFJetsForRho_*_*')
-)
-RecoHiJetsRECO.outputCommands.extend(RecoHiJetsAOD.outputCommands)
-
-#Full Event content
-RecoHiJetsFEVT = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep *_*CaloJets_*_*',
- 'keep *_*PFJets_*_*')
-)
-RecoHiJetsFEVT.outputCommands.extend(RecoHiJetsRECO.outputCommands)
diff --git a/RecoHI/HiJetAlgos/python/hiCaloJetsForTrk_cff.py b/RecoHI/HiJetAlgos/python/hiCaloJetsForTrk_cff.py
deleted file mode 100644
index cb5d95fb87116..0000000000000
--- a/RecoHI/HiJetAlgos/python/hiCaloJetsForTrk_cff.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from RecoLocalCalo.CaloTowersCreator.calotowermaker_cfi import calotowermaker
-from RecoHI.HiJetAlgos.HiRecoJets_cff import akPu4CaloJets
-from JetMETCorrections.Configuration.CorrectedJetProducersDefault_cff import ak4CaloJetsL2L3, ak4CaloL2L3Corrector, ak4CaloL2RelativeCorrector, ak4CaloL3AbsoluteCorrector
-
-hiCaloTowerForTrk = calotowermaker.clone( hbheInput = 'hbheprereco')
-akPu4CaloJetsForTrk = akPu4CaloJets.clone( srcPVs = 'hiSelectedPixelVertex', src = 'hiCaloTowerForTrk')
-
-akPu4CaloJetsCorrected = ak4CaloJetsL2L3.clone(
- src = "akPu4CaloJetsForTrk"
-)
-
-akPu4CaloJetsSelected = cms.EDFilter( "LargestEtCaloJetSelector",
- src = cms.InputTag( "akPu4CaloJetsCorrected" ),
- filter = cms.bool( False ),
- maxNumber = cms.uint32( 4 )
-)
-
-hiCaloJetsForTrkTask = cms.Task(hiCaloTowerForTrk,akPu4CaloJetsForTrk,akPu4CaloJetsCorrected,akPu4CaloJetsSelected,ak4CaloL2L3Corrector,ak4CaloL2RelativeCorrector,ak4CaloL3AbsoluteCorrector)
diff --git a/RecoHI/HiMuonAlgos/plugins/BuildFile.xml b/RecoHI/HiMuonAlgos/plugins/BuildFile.xml
deleted file mode 100644
index b8032f35afcdb..0000000000000
--- a/RecoHI/HiMuonAlgos/plugins/BuildFile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h b/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h
deleted file mode 100644
index 264c71106527d..0000000000000
--- a/RecoHI/HiMuonAlgos/plugins/HIMuonTrackingRegionProducer.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef RecoHI_HiTracking_HIMuonTrackingRegionProducer_H
-#define RecoHI_HiTracking_HIMuonTrackingRegionProducer_H
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h"
-#include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h"
-#include "RecoMuon/GlobalTrackingTools/interface/MuonTrackingRegionBuilder.h"
-
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-
-class HIMuonTrackingRegionProducer : public TrackingRegionProducer {
-public:
- HIMuonTrackingRegionProducer(const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC) {
- // get parameters from PSet
- theMuonSource = cfg.getParameter("MuonSrc");
- theMuonSourceToken = iC.consumes(theMuonSource);
-
- // initialize region builder
- edm::ParameterSet regionBuilderPSet = cfg.getParameter("MuonTrackingRegionBuilder");
- theRegionBuilder = new MuonTrackingRegionBuilder(regionBuilderPSet, iC);
-
- // initialize muon service proxy
- edm::ParameterSet servicePSet = cfg.getParameter("ServiceParameters");
- }
-
- ~HIMuonTrackingRegionProducer() override {}
-
- static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
- edm::ParameterSetDescription desc;
-
- desc.add("MuonSrc", edm::InputTag(""));
-
- edm::ParameterSetDescription descRegion;
- MuonTrackingRegionBuilder::fillDescriptionsOffline(descRegion);
- desc.add("MuonTrackingRegionBuilder", descRegion);
-
- edm::ParameterSetDescription descService;
- descService.setAllowAnything();
- desc.add("ServiceParameters", descService);
-
- descriptions.add("HiTrackingRegionEDProducer", desc);
- }
-
- std::vector > regions(const edm::Event& ev,
- const edm::EventSetup& es) const override {
- // initialize output vector of tracking regions
- std::vector > result;
-
- // initialize the region builder
- theRegionBuilder->setEvent(ev, es);
-
- // get stand-alone muon collection
- edm::Handle muonH;
- ev.getByToken(theMuonSourceToken, muonH);
-
- // loop over all muons and add a tracking region for each
- // that passes the requirements specified to theRegionBuilder
- unsigned int nMuons = muonH->size();
- //std::cout << "there are " << nMuons << " muon(s)" << std::endl;
-
- // TO DO: this can be extended further to a double-loop
- // over all combinations of muons, returning tracking regions
- // for pairs that pass some loose invariant mass cuts
- for (unsigned int imu = 0; imu < nMuons; imu++) {
- reco::TrackRef muRef(muonH, imu);
- //std::cout << "muon #" << imu << ": pt=" << muRef->pt() << std::endl;
- result.push_back(theRegionBuilder->region(muRef));
- }
-
- return result;
- }
-
-private:
- edm::InputTag theMuonSource;
- edm::EDGetTokenT theMuonSourceToken;
- MuonTrackingRegionBuilder* theRegionBuilder;
-};
-
-#endif
diff --git a/RecoHI/HiMuonAlgos/plugins/SealModule.cc b/RecoHI/HiMuonAlgos/plugins/SealModule.cc
deleted file mode 100644
index 886f185058719..0000000000000
--- a/RecoHI/HiMuonAlgos/plugins/SealModule.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/SourceFactory.h"
-
-using namespace cms;
-
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducerFactory.h"
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h"
-#include "HIMuonTrackingRegionProducer.h"
-DEFINE_EDM_PLUGIN(TrackingRegionProducerFactory, HIMuonTrackingRegionProducer, "HIMuonTrackingRegionProducer");
-
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionEDProducerT.h"
-using HIMuonTrackingRegionEDProducer = TrackingRegionEDProducerT;
-DEFINE_FWK_MODULE(HIMuonTrackingRegionEDProducer);
diff --git a/RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py b/RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py
deleted file mode 100644
index 05bc5b90ce2be..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from RecoMuon.Configuration.RecoMuonPPonly_cff import *
-
-hiTracks = 'hiGeneralTracks' #heavy ion track label
-
-# replace with heavy ion track label
-hiMuons1stStep = muons1stStep.clone(
- inputCollectionLabels = [hiTracks, 'globalMuons', 'standAloneMuons:UpdatedAtVtx','tevMuons:firstHit','tevMuons:picky','tevMuons:dyt'],
- inputCollectionTypes = ['inner tracks', 'links', 'outer tracks','tev firstHit', 'tev picky', 'tev dyt'],
- TrackExtractorPSet = dict(inputTrackCollection = hiTracks),
- minPt = 0.8,
- #iso deposits are not used in HI
- writeIsoDeposits = False,
- #fillGlobalTrackRefits = False
-)
-
-muonEcalDetIds.inputCollection = "hiMuons1stStep"
-muIsoDepositTk.inputTags = ["hiMuons1stStep:tracker"]
-muIsoDepositJets.inputTags = ["hiMuons1stStep:jets"]
-muIsoDepositCalByAssociatorTowers.inputTags = ["hiMuons1stStep:ecal", "hiMuons1stStep:hcal", "hiMuons1stStep:ho"]
-muonShowerInformation.muonCollection = "hiMuons1stStep"
-
-#don't modify somebody else's sequence, create a new one if needed
-#standalone muon tracking is already done... so remove standalonemuontracking from muontracking
-from FWCore.ParameterSet.SequenceTypes import ModuleNodeVisitor
-_excludes=[]
-_visitor=ModuleNodeVisitor(_excludes)
-standalonemuontracking.visit(_visitor)
-displacedGlobalMuonTracking.visit(_visitor)
-muonreco_plus_isolation_PbPbTask = muonreco_plus_isolationTask.copyAndExclude(_excludes)
-
-muonreco_plus_isolation_PbPbTask.replace(muons1stStep, hiMuons1stStep)
-#iso deposits are not used in HI
-muonreco_plus_isolation_PbPbTask.remove(muIsoDeposits_muonsTask)
-muonreco_plus_isolation_PbPb = cms.Sequence(muonreco_plus_isolation_PbPbTask)
-
-globalMuons.TrackerCollectionLabel = hiTracks
-
-# replace with heavy ion jet label
-hiMuons1stStep.JetExtractorPSet.JetCollectionLabel = "iterativeConePu5CaloJets"
-
-# turn off calo muons for timing considerations
-hiMuons1stStep.minPCaloMuon = 1.0E9
-
-# high level reco
-from RecoMuon.MuonIdentification.muons_cfi import muons
-muons = muons.clone(
- InputMuons = "hiMuons1stStep",
- PFCandidates = "particleFlowTmp",
- FillDetectorBasedIsolation = False,
- FillPFIsolation = False,
- FillSelectorMaps = False,
- FillShoweringInfo = False,
- FillCosmicsIdMap = False,
- vertices = "hiSelectedVertex"
-)
-muonRecoHighLevelPbPbTask = cms.Task(muons)
-
-# HI muon sequence (passed to RecoHI.Configuration.Reconstruction_HI_cff)
-muonRecoPbPbTask = cms.Task(muonreco_plus_isolation_PbPbTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegionalRecoMuon_cff.py b/RecoHI/HiMuonAlgos/python/HiRegionalRecoMuon_cff.py
deleted file mode 100644
index 22a2deba440b6..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegionalRecoMuon_cff.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from RecoMuon.Configuration.RecoMuonPPonly_cff import *
-from RecoHI.HiMuonAlgos.hiMuonIterativeTk_cff import *
-
-# pretty much everything is as the pp sequence
-hiReMuTracks = "hiGeneralAndRegitMuTracks"
-
-# global muon track
-reglobalMuons = globalMuons.clone(
- TrackerCollectionLabel = hiReMuTracks
-)
-# tevMuons tracks
-retevMuons = tevMuons.clone(
- MuonCollectionLabel = "reglobalMuons"
-)
-
-# trackquality collections
-reglbTrackQual = glbTrackQual.clone(
- InputCollection = "reglobalMuons",
- InputLinksCollection = "reglobalMuons"
-)
-
-#recoMuons
-remuons = muons1stStep.clone(
- inputCollectionLabels = [hiReMuTracks, 'reglobalMuons', 'standAloneMuons:UpdatedAtVtx','retevMuons:firstHit','retevMuons:picky','retevMuons:dyt'],
- globalTrackQualityInputTag = 'reglbTrackQual',
- JetExtractorPSet = dict( JetCollectionLabel = "iterativeConePu5CaloJets"),
- TrackExtractorPSet = dict( inputTrackCollection = hiReMuTracks),
- minPt = 0.8
-)
-remuonEcalDetIds = muonEcalDetIds.clone(
- inputCollection = "remuons"
-)
-#muons.fillGlobalTrackRefits = False
-
-# deposits
-remuIsoDepositTk = muIsoDepositTk.clone(
- inputTags = ["remuons:tracker"]
-)
-remuIsoDepositJets = muIsoDepositJets.clone(
- inputTags = ["remuons:jets"]
-)
-remuIsoDepositCalByAssociatorTowers = muIsoDepositCalByAssociatorTowers.clone(
- inputTags = ["remuons:ecal", "remuons:hcal", "remuons:ho"]
-)
-remuonShowerInformation = muonShowerInformation.clone(
- muonCollection = "remuons"
-)
-# replace the new names
-
-remuonIdProducerTask = cms.Task(reglbTrackQual,remuons,remuonEcalDetIds,remuonShowerInformation)
-remuIsoDeposits_muonsTask = cms.Task(remuIsoDepositTk,remuIsoDepositCalByAssociatorTowers,remuIsoDepositJets)
-remuIsolation_muonsTask = cms.Task(remuIsoDeposits_muonsTask)
-remuIsolationTask = cms.Task(remuIsolation_muonsTask)
-#run this if there are no STA muons in events
-muontrackingTask = cms.Task(standAloneMuonSeedsTask , standAloneMuons , hiRegitMuTrackingTask , reglobalMuons)
-
-#the default setting assumes the STA is already in the event
-muontracking_reTask = cms.Task(hiRegitMuTrackingTask , reglobalMuons)
-muontracking_with_TeVRefinement_reTask = cms.Task(muontracking_reTask , retevMuons)
-muonreco_reTask = cms.Task(muontracking_reTask , remuonIdProducerTask)
-muonreco_re = cms.Sequence(muonreco_reTask)
-muonrecowith_TeVRefinemen_reTask = cms.Task(muontracking_with_TeVRefinement_reTask , remuonIdProducerTask)
-muonrecowith_TeVRefinemen_re = cms.Sequence(muonrecowith_TeVRefinemen_reTask)
-muonreco_plus_isolation_reTask = cms.Task(muonrecowith_TeVRefinemen_reTask , remuIsolationTask)
-muonreco_plus_isolation_re = cms.Sequence(muonreco_plus_isolation_reTask)
-
-reMuonTrackRecoPbPb = cms.Sequence(muontracking_reTask)
-# HI muon sequence (passed to RecoHI.Configuration.Reconstruction_HI_cff)
-regionalMuonRecoPbPb = cms.Sequence(muonreco_plus_isolation_reTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
deleted file mode 100644
index 99d3eba335fda..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
+++ /dev/null
@@ -1,158 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-###################################################################################
-# pp iterative tracking modified for hiOffline reco (the vertex is the one reconstructed in HI)
-################################### 3rd step: low-pT and displaced tracks from pixel triplets
-
-from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-# Are the following values set to the same in every iteration? If yes,
-# why not making the change in HITrackingRegionProducer_cfi directly
-# once for all?
-hiRegitMuDetachedTripletStepTrackingRegions = HiTrackingRegionFactoryFromSTAMuonsEDProducer.clone(
- MuonSrc = "standAloneMuons:UpdatedAtVtx", # this is the same as default, why repeat?
- MuonTrackingRegionBuilder = dict(
- vertexCollection = "hiSelectedPixelVertex",
- UseVertex = True,
- Phi_fixed = True,
- Eta_fixed = True,
- DeltaPhi = 0.3,
- DeltaEta = 0.2,
- # Ok, the following ones are specific to DetachedTripletStep
- Pt_min = 0.9,
- DeltaR = 2.0, # default = 0.2
- DeltaZ = 2.0, # this give you the length
- Rescale_Dz = 4., # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
- )
-)
-
-###################################
-import RecoTracker.IterativeTracking.DetachedTripletStep_cff
-
-# NEW CLUSTERS (remove previously used clusters)
-from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import trackClusterRemover as _trackClusterRemover
-hiRegitMuDetachedTripletStepClusters = _trackClusterRemover.clone(
- maxChi2 = 9.0,
- pixelClusters = "siPixelClusters",
- stripClusters = "siStripClusters",
- trajectories = "hiRegitMuPixelLessStepTracks",
- overrideTrkQuals = 'hiRegitMuPixelLessStepSelector:hiRegitMuPixelLessStep',
- TrackQuality = 'tight',
- trackClassifier = '',
- minNumberOfLayersWithMeasBeforeFiltering = 0
-)
-
-
-# SEEDING LAYERS
-hiRegitMuDetachedTripletStepSeedLayers = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSeedLayers.clone(
- BPix = dict( skipClusters = 'hiRegitMuDetachedTripletStepClusters'),
- FPix = dict( skipClusters = 'hiRegitMuDetachedTripletStepClusters')
-)
-
-# seeding
-hiRegitMuDetachedTripletStepHitDoublets = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepHitDoublets.clone(
- seedingLayers = "hiRegitMuDetachedTripletStepSeedLayers",
- trackingRegions = "hiRegitMuDetachedTripletStepTrackingRegions",
- clusterCheck = "hiRegitMuClusterCheck",
-)
-
-hiRegitMuDetachedTripletStepHitTriplets = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepHitTriplets.clone(
- doublets = "hiRegitMuDetachedTripletStepHitDoublets"
-)
-
-hiRegitMuDetachedTripletStepSeeds = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSeeds.clone(
- seedingHitSets = "hiRegitMuDetachedTripletStepHitTriplets"
-)
-from RecoTracker.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
-
-
-# building: feed the new-named seeds
-hiRegitMuDetachedTripletStepTrajectoryFilterBase = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilterBase.clone(
- minPt = 0.8 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = 3,
-)
-
-hiRegitMuDetachedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilter.clone(
- filters = cms.VPSet(
- cms.PSet( refToPSet_ = cms.string('hiRegitMuDetachedTripletStepTrajectoryFilterBase')),
- cms.PSet( refToPSet_ = cms.string('detachedTripletStepTrajectoryFilterShape')))
-)
-
-hiRegitMuDetachedTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryBuilder.clone(
- clustersToSkip = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
-)
-
-hiRegitMuDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff._detachedTripletStepTrackCandidatesCkf.clone(
- src = 'hiRegitMuDetachedTripletStepSeeds',
- clustersToSkip = 'hiRegitMuDetachedTripletStepClusters'
-)
-
-# fitting: feed new-names
-hiRegitMuDetachedTripletStepTracks = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTracks.clone(
- AlgorithmName = 'hiRegitMuDetachedTripletStep',
- src = 'hiRegitMuDetachedTripletStepTrackCandidates'
-)
-
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuDetachedTripletStepSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src = 'hiRegitMuDetachedTripletStepTracks',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter7',
- GBRForestVars = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuDetachedTripletStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuDetachedTripletStepTight',
- preFilterName = 'hiRegitMuDetachedTripletStepLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuDetachedTripletStep',
- preFilterName = 'hiRegitMuDetachedTripletStepTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.09
- )
- ) #end of vpset
-)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuDetachedTripletStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuDetachedTripletStepTight',
- preFilterName = 'hiRegitMuDetachedTripletStepLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuDetachedTripletStep',
- preFilterName = 'hiRegitMuDetachedTripletStepTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.09
- )
- )
-)
-
-hiRegitMuonDetachedTripletStepTask = cms.Task(hiRegitMuDetachedTripletStepClusters,
- hiRegitMuDetachedTripletStepSeedLayers,
- hiRegitMuDetachedTripletStepTrackingRegions,
- hiRegitMuDetachedTripletStepHitDoublets,
- hiRegitMuDetachedTripletStepHitTriplets,
- hiRegitMuDetachedTripletStepSeeds,
- hiRegitMuDetachedTripletStepTrackCandidates,
- hiRegitMuDetachedTripletStepTracks,
- hiRegitMuDetachedTripletStepSelector
- )
-hiRegitMuonDetachedTripletStep = cms.Sequence(hiRegitMuonDetachedTripletStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py
deleted file mode 100644
index 0d62dcb9cd7b5..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py
+++ /dev/null
@@ -1,143 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# pp iterative tracking modified for hiOffline reco (the vertex is the one reconstructed in HI)
-################################### 0st step:pixel-triplet seeding, high-pT;
-from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-# Are the following values set to the same in every iteration? If yes,
-# why not making the change in HITrackingRegionProducer_cfi directly
-# once for all?
-hiRegitMuInitialStepTrackingRegions = HiTrackingRegionFactoryFromSTAMuonsEDProducer.clone(
- MuonSrc = "standAloneMuons:UpdatedAtVtx", # this is the same as default, why repeat?
- MuonTrackingRegionBuilder = dict(
- vertexCollection = "hiSelectedPixelVertex",
- UseVertex = True,
- Phi_fixed = True,
- Eta_fixed = True,
- DeltaPhi = 0.3,
- DeltaEta = 0.2,
- # Ok, the following ones are specific to InitialStep
- Pt_min = 3.0,
- DeltaR = 1, # default = 0.2
- DeltaZ = 1, # this give you the length
- Rescale_Dz = 4., # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
- )
-)
-
-###################################
-import RecoTracker.IterativeTracking.InitialStep_cff
-from RecoTracker.IterativeTracking.InitialStep_cff import initialStepTrajectoryFilterShape,initialStepChi2Est
-
-# SEEDING LAYERS
-hiRegitMuInitialStepSeedLayers = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeedLayers.clone()
-
-# seeding
-hiRegitMuInitialStepHitDoublets = RecoTracker.IterativeTracking.InitialStep_cff.initialStepHitDoublets.clone(
- seedingLayers = "hiRegitMuInitialStepSeedLayers",
- trackingRegions = "hiRegitMuInitialStepTrackingRegions",
- clusterCheck = "hiRegitMuClusterCheck"
-)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuInitialStepHitDoublets, layerPairs = [0])
-
-hiRegitMuInitialStepHitTriplets = RecoTracker.IterativeTracking.InitialStep_cff.initialStepHitTriplets.clone(
- doublets = "hiRegitMuInitialStepHitDoublets"
-)
-hiRegitMuInitialStepSeeds = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeeds.clone(
- seedingHitSets = "hiRegitMuInitialStepHitTriplets"
-)
-
-# building: feed the new-named seeds
-hiRegitMuInitialStepTrajectoryFilterBase = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryFilterBase.clone(
- minPt = 2.5 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
-)
-hiRegitMuInitialStepTrajectoryFilter = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryFilter.clone(
- filters = cms.VPSet(
- cms.PSet( refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryFilterBase')),
- cms.PSet( refToPSet_ = cms.string('initialStepTrajectoryFilterShape')))
-)
-
-hiRegitMuInitialStepTrajectoryBuilder = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryBuilder.clone(
- trajectoryFilter = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryFilter')
- ),
-)
-
-# track candidates
-hiRegitMuInitialStepTrackCandidates = RecoTracker.IterativeTracking.InitialStep_cff._initialStepTrackCandidatesCkf.clone(
- src = 'hiRegitMuInitialStepSeeds',
- TrajectoryBuilderPSet = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')
- ),
- maxNSeeds = 1000000
-)
-
-# fitting: feed new-names
-hiRegitMuInitialStepTracks = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTracks.clone(
- AlgorithmName = 'hiRegitMuInitialStep',
- src = 'hiRegitMuInitialStepTrackCandidates'
-)
-
-
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuInitialStepSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src ='hiRegitMuInitialStepTracks',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter4',
- GBRForestVars = ['chi2perdofperlayer', 'dxyperdxyerror', 'dzperdzerror', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuInitialStepLoose',
- min_nhits = 8
- ), #end of pset
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuInitialStepTight',
- preFilterName = 'hiRegitMuInitialStepLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.38
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuInitialStep',
- preFilterName = 'hiRegitMuInitialStepTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.77
- ),
- ) #end of vpset
-)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuInitialStepSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuInitialStepLoose',
- min_nhits = 8
- ), #end of pset
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuInitialStepTight',
- preFilterName = 'hiRegitMuInitialStepLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.38
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuInitialStep',
- preFilterName = 'hiRegitMuInitialStepTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.77
- ),
- )
-)
-
-hiRegitMuonInitialStepTask = cms.Task(hiRegitMuInitialStepSeedLayers,
- hiRegitMuInitialStepTrackingRegions,
- hiRegitMuInitialStepHitDoublets,
- hiRegitMuInitialStepHitTriplets,
- hiRegitMuInitialStepSeeds,
- hiRegitMuInitialStepTrackCandidates,
- hiRegitMuInitialStepTracks,
- hiRegitMuInitialStepSelector)
-hiRegitMuonInitialStep = cms.Sequence(hiRegitMuonInitialStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py
deleted file mode 100644
index 248cc50164641..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py
+++ /dev/null
@@ -1,191 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-###################################################################################
-# pp iterative tracking modified for hiOffline reco (the vertex is the one reconstructed in HI)
-################################### 4th step: large impact parameter tracking using mixed-triplet seeding
-
-from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-# Are the following values set to the same in every iteration? If yes,
-# why not making the change in HITrackingRegionProducer_cfi directly
-# once for all?
-hiRegitMuMixedTripletStepTrackingRegionsA = HiTrackingRegionFactoryFromSTAMuonsEDProducer.clone(
- MuonSrc = "standAloneMuons:UpdatedAtVtx", # this is the same as default, why repeat?
- MuonTrackingRegionBuilder = dict(
- vertexCollection = "hiSelectedPixelVertex",
- UseVertex = True,
- Phi_fixed = True,
- Eta_fixed = True,
- DeltaPhi = 0.3,
- DeltaEta = 0.2,
- # Ok, the following ones are specific to MixedTripletStep
- Pt_min = 1.3,
- DeltaR = 0.5, # default = 0.2
- DeltaZ = 0.5, # this give you the length
- Rescale_Dz = 4., # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
- )
-)
-hiRegitMuMixedTripletStepTrackingRegionsB = hiRegitMuMixedTripletStepTrackingRegionsA.clone(
- MuonTrackingRegionBuilder = dict(Pt_min = 1.5)
-)
-
-###################################
-import RecoTracker.IterativeTracking.MixedTripletStep_cff
-from RecoTracker.IterativeTracking.MixedTripletStep_cff import mixedTripletStepTrajectoryBuilder,mixedTripletStepClusterShapeHitFilter,mixedTripletStepTrajectoryCleanerBySharedHits,mixedTripletStepChi2Est
-
-# NEW CLUSTERS (remove previously used clusters)
-hiRegitMuMixedTripletStepClusters = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepClusters.clone(
- oldClusterRemovalInfo = "hiRegitMuPixelPairStepClusters",
- trajectories = "hiRegitMuPixelPairStepTracks",
- overrideTrkQuals = 'hiRegitMuPixelPairStepSelector:hiRegitMuPixelPairStep',
- trackClassifier = '',
- TrackQuality = 'tight'
-)
-
-
-# SEEDING LAYERS A
-hiRegitMuMixedTripletStepSeedLayersA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone(
- BPix = dict(skipClusters = 'hiRegitMuMixedTripletStepClusters'),
- FPix = dict(skipClusters = 'hiRegitMuMixedTripletStepClusters'),
- TEC = dict(skipClusters = 'hiRegitMuMixedTripletStepClusters')
-)
-# SEEDS A
-hiRegitMuMixedTripletStepHitDoubletsA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepHitDoubletsA.clone(
- seedingLayers = "hiRegitMuMixedTripletStepSeedLayersA",
- trackingRegions = "hiRegitMuMixedTripletStepTrackingRegionsA",
- clusterCheck = "hiRegitMuClusterCheck",
-)
-hiRegitMuMixedTripletStepHitTripletsA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepHitTripletsA.clone(
- doublets = "hiRegitMuMixedTripletStepHitDoubletsA"
-)
-hiRegitMuMixedTripletStepSeedsA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedsA.clone(
- seedingHitSets = "hiRegitMuMixedTripletStepHitTripletsA"
-)
-
-# SEEDING LAYERS B
-hiRegitMuMixedTripletStepSeedLayersB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone(
- BPix = dict(skipClusters = 'hiRegitMuMixedTripletStepClusters'),
- TIB = dict(skipClusters = 'hiRegitMuMixedTripletStepClusters')
-)
-
-hiRegitMuMixedTripletStepHitDoubletsB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepHitDoubletsB.clone(
- seedingLayers = "hiRegitMuMixedTripletStepSeedLayersB",
- trackingRegions = "hiRegitMuMixedTripletStepTrackingRegionsB",
- clusterCheck = "hiRegitMuClusterCheck",
-)
-hiRegitMuMixedTripletStepHitTripletsB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepHitTripletsB.clone(
- doublets = "hiRegitMuMixedTripletStepHitDoubletsB"
-)
-hiRegitMuMixedTripletStepSeedsB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedsA.clone(
- seedingHitSets = "hiRegitMuMixedTripletStepHitTripletsB"
-)
-
-# combine seeds
-hiRegitMuMixedTripletStepSeeds = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeeds.clone(
- seedCollections = [
- 'hiRegitMuMixedTripletStepSeedsA',
- 'hiRegitMuMixedTripletStepSeedsB',
- ]
-)
-
-# track building
-hiRegitMuMixedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrajectoryFilter.clone(
- minPt = 1.,
- minimumNumberOfHits = 6,
- minHitsMinPt = 4
-)
-
- # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
-
-hiRegitMuMixedTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrajectoryBuilder.clone(
- trajectoryFilter = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuMixedTripletStepTrajectoryFilter')
- ),
- minNrOfHitsForRebuild = 6 #change from default 4
-)
-
-hiRegitMuMixedTripletStepTrackCandidates = RecoTracker.IterativeTracking.MixedTripletStep_cff._mixedTripletStepTrackCandidatesCkf.clone(
- src = 'hiRegitMuMixedTripletStepSeeds',
- TrajectoryBuilderPSet = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuMixedTripletStepTrajectoryBuilder')
- ),
- clustersToSkip = 'hiRegitMuMixedTripletStepClusters',
- maxNSeeds = 1000000
-)
-
-# fitting: feed new-names
-hiRegitMuMixedTripletStepTracks = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTracks.clone(
- AlgorithmName = 'hiRegitMuMixedTripletStep',
- src = 'hiRegitMuMixedTripletStepTrackCandidates',
-)
-
-# TRACK SELECTION AND QUALITY FLAG SETTING.
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuMixedTripletStepSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src = 'hiRegitMuMixedTripletStepTracks',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter7',
- GBRForestVars = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuMixedTripletStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuMixedTripletStepTight',
- preFilterName = 'hiRegitMuMixedTripletStepLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuMixedTripletStep',
- preFilterName = 'hiRegitMuMixedTripletStepTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.09
- )
- ) #end of vpset
-) #end of clone
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuMixedTripletStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuMixedTripletStepTight',
- preFilterName = 'hiRegitMuMixedTripletStepLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuMixedTripletStep',
- preFilterName = 'hiRegitMuMixedTripletStepTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.09
- )
- ) #end of vpset
-)
-
-hiRegitMuonMixedTripletStepTask = cms.Task(hiRegitMuMixedTripletStepClusters,
- hiRegitMuMixedTripletStepSeedLayersA,
- hiRegitMuMixedTripletStepTrackingRegionsA,
- hiRegitMuMixedTripletStepHitDoubletsA,
- hiRegitMuMixedTripletStepHitTripletsA,
- hiRegitMuMixedTripletStepSeedsA,
- hiRegitMuMixedTripletStepSeedLayersB,
- hiRegitMuMixedTripletStepTrackingRegionsB,
- hiRegitMuMixedTripletStepHitDoubletsB,
- hiRegitMuMixedTripletStepHitTripletsB,
- hiRegitMuMixedTripletStepSeedsB,
- hiRegitMuMixedTripletStepSeeds,
- hiRegitMuMixedTripletStepTrackCandidates,
- hiRegitMuMixedTripletStepTracks,
- hiRegitMuMixedTripletStepSelector)
-hiRegitMuonMixedTripletStep = cms.Sequence(hiRegitMuonMixedTripletStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py
deleted file mode 100644
index 72c97cdc4dae2..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py
+++ /dev/null
@@ -1,155 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# pp iterative tracking modified for hiOffline reco (the vertex is the one reconstructed in HI)
-################################### 5th step: large impact parameter tracking using TIB/TID/TEC stereo layer seeding
-
-from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-# Are the following values set to the same in every iteration? If yes,
-# why not making the change in HITrackingRegionProducer_cfi directly
-# once for all?
-hiRegitMuPixelLessStepTrackingRegions = HiTrackingRegionFactoryFromSTAMuonsEDProducer.clone(
- MuonSrc = "standAloneMuons:UpdatedAtVtx", # this is the same as default, why repeat?
- MuonTrackingRegionBuilder = dict(
- vertexCollection = "hiSelectedPixelVertex",
- UseVertex = True,
- Phi_fixed = True,
- Eta_fixed = True,
- # Ok, the following ones are specific to PixelLessStep
- DeltaPhi = 0.2,
- DeltaEta = 0.1,
- Pt_min = 2.0,
- DeltaR = 0.2, # default = 0.2
- DeltaZ = 0.2, # this give you the length
- Rescale_Dz = 4., # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
- )
-)
-
-###################################
-import RecoTracker.IterativeTracking.PixelLessStep_cff
-from RecoTracker.IterativeTracking.PixelLessStep_cff import pixelLessStepTrajectoryBuilder,pixelLessStepClusterShapeHitFilter,pixelLessStepTrajectoryCleanerBySharedHits,pixelLessStepChi2Est
-
-# remove previously used clusters
-hiRegitMuPixelLessStepClusters = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepClusters.clone(
- oldClusterRemovalInfo = "hiRegitMuMixedTripletStepClusters",
- trajectories = "hiRegitMuMixedTripletStepTracks",
- overrideTrkQuals = 'hiRegitMuMixedTripletStepSelector:hiRegitMuMixedTripletStep',
- trackClassifier = '',
- TrackQuality = 'tight'
-)
-
-# SEEDING LAYERS
-hiRegitMuPixelLessStepSeedLayers = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeedLayers.clone(
- TIB = dict(skipClusters = 'hiRegitMuPixelLessStepClusters'),
- TID = dict(skipClusters = 'hiRegitMuPixelLessStepClusters'),
- TEC = dict(skipClusters = 'hiRegitMuPixelLessStepClusters'),
- MTIB = dict(skipClusters = 'hiRegitMuPixelLessStepClusters'),
- MTID = dict(skipClusters = 'hiRegitMuPixelLessStepClusters'),
- MTEC = dict(skipClusters = 'hiRegitMuPixelLessStepClusters')
-)
-
-# seeding
-hiRegitMuPixelLessStepHitDoublets = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepHitDoublets.clone(
- seedingLayers = "hiRegitMuPixelLessStepSeedLayers",
- trackingRegions = "hiRegitMuPixelLessStepTrackingRegions",
- clusterCheck = "hiRegitMuClusterCheck",
-)
-hiRegitMuPixelLessStepHitTriplets = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepHitTriplets.clone(
- doublets = "hiRegitMuPixelLessStepHitDoublets"
-)
-hiRegitMuPixelLessStepSeeds = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeeds.clone(
- seedingHitSets = "hiRegitMuPixelLessStepHitTriplets"
-)
-
-
-# building: feed the new-named seeds
-hiRegitMuPixelLessStepTrajectoryFilter = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepTrajectoryFilter.clone(
- minPt = 1.7,
- minimumNumberOfHits = 6,
- minHitsMinPt = 4
-)
-hiRegitMuPixelLessStepTrajectoryBuilder = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepTrajectoryBuilder.clone(
- trajectoryFilter = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuPixelLessStepTrajectoryFilter')
- ),
- minNrOfHitsForRebuild = 6 #change from default 4
-)
-
-hiRegitMuPixelLessStepTrackCandidates = RecoTracker.IterativeTracking.PixelLessStep_cff._pixelLessStepTrackCandidatesCkf.clone(
- src = 'hiRegitMuPixelLessStepSeeds',
- TrajectoryBuilderPSet = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuPixelLessStepTrajectoryBuilder')
- ),
- clustersToSkip = 'hiRegitMuPixelLessStepClusters',
- maxNSeeds = 1000000
-)
-
-# fitting: feed new-names
-hiRegitMuPixelLessStepTracks = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepTracks.clone(
- AlgorithmName = 'hiRegitMuPixelLessStep',
- src = 'hiRegitMuPixelLessStepTrackCandidates'
-)
-
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuPixelLessStepSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src = 'hiRegitMuPixelLessStepTracks',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter7',
- GBRForestVars = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuPixelLessStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuPixelLessStepTight',
- preFilterName = 'hiRegitMuPixelLessStepLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuPixelLessStep',
- preFilterName = 'hiRegitMuPixelLessStepTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.09
- ),
- ) #end of vpset
-)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuPixelLessStepSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuPixelLessStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuPixelLessStepTight',
- preFilterName = 'hiRegitMuPixelLessStepLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuPixelLessStep',
- preFilterName = 'hiRegitMuPixelLessStepTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.09
- ),
- ) #end of vpset
-)
-
-hiRegitMuonPixelLessStepTask = cms.Task(hiRegitMuPixelLessStepClusters,
- hiRegitMuPixelLessStepSeedLayers,
- hiRegitMuPixelLessStepTrackingRegions,
- hiRegitMuPixelLessStepHitDoublets,
- hiRegitMuPixelLessStepHitTriplets,
- hiRegitMuPixelLessStepSeeds,
- hiRegitMuPixelLessStepTrackCandidates,
- hiRegitMuPixelLessStepTracks,
- hiRegitMuPixelLessStepSelector)
-hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuonPixelLessStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
deleted file mode 100644
index 6751b633f766b..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
+++ /dev/null
@@ -1,156 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-###################################################################################
-# pp iterative tracking modified for hiOffline reco (the vertex is the one reconstructed in HI)
-################################### 2nd step: pixel pairs
-
-from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-# Are the following values set to the same in every iteration? If yes,
-# why not making the change in HITrackingRegionProducer_cfi directly
-# once for all?
-hiRegitMuPixelPairStepTrackingRegions = HiTrackingRegionFactoryFromSTAMuonsEDProducer.clone(
- MuonSrc = "standAloneMuons:UpdatedAtVtx", # this is the same as default, why repeat?
- MuonTrackingRegionBuilder = dict(
- vertexCollection = "hiSelectedPixelVertex",
- UseVertex = True,
- Phi_fixed = True,
- Eta_fixed = True,
- DeltaPhi = 0.3,
- DeltaEta = 0.2,
- # Ok, the following ones are specific to PixelPairStep
- Pt_min = 1.0,
- DeltaR = 0.01, # default = 0.2
- DeltaZ = 0.09, # this give you the length
- Rescale_Dz = 0. # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
- )
-)
-
-###################################
-import RecoTracker.IterativeTracking.PixelPairStep_cff
-from RecoTracker.IterativeTracking.PixelPairStep_cff import pixelPairStepTrajectoryBuilder,pixelPairStepTrajectoryFilter,pixelPairStepTrajectoryFilterBase,pixelPairStepTrajectoryFilterInOut,pixelPairStepTrajectoryFilterShape,pixelPairStepChi2Est
-
-# NEW CLUSTERS (remove previously used clusters)
-hiRegitMuPixelPairStepClusters = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepClusters.clone(
- trajectories = "hiRegitMuInitialStepTracks",
- overrideTrkQuals = 'hiRegitMuInitialStepSelector:hiRegitMuInitialStep',
- trackClassifier = '',
- oldClusterRemovalInfo = "",
- TrackQuality = 'tight'
-)
-
-
-# SEEDING LAYERS
-hiRegitMuPixelPairStepSeedLayers = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedLayers.clone(
- BPix = dict(skipClusters = 'hiRegitMuPixelPairStepClusters'),
- FPix = dict(skipClusters = 'hiRegitMuPixelPairStepClusters')
-)
-
-# seeding
-hiRegitMuPixelPairStepHitDoublets = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepHitDoublets.clone(
- seedingLayers = "hiRegitMuPixelPairStepSeedLayers",
- trackingRegions = "hiRegitMuPixelPairStepTrackingRegions",
- clusterCheck = "hiRegitMuClusterCheck",
-)
-
-hiRegitMuPixelPairStepSeeds = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedsA.clone(
- seedingHitSets = "hiRegitMuPixelPairStepHitDoublets"
-)
-
-
-# building: feed the new-named seeds
-hiRegitMuPixelPairStepTrajectoryFilterBase = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrajectoryFilterBase.clone(
- minPt = 0.8,
- minimumNumberOfHits = 6,
- minHitsMinPt = 4
-)
-hiRegitMuPixelPairStepTrajectoryFilter = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrajectoryFilter.clone(
- filters = cms.VPSet(
- cms.PSet( refToPSet_ = cms.string('hiRegitMuPixelPairStepTrajectoryFilterBase')),
- cms.PSet( refToPSet_ = cms.string('pixelPairStepTrajectoryFilterShape')))
-)
-
-hiRegitMuPixelPairStepTrajectoryBuilder = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrajectoryBuilder.clone(
- trajectoryFilter = cms.PSet(
- refToPSet_ = cms.string('hiRegitMuPixelPairStepTrajectoryFilter')
- ),
- minNrOfHitsForRebuild = 6 #change from default 4
-)
-
-# trackign candidate
-hiRegitMuPixelPairStepTrackCandidates = RecoTracker.IterativeTracking.PixelPairStep_cff._pixelPairStepTrackCandidatesCkf.clone(
- src = 'hiRegitMuPixelPairStepSeeds',
- clustersToSkip = "hiRegitMuPixelPairStepClusters",
- maxNSeeds = 1000000
-)
-
-# fitting: feed new-names
-hiRegitMuPixelPairStepTracks = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTracks.clone(
- AlgorithmName = 'hiRegitMuPixelPairStep',
- src = 'hiRegitMuPixelPairStepTrackCandidates',
- clustersToSkip = cms.InputTag('hiRegitMuPixelPairStepClusters'),
-)
-
-
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuPixelPairStepSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src ='hiRegitMuPixelPairStepTracks',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter6',
- GBRForestVars = ['chi2perdofperlayer', 'dxyperdxyerror', 'dzperdzerror', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuPixelPairStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuPixelPairStepTight',
- preFilterName = 'hiRegitMuPixelPairStepLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.58
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuPixelPairStep',
- preFilterName = 'hiRegitMuPixelPairStepTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = 0.77
- ),
- ) #end of vpset
-)
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuPixelPairStepSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuPixelPairStepLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuPixelPairStepTight',
- preFilterName = 'hiRegitMuPixelPairStepLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.58
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuPixelPairStep',
- preFilterName = 'hiRegitMuPixelPairStepTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = 0.77
- ),
- ) #end of vpset
-)
-
-hiRegitMuonPixelPairStepTask = cms.Task(hiRegitMuPixelPairStepClusters,
- hiRegitMuPixelPairStepSeedLayers,
- hiRegitMuPixelPairStepTrackingRegions,
- hiRegitMuPixelPairStepHitDoublets,
- hiRegitMuPixelPairStepSeeds,
- hiRegitMuPixelPairStepTrackCandidates,
- hiRegitMuPixelPairStepTracks,
- hiRegitMuPixelPairStepSelector)
-hiRegitMuonPixelPairStep = cms.Sequence(hiRegitMuonPixelPairStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonSeededStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonSeededStep_cff.py
deleted file mode 100644
index d58abaefa4f8e..0000000000000
--- a/RecoHI/HiMuonAlgos/python/HiRegitMuonSeededStep_cff.py
+++ /dev/null
@@ -1,186 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-from RecoTracker.IterativeTracking.MuonSeededStep_cff import *
-
-###### Muon reconstruction module #####
-from RecoTracker.FinalTrackSelectors.trackAlgoPriorityOrder_cfi import trackAlgoPriorityOrder
-import RecoTracker.FinalTrackSelectors.trackListMerger_cfi
-hiEarlyGeneralTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
- TrackProducers = [
- 'hiGlobalPrimTracks',
- 'hiDetachedTripletStepTracks',
- 'hiLowPtTripletStepTracks',
- 'hiPixelPairGlobalPrimTracks',
- 'hiJetCoreRegionalStepTracks',
- 'hiRegitMuInitialStepTracks',
- 'hiRegitMuPixelPairStepTracks',
- 'hiRegitMuMixedTripletStepTracks',
- 'hiRegitMuPixelLessStepTracks',
- 'hiRegitMuDetachedTripletStepTracks'
- ],
- hasSelector = [1,1,1,1,1,1,1,1,1,1],
- selectedTrackQuals = [
- "hiInitialStepSelector:hiInitialStep",
- "hiDetachedTripletStepSelector:hiDetachedTripletStep",
- "hiLowPtTripletStepSelector:hiLowPtTripletStep",
- "hiPixelPairStepSelector:hiPixelPairStep",
- "hiJetCoreRegionalStepSelector:hiJetCoreRegionalStep",
- "hiRegitMuInitialStepSelector:hiRegitMuInitialStepLoose",
- "hiRegitMuPixelPairStepSelector:hiRegitMuPixelPairStep",
- "hiRegitMuMixedTripletStepSelector:hiRegitMuMixedTripletStep",
- "hiRegitMuPixelLessStepSelector:hiRegitMuPixelLessStep",
- "hiRegitMuDetachedTripletStepSelector:hiRegitMuDetachedTripletStep"
- ],
- setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7,8,9), pQual=cms.bool(True)), # should this be False?
- ),
- copyExtras = True,
- makeReKeyedSeeds = cms.untracked.bool(False)
-)
-
-hiEarlyMuons = earlyMuons.clone(
- inputCollectionLabels = ["hiEarlyGeneralTracks", "standAloneMuons:UpdatedAtVtx"]
-)
-
-###### SEEDER MODELS ######
-import RecoTracker.SpecialSeedGenerators.outInSeedsFromStandaloneMuons_cfi
-import RecoTracker.SpecialSeedGenerators.inOutSeedsFromTrackerMuons_cfi
-hiRegitMuonSeededSeedsOutIn = RecoTracker.SpecialSeedGenerators.outInSeedsFromStandaloneMuons_cfi.outInSeedsFromStandaloneMuons.clone(
- src = "hiEarlyMuons",
-)
-hiRegitMuonSeededSeedsInOut = RecoTracker.SpecialSeedGenerators.inOutSeedsFromTrackerMuons_cfi.inOutSeedsFromTrackerMuons.clone(
- src = "hiEarlyMuons",
-)
-hiRegitMuonSeededTrackCandidatesInOut = muonSeededTrackCandidatesInOut.clone(
- src = "hiRegitMuonSeededSeedsInOut"
-)
-hiRegitMuonSeededTrackCandidatesOutIn = muonSeededTrackCandidatesOutIn.clone(
- src = "hiRegitMuonSeededSeedsOutIn"
-)
-hiRegitMuonSeededTracksOutIn = muonSeededTracksOutIn.clone(
- src = "hiRegitMuonSeededTrackCandidatesOutIn",
- AlgorithmName = 'hiRegitMuMuonSeededStepOutIn'
-)
-hiRegitMuonSeededTracksInOut = muonSeededTracksInOut.clone(
- src = "hiRegitMuonSeededTrackCandidatesInOut",
- AlgorithmName = 'hiRegitMuMuonSeededStepInOut'
-)
-import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
-import RecoHI.HiTracking.hiMultiTrackSelector_cfi
-hiRegitMuonSeededTracksInOutSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src = 'hiRegitMuonSeededTracksInOut',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter7',
- GBRForestVars = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutTight',
- preFilterName = 'hiRegitMuonSeededTracksInOutLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutHighPurity',
- preFilterName = 'hiRegitMuonSeededTracksInOutTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.09
- ),
- ) #end of vpset
-) #end of clone
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuonSeededTracksInOutSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutTight',
- preFilterName = 'hiRegitMuonSeededTracksInOutLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuonSeededTracksInOutHighPurity',
- preFilterName = 'hiRegitMuonSeededTracksInOutTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.09
- ),
- ) #end of vpset
-)
-
-hiRegitMuonSeededTracksOutInSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
- src = 'hiRegitMuonSeededTracksOutIn',
- vertices = "hiSelectedPixelVertex",
- useAnyMVA = True,
- GBRForestLabel = 'HIMVASelectorIter7',
- GBRForestVars = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
- trackSelectors = cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInTight',
- preFilterName = 'hiRegitMuonSeededTracksOutInLoose',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInHighPurity',
- preFilterName = 'hiRegitMuonSeededTracksOutInTight',
- min_nhits = 8,
- useMVA = True,
- minMVA = -0.09
- ),
- ) #end of vpset
-) #end of clone
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuonSeededTracksOutInSelector,
- useAnyMVA = False,
- trackSelectors= cms.VPSet(
- RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInLoose',
- min_nhits = 8
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInTight',
- preFilterName = 'hiRegitMuonSeededTracksOutInLoose',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.2
- ),
- RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
- name = 'hiRegitMuonSeededTracksOutInHighPurity',
- preFilterName = 'hiRegitMuonSeededTracksOutInTight',
- min_nhits = 8,
- useMVA = False,
- minMVA = -0.09
- ),
- ) #end of vpset
-)
-
-hiRegitMuonSeededStepCoreTask = cms.Task(
- hiRegitMuonSeededSeedsInOut , hiRegitMuonSeededTrackCandidatesInOut , hiRegitMuonSeededTracksInOut ,
- hiRegitMuonSeededSeedsOutIn , hiRegitMuonSeededTrackCandidatesOutIn , hiRegitMuonSeededTracksOutIn
- )
-hiRegitMuonSeededStepExtraTask = cms.Task(
- hiRegitMuonSeededTracksInOutSelector ,
- hiRegitMuonSeededTracksOutInSelector
- )
-hiRegitMuonSeededStepTask = cms.Task(
- hiEarlyGeneralTracks ,
- hiEarlyMuons ,
- hiRegitMuonSeededStepCoreTask ,
- hiRegitMuonSeededStepExtraTask
- )
-hiRegitMuonSeededStep = cms.Sequence(hiRegitMuonSeededStepTask)
diff --git a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py b/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py
deleted file mode 100644
index 1666d25ed186b..0000000000000
--- a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#AOD content
-RecoHiMuonAOD = cms.PSet(
- outputCommands = cms.untracked.vstring()
- )
-# for re-muons
-reRecoMuonAOD = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep *_remuons_*_*',
- 'keep *_*_remuons_*',
- # Tracks known by the Muon obj
- 'keep recoTracks_standAloneMuons_*_*',
- 'keep recoTrackExtras_standAloneMuons_*_*',
- 'keep TrackingRecHitsOwned_standAloneMuons_*_*',
- 'keep recoTracks_reglobalMuons_*_*',
- 'keep recoTrackExtras_reglobalMuons_*_*',
- 'keep recoTracks_retevMuons_*_*',
- 'keep recoTrackExtras_retevMuons_*_*',
- 'keep recoTracksToOnerecoTracksAssociation_retevMuons_*_*')
-)
-RecoHiMuonAOD.outputCommands.extend(reRecoMuonAOD.outputCommands)
-
-#RECO content
-RecoHiMuonRECO = cms.PSet(
- outputCommands = cms.untracked.vstring()
- )
-
-reRecoMuonRECO = cms.PSet(
- outputCommands = cms.untracked.vstring(
- 'keep *_MuonSeed_*_*',
- 'keep *_ancientMuonSeed_*_*',
- 'keep *_mergedStandAloneMuonSeeds_*_*',
- 'keep TrackingRecHitsOwned_reglobalMuons_*_*',
- 'keep TrackingRecHitsOwned_retevMuons_*_*',
- 'keep recoCaloMuons_recalomuons_*_*')
-)
-reRecoMuonRECO.outputCommands.extend(reRecoMuonAOD.outputCommands)
-RecoHiMuonRECO.outputCommands.extend(reRecoMuonRECO.outputCommands)
-
-#Full Event content
-RecoHiMuonFEVT = cms.PSet(
- outputCommands = cms.untracked.vstring()
- )
-
-reRecoMuonFEVT = cms.PSet(
- outputCommands = cms.untracked.vstring()
-)
-reRecoMuonFEVT.outputCommands.extend(reRecoMuonRECO.outputCommands)
-RecoHiMuonFEVT.outputCommands.extend(reRecoMuonFEVT.outputCommands)
diff --git a/RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py b/RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py
deleted file mode 100644
index 2c224fffd3e90..0000000000000
--- a/RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from RecoTracker.TkSeedGenerator.trackerClusterCheck_cfi import trackerClusterCheck as _trackerClusterCheck
-hiRegitMuClusterCheck = _trackerClusterCheck.clone(
- doClusterCheck = False # do not check for max number of clusters pixel or strips
-)
-
-from RecoHI.HiMuonAlgos.HiRegitMuonInitialStep_cff import *
-from RecoHI.HiMuonAlgos.HiRegitMuonPixelPairStep_cff import *
-from RecoHI.HiMuonAlgos.HiRegitMuonDetachedTripletStep_cff import *
-from RecoHI.HiMuonAlgos.HiRegitMuonMixedTripletStep_cff import *
-from RecoHI.HiMuonAlgos.HiRegitMuonPixelLessStep_cff import *
-from RecoHI.HiMuonAlgos.HiRegitMuonSeededStep_cff import *
-
-from RecoTracker.FinalTrackSelectors.trackAlgoPriorityOrder_cfi import trackAlgoPriorityOrder
-import RecoTracker.FinalTrackSelectors.trackListMerger_cfi
-hiGeneralAndRegitMuTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
- TrackProducers = [
- 'hiRegitMuInitialStepTracks',
- 'hiRegitMuPixelPairStepTracks',
- 'hiRegitMuMixedTripletStepTracks',
- 'hiRegitMuPixelLessStepTracks',
- 'hiRegitMuDetachedTripletStepTracks',
- 'hiRegitMuonSeededTracksOutIn',
- 'hiRegitMuonSeededTracksInOut'
- ],
- selectedTrackQuals = [
- "hiRegitMuInitialStepSelector:hiRegitMuInitialStepLoose",
- "hiRegitMuPixelPairStepSelector:hiRegitMuPixelPairStep",
- "hiRegitMuMixedTripletStepSelector:hiRegitMuMixedTripletStep",
- "hiRegitMuPixelLessStepSelector:hiRegitMuPixelLessStep",
- "hiRegitMuDetachedTripletStepSelector:hiRegitMuDetachedTripletStep",
- "hiRegitMuonSeededTracksOutInSelector:hiRegitMuonSeededTracksOutInHighPurity",
- "hiRegitMuonSeededTracksInOutSelector:hiRegitMuonSeededTracksInOutHighPurity"
- ],
- hasSelector = [1,1,1,1,1,1,1],
- setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6), pQual=cms.bool(True))),
- copyExtras = True,
- makeReKeyedSeeds = cms.untracked.bool(False)
-)
-
-hiRegitMuTrackingTask = cms.Task(hiRegitMuClusterCheck
- ,hiRegitMuonInitialStepTask
- ,hiRegitMuonPixelPairStepTask
- ,hiRegitMuonMixedTripletStepTask
- ,hiRegitMuonPixelLessStepTask
- ,hiRegitMuonDetachedTripletStepTask
- ,hiRegitMuonSeededStepTask
- )
-hiRegitMuTracking = cms.Sequence(hiRegitMuTrackingTask)
-
-# Standalone muons
-from RecoMuon.Configuration.RecoMuonPPonly_cff import *
-
-hiRegitMuTrackingAndStaTask = cms.Task(standalonemuontrackingTask
- ,hiRegitMuTrackingTask)
-hiRegitMuTrackingAndSta = cms.Sequence(hiRegitMuTrackingAndStaTask)
diff --git a/RecoHI/HiMuonAlgos/test/reMuonReco_test.py b/RecoHI/HiMuonAlgos/test/reMuonReco_test.py
deleted file mode 100644
index 03d839197121b..0000000000000
--- a/RecoHI/HiMuonAlgos/test/reMuonReco_test.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-process = cms.Process("RERECO")
-
-process.load('Configuration.StandardSequences.Services_cff')
-process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
-process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('Configuration.EventContent.EventContent_cff')
-process.load('Configuration.StandardSequences.GeometryDB_cff')
-process.load('Configuration.StandardSequences.MagneticField_38T_cff')
-process.load('Configuration.StandardSequences.RawToDigi_Data_cff')
-process.load('Configuration.StandardSequences.SimL1Emulator_cff')
-process.load('Configuration.StandardSequences.EndOfProcess_cff')
-process.load('Configuration.StandardSequences.ReconstructionHeavyIons_cff')
-process.load('RecoLocalTracker.Configuration.RecoLocalTracker_cff')
-process.load('RecoHI.HiMuonAlgos.HiReRecoMuon_cff')
-
-process.load('Configuration.StandardSequences.EndOfProcess_cff')
-process.load("Configuration.EventContent.EventContentHeavyIons_cff")
-#global tags for conditions data: https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideFrontierConditions
-process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
-process.GlobalTag.globaltag = 'START50_V2::All'#'START44_V7::All'
-
-##################################################################################
-# setup 'standard' options
-process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1))
-
-# Input source
-# the fiel should have the STA in them; this is a RE-reco
-process.source = cms.Source("PoolSource",
- fileNames = cms.untracked.vstring('/store/relval/CMSSW_5_0_0_pre3/HIAllPhysics/RECO/GR_R_50_V1_RelVal_hi2010-v2/0000/F8A98914-08FD-E011-A27B-003048F1BF66.root'),
-#rfio:/castor/cern.ch/user/m/mironov/regittest/rawrecohltdebug_98_1_jYu.root'),
- noEventSort = cms.untracked.bool(True),
- duplicateCheckMode = cms.untracked.string("noDuplicateCheck"),
- skipEvents=cms.untracked.uint32(0)
- )
-
-process.output = cms.OutputModule("PoolOutputModule",
- splitLevel = cms.untracked.int32(0),
- outputCommands = cms.untracked.vstring('drop *',
- 'keep *_*_*_RERECO',
- ),
- fileName = cms.untracked.string('RErecoFullTest.root')
- )
-
-##################################################################################
-'''
-process.SimpleMemoryCheck = cms.Service('SimpleMemoryCheck',
- ignoreTotal=cms.untracked.int32(0),
- oncePerEventMode = cms.untracked.bool(False)
- )
-
-process.Timing = cms.Service("Timing")
-
-process.options = cms.untracked.PSet(wantSummary = cms.untracked.bool(True))
-'''
-process.siliconRecHits= cms.Path(process.siPixelRecHits*process.siStripMatchedRecHits)
-#process.raw2digi_step = cms.Path(process.RawToDigi)
-#process.localtracker = cms.Path(process.trackerlocalreco)
-process.reMuons = cms.Path(process.reMuonRecoPbPb)
-
-process.endjob_step = cms.Path(process.endOfProcess)
-process.out_step = cms.EndPath(process.output)
-
-#process.raw2digi_step,process.localtracker,
-process.schedule = cms.Schedule(process.siliconRecHits,process.reMuons)
-process.schedule.extend([process.endjob_step,process.out_step])
-
-
-from Configuration.PyReleaseValidation.ConfigBuilder import MassReplaceInputTag
-MassReplaceInputTag(process)
diff --git a/RecoHI/HiTracking/interface/BestVertexComparator.h b/RecoHI/HiTracking/interface/BestVertexComparator.h
deleted file mode 100644
index 4154814f94ecb..0000000000000
--- a/RecoHI/HiTracking/interface/BestVertexComparator.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef RecoHI_HiTracking_BestVertexComparator_h
-#define RecoHI_HiTracking_BestVertexComparator_h
-
-template
-struct GreaterByTracksSize {
- typedef T first_argument_type;
- typedef T second_argument_type;
- bool operator()(const T& t1, const T& t2) const { return t1.tracksSize() > t2.tracksSize(); }
-};
-
-template
-struct LessByNormalizedChi2 {
- typedef T first_argument_type;
- typedef T second_argument_type;
- bool operator()(const T& t1, const T& t2) const { return t1.normalizeChi2() < t2.normalizedChi2(); }
-};
-
-#endif
diff --git a/RecoHI/HiTracking/interface/HIBestVertexProducer.h b/RecoHI/HiTracking/interface/HIBestVertexProducer.h
deleted file mode 100644
index ff83fda9ac9b5..0000000000000
--- a/RecoHI/HiTracking/interface/HIBestVertexProducer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef HIBestVertexProducer_H
-#define HIBestVertexProducer_H
-
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-
-namespace edm {
- class Event;
- class EventSetup;
- class ConfigurationDescriptions;
-} // namespace edm
-
-class HIBestVertexProducer : public edm::stream::EDProducer<> {
-public:
- explicit HIBestVertexProducer(const edm::ParameterSet& ps);
- ~HIBestVertexProducer() override;
- void produce(edm::Event& ev, const edm::EventSetup& es) override;
- static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-private:
- void beginJob();
- edm::ParameterSet theConfig;
- edm::EDGetTokenT theBeamSpotTag;
- edm::EDGetTokenT theMedianVertexCollection;
- edm::EDGetTokenT theAdaptiveVertexCollection;
- edm::EDGetTokenT theFinalAdaptiveVertexCollection;
- bool theUseFinalAdaptiveVertexCollection;
-};
-#endif
diff --git a/RecoHI/HiTracking/interface/HIProtoTrackFilter.h b/RecoHI/HiTracking/interface/HIProtoTrackFilter.h
deleted file mode 100644
index fe441ef46b9e6..0000000000000
--- a/RecoHI/HiTracking/interface/HIProtoTrackFilter.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _HIProtoTrackFilter_h_
-#define _HIProtoTrackFilter_h_
-
-#include "RecoTracker/PixelTrackFitting/interface/PixelTrackFilterBase.h"
-
-namespace reco {
- class BeamSpot;
-}
-
-class HIProtoTrackFilter : public PixelTrackFilterBase {
-public:
- HIProtoTrackFilter(const reco::BeamSpot *beamSpot, double tipMax, double chi2Max, double ptMin);
- ~HIProtoTrackFilter() override;
- bool operator()(const reco::Track *, const PixelTrackFilterBase::Hits &hits) const override;
-
-private:
- double theTIPMax;
- double theChi2Max, thePtMin;
- const reco::BeamSpot *theBeamSpot;
-};
-
-#endif
diff --git a/RecoHI/HiTracking/plugins/HIBestVertexProducer.cc b/RecoHI/HiTracking/plugins/HIBestVertexProducer.cc
deleted file mode 100644
index 0c78836e547e1..0000000000000
--- a/RecoHI/HiTracking/plugins/HIBestVertexProducer.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "RecoHI/HiTracking/interface/HIBestVertexProducer.h"
-
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-#include
-#include
-using namespace std;
-using namespace edm;
-
-/*****************************************************************************/
-HIBestVertexProducer::HIBestVertexProducer(const edm::ParameterSet& ps)
- : theConfig(ps),
- theBeamSpotTag(consumes(ps.getParameter("beamSpotLabel"))),
- theMedianVertexCollection(
- consumes(ps.getParameter("medianVertexCollection"))),
- theAdaptiveVertexCollection(
- consumes(ps.getParameter("adaptiveVertexCollection"))),
- theUseFinalAdaptiveVertexCollection(ps.getParameter("useFinalAdaptiveVertexCollection")) {
- if (theUseFinalAdaptiveVertexCollection) {
- theFinalAdaptiveVertexCollection =
- consumes(ps.getParameter("finalAdaptiveVertexCollection"));
- }
- produces();
-}
-
-/*****************************************************************************/
-HIBestVertexProducer::~HIBestVertexProducer() {}
-
-/*****************************************************************************/
-void HIBestVertexProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
- edm::ParameterSetDescription desc;
- desc.add("beamSpotLabel", edm::InputTag("offlineBeamSpot"));
- desc.add("adaptiveVertexCollection", edm::InputTag("hiBestAdaptiveVertex"));
- desc.add("medianVertexCollection", edm::InputTag("hiPixelMedianVertex"));
- desc.add("useFinalAdaptiveVertexCollection", false);
- desc.add("finalAdaptiveVertexCollection", edm::InputTag("hiBestOfflinePrimaryVertex"));
-
- descriptions.add("hiSelectedPixelVertex", desc);
-}
-
-/*****************************************************************************/
-void HIBestVertexProducer::beginJob() {}
-
-/*****************************************************************************/
-void HIBestVertexProducer::produce(edm::Event& ev, const edm::EventSetup& es) {
- // 1. use best adaptive vertex preferentially
- // 2. use median vertex in case where adaptive algorithm failed
- // 3. use beamspot if netither vertexing method succeeds
-
- // New vertex collection
- auto newVertexCollection = std::make_unique();
-
- //** Get precise adaptive vertex **/
- edm::Handle vc1;
- ev.getByToken(theAdaptiveVertexCollection, vc1);
- const reco::VertexCollection* vertices1 = vc1.product();
-
- if (vertices1->empty())
- LogError("HeavyIonVertexing") << "adaptive vertex collection is empty!" << endl;
-
- //** Final vertex collection if needed **//
- const double maxZError = 3.0; //any vtx with error > this number is considered no good
- bool hasFinalVertex = false;
- if (theUseFinalAdaptiveVertexCollection) {
- edm::Handle vc0;
- ev.getByToken(theFinalAdaptiveVertexCollection, vc0);
- const reco::VertexCollection* vertices0 = vc0.product();
- if (vertices0->empty())
- LogInfo("HeavyIonVertexing") << "final adaptive vertex collection is empty!" << endl;
-
- //if using final vertex and has a good vertex, use it
- if (vertices0->begin()->zError() < maxZError) {
- hasFinalVertex = true;
- auto const& vertex0 = vertices0->front();
- newVertexCollection->push_back(vertex0);
- LogInfo("HeavyIonVertexing") << "adaptive vertex:\n vz = (" << vertex0.x() << ", " << vertex0.y() << ", "
- << vertex0.z() << ")"
- << "\n error = (" << vertex0.xError() << ", " << vertex0.yError() << ", "
- << vertex0.zError() << ")" << endl;
- }
- }
-
- //otherwise use the pixel track adaptive vertex if it is good
- if (!hasFinalVertex) {
- if (vertices1->begin()->zError() < maxZError) {
- reco::VertexCollection::const_iterator vertex1 = vertices1->begin();
- newVertexCollection->push_back(*vertex1);
-
- LogInfo("HeavyIonVertexing") << "adaptive vertex:\n vz = (" << vertex1->x() << ", " << vertex1->y() << ", "
- << vertex1->z() << ")"
- << "\n error = (" << vertex1->xError() << ", " << vertex1->yError() << ", "
- << vertex1->zError() << ")" << endl;
- } else {
- //** Get fast median vertex **/
- edm::Handle vc2;
- ev.getByToken(theMedianVertexCollection, vc2);
- const reco::VertexCollection* vertices2 = vc2.product();
-
- //** Get beam spot position and error **/
- reco::BeamSpot beamSpot;
- edm::Handle beamSpotHandle;
- ev.getByToken(theBeamSpotTag, beamSpotHandle);
-
- if (beamSpotHandle.isValid())
- beamSpot = *beamSpotHandle;
- else
- LogError("HeavyIonVertexing") << "no beamspot found " << endl;
-
- if (!vertices2->empty()) {
- reco::VertexCollection::const_iterator vertex2 = vertices2->begin();
- reco::Vertex::Error err;
- err(0, 0) = pow(beamSpot.BeamWidthX(), 2);
- err(1, 1) = pow(beamSpot.BeamWidthY(), 2);
- err(2, 2) = pow(vertex2->zError(), 2);
- reco::Vertex newVertex(reco::Vertex::Point(beamSpot.x0(), beamSpot.y0(), vertex2->z()), err, 0, 1, 1);
- newVertexCollection->push_back(newVertex);
-
- LogInfo("HeavyIonVertexing") << "median vertex + beamspot: \n position = (" << newVertex.x() << ", "
- << newVertex.y() << ", " << newVertex.z() << ")"
- << "\n error = (" << newVertex.xError() << ", " << newVertex.yError() << ", "
- << newVertex.zError() << ")" << endl;
-
- } else {
- reco::Vertex::Error err;
- err(0, 0) = pow(beamSpot.BeamWidthX(), 2);
- err(1, 1) = pow(beamSpot.BeamWidthY(), 2);
- err(2, 2) = pow(beamSpot.sigmaZ(), 2);
- reco::Vertex newVertex(beamSpot.position(), err, 0, 0, 1);
- newVertexCollection->push_back(newVertex);
-
- LogInfo("HeavyIonVertexing") << "beam spot: \n position = (" << newVertex.x() << ", " << newVertex.y() << ", "
- << newVertex.z() << ")"
- << "\n error = (" << newVertex.xError() << ", " << newVertex.yError() << ", "
- << newVertex.zError() << ")" << endl;
- }
- }
- }
-
- // put new vertex collection into event
- ev.put(std::move(newVertexCollection));
-}
diff --git a/RecoHI/HiTracking/plugins/HIBestVertexSelector.cc b/RecoHI/HiTracking/plugins/HIBestVertexSelector.cc
deleted file mode 100644
index 752a28e02732a..0000000000000
--- a/RecoHI/HiTracking/plugins/HIBestVertexSelector.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-
-#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
-#include "CommonTools/UtilAlgos/interface/SortCollectionSelector.h"
-#include "RecoHI/HiTracking/interface/BestVertexComparator.h"
-
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-
-namespace reco {
- namespace modules {
-
- // define your producer name
- typedef ObjectSelector > >
- HIBestVertexSelection;
-
- // declare the module as plugin
- DEFINE_FWK_MODULE(HIBestVertexSelection);
- } // namespace modules
-} // namespace reco
diff --git a/RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc b/RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc
deleted file mode 100644
index d3c203767c8df..0000000000000
--- a/RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc
+++ /dev/null
@@ -1,749 +0,0 @@
-#include "HIMultiTrackSelector.h"
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/ValueMap.h"
-#include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-
-#include