From b0f913e51079263617b17aea315c300b51e7adef Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Wed, 14 Nov 2018 23:56:26 +0100
Subject: [PATCH] Synchronise with CMSSW_10_4_0_pre2

---
 .../StandardSequences/python/RawToDigi_cff.py |  23 +
 .../clients/beam_dqm_sourceclient-live_cfg.py | 582 ++++++------------
 .../beampixel_dqm_sourceclient-live_cfg.py    |   9 +-
 .../clients/csc_dqm_sourceclient-live_cfg.py  |  17 +-
 .../clients/l1t_dqm_sourceclient-live_cfg.py  |   3 +-
 .../l1temulator_dqm_sourceclient-live_cfg.py  |   3 +-
 .../l1tstage1_dqm_sourceclient-live_cfg.py    |   3 +-
 ...tage1emulator_dqm_sourceclient-live_cfg.py |   3 +-
 .../l1tstage2_dqm_sourceclient-live_cfg.py    |   3 +-
 ...tage2emulator_dqm_sourceclient-live_cfg.py |   5 +-
 .../physics_dqm_sourceclient-live_cfg.py      |   3 +-
 .../pixel_dqm_sourceclient-live_cfg.py        |  48 +-
 .../pixellumi_dqm_sourceclient-live_cfg.py    |   3 +-
 .../sistrip_dqm_sourceclient-live_cfg.py      | 194 +++---
 .../python/RecoLocalTracker_cff.py            |   5 -
 .../SiPixelRecHits/interface/PixelCPEBase.h   |   1 -
 .../python/globalValidation_cff.py            |   2 +
 17 files changed, 401 insertions(+), 506 deletions(-)

diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py
index 4380d33f134cc..342fb1a2433db 100644
--- a/Configuration/StandardSequences/python/RawToDigi_cff.py
+++ b/Configuration/StandardSequences/python/RawToDigi_cff.py
@@ -27,6 +27,9 @@
 import EventFilter.RPCRawToDigi.rpcUnpacker_cfi
 muonRPCDigis = EventFilter.RPCRawToDigi.rpcUnpacker_cfi.rpcunpacker.clone()
 
+import EventFilter.RPCRawToDigi.rpcDigiMerger_cfi
+muonRPCNewDigis = EventFilter.RPCRawToDigi.rpcDigiMerger_cfi.rpcDigiMerger.clone()
+
 import EventFilter.GEMRawToDigi.muonGEMDigis_cfi
 muonGEMDigis = EventFilter.GEMRawToDigi.muonGEMDigis_cfi.muonGEMDigis.clone()
 
@@ -121,3 +124,23 @@
 _hgcal_RawToDigi += hgcalDigis
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toReplaceWith(RawToDigi,_hgcal_RawToDigi)
+
+# RPC New Readout Validation
+from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
+_rpc_NewReadoutVal_RawToDigi = RawToDigi.copy()
+_rpc_NewReadoutVal_RawToDigi_noTk = RawToDigi_noTk.copy()
+_rpc_NewReadoutVal_RawToDigi += muonRPCNewDigis
+_rpc_NewReadoutVal_RawToDigi_noTk += muonRPCNewDigis
+stage2L1Trigger_2017.toReplaceWith(RawToDigi, _rpc_NewReadoutVal_RawToDigi)
+stage2L1Trigger_2017.toReplaceWith(RawToDigi_noTk, _rpc_NewReadoutVal_RawToDigi)
+
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+fastSim.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([muonRPCNewDigis]))
+fastSim.toReplaceWith(RawToDigi_noTk, RawToDigi_noTk.copyAndExclude([muonRPCNewDigis]))
+
+_hfnose_RawToDigi = RawToDigi.copy()
+_hfnose_RawToDigi += hfnoseDigis
+
+from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
+phase2_hfnose.toReplaceWith(RawToDigi,_hfnose_RawToDigi)
+
diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
index bb9fd37b202e5..5bc3b2bf8af63 100644
--- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -1,56 +1,77 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("BeamMonitor", eras.Run2_2018)
+#process = cms.Process("BeamMonitor", eras.Run2_2018) FIXME
+process = cms.Process("BeamMonitor", eras.Run2_2018_pp_on_AA)
 
-#----------------------------------------------                                                                                                                                    
-# Switch to change between firstStep and Pixel
-#-----------------------------------------------
+#
+process.MessageLogger = cms.Service("MessageLogger",
+    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        threshold = cms.untracked.string('WARNING')
+    ),
+    destinations = cms.untracked.vstring('cerr')
+)
 
-runFirstStepTrk = False
+# switch
+live = True # FIXME
 
-#----------------------------
-# Common part for PP and H.I Running
-#-----------------------------
-# for live online DQM in P5
-process.load("DQM.Integration.config.inputsource_cfi")
-
-# for testing in lxplus
-#process.load("DQM.Integration.config.fileinputsource_cfi")
+#---------------
+# Input sources
+if (live):
+    process.load("DQM.Integration.config.inputsource_cfi")
+else:
+    process.load("DQM.Integration.config.fileinputsource_cfi")
 
 #--------------------------
 # HLT Filter
-# 0=random, 1=physics, 2=calibration, 3=technical
 process.hltTriggerTypeFilter = cms.EDFilter("HLTTriggerTypeFilter",
-    SelectedTriggerType = cms.int32(1)
+    SelectedTriggerType = cms.int32(1) # physics
 )
 
 #----------------------------
 # DQM Live Environment
-#-----------------------------
 process.load("DQM.Integration.config.environment_cfi")
 process.dqmEnv.subSystemFolder = 'BeamMonitor'
-process.dqmSaver.tag = 'BeamMonitor'
+process.dqmSaver.tag           = 'BeamMonitor'
 
 process.dqmEnvPixelLess = process.dqmEnv.clone()
 process.dqmEnvPixelLess.subSystemFolder = 'BeamMonitor_PixelLess'
 
-#----------------------------
-# BeamMonitor
-#-----------------------------
-
-if(runFirstStepTrk):
-  process.load("DQM.BeamMonitor.BeamMonitor_cff") # for reduced/firsStep/normal tracking
+#---------------
+# Conditions
+if (live):
+    process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
 else:
-  process.load("DQM.BeamMonitor.BeamMonitor_Pixel_cff") #for pixel tracks/vertices
+    process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+    from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
+    process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
+    # you may need to set manually the GT in the line below
+    process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
 
+#----------------------------
+# BeamMonitor
+process.load("DQM.BeamMonitor.BeamMonitor_Pixel_cff")
 process.load("DQM.BeamMonitor.BeamSpotProblemMonitor_cff")
-#process.load("DQM.BeamMonitor.BeamMonitorBx_cff")
-#process.load("DQM.BeamMonitor.BeamMonitor_PixelLess_cff")
 process.load("DQM.BeamMonitor.BeamConditionsMonitor_cff")
 
+if process.dqmRunConfig.type.value() is "production":
+  process.dqmBeamMonitor.BeamFitter.WriteAscii = True
+  process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResultsOld.txt'
+  process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True
+  process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmpro/BeamMonitorDQM/BeamFitResultsOld.txt'
+else:
+  process.dqmBeamMonitor.BeamFitter.WriteAscii = False
+  process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResultsOld.txt'
+  process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True
+  if (live):
+    process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResultsOld.txt'
+  else:
+    process.dqmBeamMonitor.BeamFitter.DIPFileName = 'BeamFitResultsOld.txt'
 
-####  SETUP TRACKING RECONSTRUCTION ####
+#----------------
+# Setup tracking
 process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
@@ -62,48 +83,12 @@
 )
 process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi")
 
+#-----------------
 
-#---------------
-# Calibration
-#---------------
-# Condition for P5 cluster
-process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
-# Condition for lxplus: change and possibly customise the GT
-#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
-#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
-
-# Change Beam Monitor variables
-if process.dqmRunConfig.type.value() is "production":
-  process.dqmBeamMonitor.BeamFitter.WriteAscii = True
-  process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResultsOld.txt'
-  process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True
-  process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmpro/BeamMonitorDQM/BeamFitResultsOld.txt'
-else:
-  process.dqmBeamMonitor.BeamFitter.WriteAscii = False
-  process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResultsOld.txt'
-  process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True
-  process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResultsOld.txt'
-
-
-#----------------------------
 # TrackingMonitor
-#-----------------------------
-# first, tracks selection as in https://github.com/cms-sw/cmssw/blob/master/DQM/BeamMonitor/python/BeamMonitor_Pixel_cff.py
-# -MinimumPt = cms.untracked.double(1.0),
-# -MaximumEta = cms.untracked.double(2.4),
-# -MaximumImpactParameter = cms.untracked.double(1.0),
-# -MaximumZ = cms.untracked.double(60),
-# -MinimumTotalLayers = cms.untracked.int32(3),
-# -MinimumPixelLayers = cms.untracked.int32(3),
-# -MaximumNormChi2 = cms.untracked.double(30.0),
-
-#### while hitPattern().trackerLayersWithMeasurement() and hitPattern().pixelLayersWithMeasurement() !!!
-#### =>
-#### select tracks based on MaximumImpactParameter, MaximumZ, MinimumTotalLayers, MinimumPixelLayers and MaximumNormChi2
 process.pixelTracksCutClassifier = cms.EDProducer( "TrackCutClassifier",
     src = cms.InputTag( "pixelTracks" ),
     beamspot = cms.InputTag( "offlineBeamSpot" ),
-#    vertices = cms.InputTag( "pixelVertices" ),
     vertices = cms.InputTag( "" ),
     qualityCuts = cms.vdouble( -0.7, 0.1, 0.7 ),
     mva = cms.PSet(
@@ -132,6 +117,8 @@
     ),
     ignoreVertices = cms.bool( True ),
 )
+
+#
 process.pixelTracksHP = cms.EDProducer( "TrackCollectionFilterCloner",
     minQuality = cms.string( "highPurity" ),
     copyExtras = cms.untracked.bool( True ),
@@ -141,17 +128,18 @@
     originalMVAVals = cms.InputTag( 'pixelTracksCutClassifier','MVAValues' )
 )
 
+#-------------------------------------
+# PixelTracksMonitor
+
 import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi
 process.pixelTracksMonitor = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone()
-process.pixelTracksMonitor.FolderName                = 'BeamMonitor/Tracking/pixelTracks'
-if (runFirstStepTrk):
-  process.pixelTracksMonitor.TrackProducer             = 'initialStepTracksPreSplitting'
-  process.pixelTracksMonitor.allTrackProducer          = 'initialStepTracksPreSplitting'
-else:
-  process.pixelTracksMonitor.TrackProducer             = 'pixelTracks'
-  process.pixelTracksMonitor.allTrackProducer          = 'pixelTracks'
-process.pixelTracksMonitor.beamSpot                  = "offlineBeamSpot"
-process.pixelTracksMonitor.primaryVertex             = "pixelVertices"
+
+process.pixelTracksMonitor.FolderName       = 'BeamMonitor/Tracking/pixelTracks'
+process.pixelTracksMonitor.TrackProducer    = 'pixelTracks'
+process.pixelTracksMonitor.allTrackProducer = 'pixelTracks'
+process.pixelTracksMonitor.beamSpot         = "offlineBeamSpot"
+process.pixelTracksMonitor.primaryVertex    = "pixelVertices"
+
 process.pixelTracksMonitor.doAllPlots                = cms.bool(False)
 process.pixelTracksMonitor.doLumiAnalysis            = cms.bool(False)
 process.pixelTracksMonitor.doProfilesVsLS            = cms.bool(True)
@@ -163,357 +151,195 @@
 process.pixelTracksMonitor.doPlotsVsGoodPVtx         = cms.bool(True)
 process.pixelTracksMonitor.doPlotsVsLUMI             = cms.bool(True)
 process.pixelTracksMonitor.doPlotsVsBX               = cms.bool(True)
+
 process.pixelTracksMonitor.AbsDxyMax  =   1.2
 process.pixelTracksMonitor.AbsDxyBin  =  12
+
 process.pixelTracksMonitor.DxyMin     =  -1.2
 process.pixelTracksMonitor.DxyMax     =   1.2
 process.pixelTracksMonitor.DxyBin     =  60
+
 process.pixelTracksMonitor.Chi2NDFMax =  35.
 process.pixelTracksMonitor.Chi2NDFMin =   0.
 process.pixelTracksMonitor.Chi2NDFBin =  70
-process.pixelTracksMonitor.VZBin      = 124
-process.pixelTracksMonitor.VZMin      = -62.
-process.pixelTracksMonitor.VZMax      =  62.
-process.pixelTracksMonitor.TrackPtMin =   0.
-process.pixelTracksMonitor.TrackPtMax =  50.
-process.pixelTracksMonitor.TrackPtBin = 250
 
+process.pixelTracksMonitor.VZBin      =  124
+process.pixelTracksMonitor.VZMin      =  -62.
+process.pixelTracksMonitor.VZMax      =   62.
+
+process.pixelTracksMonitor.TrackPtMin =    0.
+process.pixelTracksMonitor.TrackPtMax =   50.
+process.pixelTracksMonitor.TrackPtBin =  250
+
+#
 process.tracks2monitor = cms.EDFilter('TrackSelector',
     src = cms.InputTag('pixelTracks'),
     cut = cms.string("")
 )
 process.tracks2monitor.src = 'pixelTracksHP'
-process.tracks2monitor.cut = 'pt > 1 & abs(eta) < 2.4' # & normalizedChi2 < 30. abs(dxy) < 1. abs(dz) < 60.'
+process.tracks2monitor.cut = 'pt > 1 & abs(eta) < 2.4' 
 
 
+#
 process.selectedPixelTracksMonitor = process.pixelTracksMonitor.clone()
-process.selectedPixelTracksMonitor.FolderName                = 'BeamMonitor/Tracking/selectedPixelTracks'
-if (runFirstStepTrk):
-  process.selectedPixelTracksMonitor.TrackProducer             = 'initialStepTracksPreSplitting'
-  process.selectedPixelTracksMonitor.allTrackProducer          = 'initialStepTracksPreSplitting'
-else:
-  process.selectedPixelTracksMonitor.TrackProducer             = 'tracks2monitor'
-  process.selectedPixelTracksMonitor.allTrackProducer          = 'tracks2monitor'
+process.selectedPixelTracksMonitor.FolderName       = 'BeamMonitor/Tracking/selectedPixelTracks'
+process.selectedPixelTracksMonitor.TrackProducer    = 'tracks2monitor'
+process.selectedPixelTracksMonitor.allTrackProducer = 'tracks2monitor'
 
 process.selectedPixelTracksMonitorSequence = cms.Sequence(
-  process.pixelTracksCutClassifier
+    process.pixelTracksCutClassifier
   + process.pixelTracksHP
   + process.tracks2monitor
   + process.selectedPixelTracksMonitor
 )
 
 
-## TKStatus
+#---------------------------------
+# Putting together combined paths
+
+#
 process.dqmTKStatus = cms.EDAnalyzer("TKStatus",
-        BeamFitter = cms.PSet(
+    BeamFitter = cms.PSet(
         DIPFileName = process.dqmBeamMonitor.BeamFitter.DIPFileName
-        )
+    )
 )
 
-
+#
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                                *process.dqmSaver)
+                               * process.dqmSaver)
 
-process.monitor = cms.Sequence(process.dqmBeamMonitor + process.selectedPixelTracksMonitorSequence)
+#
+process.monitor = cms.Sequence(process.dqmBeamMonitor
+                             + process.selectedPixelTracksMonitorSequence)
 
+#------------------------
+# BeamSpotProblemMonitor
 
-#------------------------------------------------------------
-# BeamSpotProblemMonitor Modules
-#-----------------------------------------------------------
-process.dqmBeamSpotProblemMonitor.monitorName       = "BeamMonitor/BeamSpotProblemMonitor"
-process.dqmBeamSpotProblemMonitor.AlarmONThreshold  = 15 # 10
-process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 17 # 12
+#
+process.dqmBeamSpotProblemMonitor.monitorName = "BeamMonitor/BeamSpotProblemMonitor"
+process.dqmBeamSpotProblemMonitor.AlarmONThreshold  = 15 # was 10
+process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 17 # was 12
 process.dqmBeamSpotProblemMonitor.nCosmicTrk        = 10
 process.dqmBeamSpotProblemMonitor.doTest            = False
-if (runFirstStepTrk):
-    process.dqmBeamSpotProblemMonitor.pixelTracks   = 'initialStepTracksPreSplitting'
-else:
-    process.dqmBeamSpotProblemMonitor.pixelTracks   = 'pixelTracks'
-
+process.dqmBeamSpotProblemMonitor.pixelTracks  = 'pixelTracks'
 
+#
 process.qTester = cms.EDAnalyzer("QualityTester",
-                                 qtList = cms.untracked.FileInPath('DQM/BeamMonitor/test/BeamSpotAvailableTest.xml'),
-                                 prescaleFactor = cms.untracked.int32(1),                               
-                                 qtestOnEndLumi = cms.untracked.bool(True),
-                                 testInEventloop = cms.untracked.bool(False),
-                                 verboseQT =  cms.untracked.bool(True)                 
-                                )
-
-process.BeamSpotProblemModule = cms.Sequence( process.qTester
- 	  	                             *process.dqmBeamSpotProblemMonitor
-                                            )
-
-#make it off for cosmic run
-if ( process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1):
-    process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 5       #Should be < AlalrmONThreshold 
-#-----------------------------------------------------------
-
-### process customizations included here
-from DQM.Integration.config.online_customizations_cfi import *
-process = customise(process)
-
-
-#--------------------------
-# Proton-Proton Stuff
-#--------------------------
-
-if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or
-    process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or 
-    process.runType.getRunType() == process.runType.hpu_run):
-
-    print "[beam_dqm_sourceclient-live_cfg]:: Running pp"
-
-    process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
-    process.csctfDigis.producer = cms.InputTag("rawDataCollector")
-    process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")
-    process.ecalDigis.InputLabel = cms.InputTag("rawDataCollector")
-    process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataCollector")
-    process.gctDigis.inputLabel = cms.InputTag("rawDataCollector")
-    process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataCollector")
-    process.hcalDigis.InputLabel = cms.InputTag("rawDataCollector")
-    process.muonCSCDigis.InputObjects = cms.InputTag("rawDataCollector")
-    process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
-    process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
-    process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
-    process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
-    process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
-
-
-    process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")
-
-    process.dqmBeamMonitor.OnlineMode = True              
-    process.dqmBeamMonitor.resetEveryNLumi = 5
-    process.dqmBeamMonitor.resetPVEveryNLumi = 5
-    process.dqmBeamMonitor.PVFitter.minNrVerticesForFit = 20
-    process.dqmBeamMonitor.PVFitter.minVertexNdf = 10
-  
-
-    if (runFirstStepTrk): # for first Step Tracking
-        print "[beam_dqm_sourceclient-live_cfg]:: firstStepTracking"
-        # Import TrackerLocalReco sequence
-        process.load('RecoLocalTracker.Configuration.RecoLocalTracker_cff')
-        # Import MeasurementTrackerEvents used during patter recognition
-        process.load('RecoTracker.MeasurementDet.MeasurementTrackerEventProducer_cfi')
-        #Import stuff to run the initial step - PreSplitting - of the
-        #iterative tracking and remove Calo-related sequences
-        process.load('RecoTracker.IterativeTracking.InitialStepPreSplitting_cff')
-        process.InitialStepPreSplitting.remove(process.initialStepTrackRefsForJetsPreSplitting)
-        process.InitialStepPreSplitting.remove(process.caloTowerForTrkPreSplitting)
-        process.InitialStepPreSplitting.remove(process.ak4CaloJetsForTrkPreSplitting)
-        process.InitialStepPreSplitting.remove(process.jetsForCoreTrackingPreSplitting)
-        process.InitialStepPreSplitting.remove(process.siPixelClusters)
-        process.InitialStepPreSplitting.remove(process.siPixelRecHits)
-        process.InitialStepPreSplitting.remove(process.MeasurementTrackerEvent)
-        process.InitialStepPreSplitting.remove(process.siPixelClusterShapeCache)
-        # 2016-11-28 MK FIXME: I suppose I should migrate the lines below following the "new seeding framework"
-        #
-        # if z is very far due to bad fit
-        process.initialStepSeedsPreSplitting.RegionFactoryPSet.RegionPSet.originRadius = 1.5
-        process.initialStepSeedsPreSplitting.RegionFactoryPSet.RegionPSet.originHalfLength = cms.double(30.0)
-        #Increase pT threashold at seeding stage (not so accurate)                                                                                      
-        process.initialStepSeedsPreSplitting.RegionFactoryPSet.RegionPSet.ptMin = 0.9
-
-        # some inputs to BeamMonitor
-        process.dqmBeamMonitor.BeamFitter.TrackCollection = 'initialStepTracksPreSplitting'         
-        process.dqmBeamMonitor.primaryVertex = 'firstStepPrimaryVerticesPreSplitting'
-        process.dqmBeamMonitor.PVFitter.VertexCollection = 'firstStepPrimaryVerticesPreSplitting'
-
-        process.dqmBeamMonitor.PVFitter.errorScale = 0.95 #keep checking this with new release expected close to 1
-
-        process.tracking_FirstStep  = cms.Sequence( process.siPixelDigis*
-                                                     process.siStripDigis*
-                                                     process.pixeltrackerlocalreco*
-                                                     process.striptrackerlocalreco*
-                                                     process.offlineBeamSpot*                          
-                                                     process.MeasurementTrackerEventPreSplitting*
-                                                     process.siPixelClusterShapeCachePreSplitting*
-                                                     process.InitialStepPreSplitting
-                                                     )
-    else: # pixel tracking
-        print "[beam_dqm_sourceclient-live_cfg]:: pixelTracking"
-
-
-        #pixel  track/vertices reco
-        process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
-        process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
-        process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
-        process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08
-        process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
-        process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.
-        process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin
-
-        process.dqmBeamMonitor.PVFitter.errorScale = 1.22 #keep checking this with new release expected close to 1.2
- 
-        process.tracking_FirstStep  = cms.Sequence(process.siPixelDigis* 
-                                                   process.siStripDigis *
-                                                   process.striptrackerlocalreco *
-                                                   process.offlineBeamSpot*
-                                                   process.siPixelClustersPreSplitting*
-                                                   process.siPixelRecHitsPreSplitting*
-                                                   process.siPixelClusterShapeCachePreSplitting*
-                                                   process.recopixelvertexing
-                                                  )
- 
-
-    #TriggerName for selecting pv for DIP publication, NO wildcard needed here
-    #it will pick all triggers which has these strings in theri name
-    process.dqmBeamMonitor.jetTrigger  = cms.untracked.vstring("HLT_PAZeroBias_v",
-                                                               "HLT_ZeroBias_v", 
-                                                               "HLT_QuadJet")
-
-    process.dqmBeamMonitor.hltResults = cms.InputTag("TriggerResults","","HLT")
-
-
-    process.p = cms.Path(process.scalersRawToDigi
-                         *process.dqmTKStatus
-                         *process.hltTriggerTypeFilter
-                         *process.dqmcommon
-                         *process.tracking_FirstStep
-                         *process.monitor
-                         *process.BeamSpotProblemModule)
+    qtList = cms.untracked.FileInPath('DQM/BeamMonitor/test/BeamSpotAvailableTest.xml'),
+    prescaleFactor = cms.untracked.int32(1),                               
+    qtestOnEndLumi = cms.untracked.bool(True),
+    testInEventloop = cms.untracked.bool(False),
+    verboseQT =  cms.untracked.bool(True)                 
+)
 
+#
+process.BeamSpotProblemModule = cms.Sequence(process.qTester
+ 	  	                           * process.dqmBeamSpotProblemMonitor)
 
+# make it off for cosmic run
+if ( process.runType.getRunType() == process.runType.cosmic_run or
+     process.runType.getRunType() == process.runType.cosmic_run_stage1):
+    process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 5 # <AlarmONThreshold
 
+#------------------------
+# Process customizations
+from DQM.Integration.config.online_customizations_cfi import *
+process = customise(process)
 
+#------------------------
+# Set rawDataRepacker (HI and live) or rawDataCollector (for all the rest)
+if (process.runType.getRunType() == process.runType.hi_run and live):
+    rawDataInputTag = cms.InputTag("rawDataRepacker")
+else:
+    rawDataInputTag = cms.InputTag("rawDataCollector")
+
+process.castorDigis.InputLabel           = rawDataInputTag
+process.csctfDigis.producer              = rawDataInputTag 
+process.dttfDigis.DTTF_FED_Source        = rawDataInputTag
+process.ecalDigis.InputLabel             = rawDataInputTag
+process.ecalPreshowerDigis.sourceTag     = rawDataInputTag
+process.gctDigis.inputLabel              = rawDataInputTag
+process.gtDigis.DaqGtInputTag            = rawDataInputTag
+process.hcalDigis.InputLabel             = rawDataInputTag
+process.muonCSCDigis.InputObjects        = rawDataInputTag
+process.muonDTDigis.inputLabel           = rawDataInputTag
+process.muonRPCDigis.InputLabel          = rawDataInputTag
+process.scalersRawToDigi.scalersInputTag = rawDataInputTag
+process.siPixelDigis.InputLabel          = rawDataInputTag
+process.siStripDigis.ProductLabel        = rawDataInputTag
+
+process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")
+
+process.dqmBeamMonitor.OnlineMode = True
+
+process.dqmBeamMonitor.resetEveryNLumi   = 5 # was 10 for HI
+process.dqmBeamMonitor.resetPVEveryNLumi = 5 # was 10 for HI
+
+process.dqmBeamMonitor.PVFitter.minNrVerticesForFit = 20
+process.dqmBeamMonitor.PVFitter.minVertexNdf = 10
+process.dqmBeamMonitor.PVFitter.errorScale = 1.22
 
-#--------------------------------------------------
-# Heavy Ion Stuff
-#--------------------------------------------------
+#----------------------------
+# Pixel tracks/vertices reco
+process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
+process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
+process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
+process.pixelTracksTrackingRegions.RegionPSet.originXPos =  0.08
+process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
+process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.
+
+process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin
+
+process.tracking_FirstStep = cms.Sequence(
+      process.siPixelDigis 
+    * process.siStripDigis
+    * process.striptrackerlocalreco
+    * process.offlineBeamSpot
+    * process.siPixelClustersPreSplitting
+    * process.siPixelRecHitsPreSplitting
+    * process.siPixelClusterShapeCachePreSplitting
+    * process.recopixelvertexing)
+
+# triggerName for selecting pv for DIP publication, no wildcard needed here
+# it will pick all triggers which has these strings in theri name
+process.dqmBeamMonitor.jetTrigger  = cms.untracked.vstring(
+         "HLT_PAZeroBias_v", "HLT_ZeroBias_v", "HLT_QuadJet",
+         "HLT_ZeroBias_",
+         "HLT_HI")
+
+# for HI only: select events based on the pixel cluster multiplicity
 if (process.runType.getRunType() == process.runType.hi_run):
-
-    print "beam_dqm_sourceclient-live_cfg:Running HI"
-    process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")
-    process.csctfDigis.producer = cms.InputTag("rawDataRepacker")
-    process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker")
-    process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker")
-    process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker")
-    process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
-    process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
-    process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker")
-    process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker")
-    process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
-    process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
-    process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
-    process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
-    process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
-
-    #----------------------------
-    # Event Source
-    #-----------------------------
-
-    process.dqmBeamMonitor.OnlineMode = True                  ## in MC the LS are not ordered??
-    process.dqmBeamMonitor.resetEveryNLumi = 10
-    process.dqmBeamMonitor.resetPVEveryNLumi = 10
-
-    process.dqmBeamMonitor.BeamFitter.MinimumTotalLayers = 3   ## using pixel triplets
-    process.dqmBeamMonitor.BeamFitter.MinimumPixelLayers = 3
-    process.dqmBeamMonitor.BeamFitter.MaximumNormChi2    = 30.0
-
-    process.dqmBeamMonitor.PVFitter.minVertexNdf = 4
-    process.dqmBeamMonitor.PVFitter.minNrVerticesForFit = 20
-    process.dqmBeamMonitor.PVFitter.errorScale = 1.25       ## taken from 2012 pixel vtx studies
-
-    process.dqmBeamMonitor.jetTrigger  = cms.untracked.vstring("HLT_HI")
-    process.dqmBeamMonitor.hltResults = cms.InputTag("TriggerResults","","HLT")
-    process.dqmBeamSpotProblemMonitor.pixelTracks = 'hiPixel3PrimTracks'
-
-    # copy from online
-    import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
-    offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
-
-    ## Load Heavy Ion Sequence
-    process.load("Configuration.StandardSequences.ReconstructionHeavyIons_cff") ## HI sequences
-    process.load('RecoLocalTracker.Configuration.RecoLocalTrackerHeavyIons_cff')
-    from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *
-    from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *
-    siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(
-       src = 'siPixelClustersPreSplitting'
-    )  
-       
-    # Select events based on the pixel cluster multiplicity
-    import  HLTrigger.special.hltPixelActivityFilter_cfi
+    import HLTrigger.special.hltPixelActivityFilter_cfi
     process.multFilter = HLTrigger.special.hltPixelActivityFilter_cfi.hltPixelActivityFilter.clone(
-      inputTag  = cms.InputTag('siPixelClustersPreSplitting'),
-      minClusters = cms.uint32(150),
-      maxClusters = cms.uint32(10000) #80% efficiency in HI MC
-      )
+        inputTag  = cms.InputTag('siPixelClustersPreSplitting'),
+        minClusters = cms.uint32(150),
+        maxClusters = cms.uint32(50000) # was 10000
+    )
        
     process.filter_step = cms.Sequence( process.siPixelDigis
-                                       *process.siPixelClustersPreSplitting
-                                       *process.multFilter
-                                  )
-       
-    from RecoHI.HiTracking.HIPixelVerticesPreSplitting_cff import *
-       
-    process.PixelLayerTriplets.BPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
-    process.PixelLayerTriplets.FPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
-
-    process.hiPixel3PrimTracksFilter = process.hiFilter.clone(
-        VertexCollection = "hiSelectedVertexPreSplitting",
-        chi2 = 1000.0,
-        clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting",
-        lipMax = 0.3,
-        nSigmaLipMaxTolerance = 0,
-        nSigmaTipMaxTolerance = 6.0,
-        ptMin = 0.9,
-        tipMax = 0,
+                                      * process.siPixelClustersPreSplitting
+                                      * process.multFilter
     )
-    process.hiPixel3PrimTracks.Filter = "hiPixel3PrimTracksFilter"
-      
-    process.hiPixel3PrimTracks.RegionFactoryPSet = cms.PSet(
-        ComponentName = cms.string('GlobalTrackingRegionWithVerticesProducer'),
-        RegionPSet = cms.PSet(
-            VertexCollection = cms.InputTag("hiSelectedVertexPreSplitting"),
-            beamSpot = cms.InputTag("offlineBeamSpot"),
-            fixedError = cms.double(0.2),
-            nSigmaZ = cms.double(3.0),
-            originRadius = cms.double(0.1),
-            precise = cms.bool(True),
-            ptMin = cms.double(0.9),
-            sigmaZVertex = cms.double(3.0),
-            useFixedError = cms.bool(True),
-            useFoundVertices = cms.bool(True)
-        )
-        )
-    process.hiPixel3PrimTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
-    process.hiPixel3PrimTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
-    ## From HI group     
-    process.HIRecoForDQM = cms.Sequence( process.siPixelDigis
-                                        *process.siStripDigis
-                                        *process.offlineBeamSpot  #<-clone of onlineBS
-                                        *process.pixeltrackerlocalreco
-                                        *process.striptrackerlocalreco             
-                                        *process.MeasurementTrackerEventPreSplitting
-                                        *process.siPixelClusterShapeCachePreSplitting
-                                        *process.hiPixelVerticesPreSplitting
-                                        *process.PixelLayerTriplets 
-                                        *process.pixelFitterByHelixProjections
-                                        *process.hiPixel3PrimTracksFilter
-                                        *process.hiPixel3PrimTracks
-                                       )
-      
-    # use HI pixel tracking and vertexing
-    process.dqmBeamMonitor.BeamFitter.TrackCollection = cms.untracked.InputTag('hiPixel3PrimTracks')
-    process.dqmBeamMonitor.primaryVertex = cms.untracked.InputTag('hiSelectedVertexPreSplitting')
-    process.dqmBeamMonitor.PVFitter.VertexCollection = cms.untracked.InputTag('hiSelectedVertexPreSplitting')
-
-      
-    # make pixel VERTEXING less sensitive to incorrect beamspot
-    process.hiPixel3ProtoTracksPreSplitting.RegionFactoryPSet.RegionPSet.originRadius = 0.2 #default 0.2
-    process.hiPixel3ProtoTracksPreSplitting.RegionFactoryPSet.RegionPSet.fixedError = 0.5   #default 3.0
-    process.hiSelectedProtoTracksPreSplitting.maxD0Significance = 100                       #default 5.0
-    process.hiPixelAdaptiveVertexPreSplitting.TkFilterParameters.maxD0Significance = 100    #default 3.0
-    process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.useBeamConstraint = False  #default False
-    process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.maxDistanceToBeam = 1.0    #default 0.1
-      
-      
+
+process.dqmBeamMonitor.hltResults = cms.InputTag("TriggerResults","","HLT")
+
+#---------
+# Final path
+if (not process.runType.getRunType() == process.runType.hi_run):
+    process.p = cms.Path(process.scalersRawToDigi
+                       * process.dqmTKStatus
+                       * process.hltTriggerTypeFilter
+                       * process.dqmcommon
+                       * process.tracking_FirstStep
+                       * process.monitor
+                       * process.BeamSpotProblemModule)
+else:
     process.p = cms.Path(process.scalersRawToDigi
-                        *process.dqmTKStatus
-                        *process.hltTriggerTypeFilter
-                        *process.filter_step
-                        *process.HIRecoForDQM
-                        *process.dqmcommon
-                        *process.monitor
-                        *process.BeamSpotProblemModule)
-                                                        
+                       * process.dqmTKStatus
+                       * process.hltTriggerTypeFilter
+                       * process.filter_step # the only extra: pix-multi filter
+                       * process.dqmcommon
+                       * process.tracking_FirstStep
+                       * process.monitor
+                       * process.BeamSpotProblemModule)
 
diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
index e7722a9046f36..7b4115f74ad84 100644
--- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
@@ -91,7 +92,7 @@
 if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or 
     process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or 
     process.runType.getRunType() == process.runType.hpu_run):
-    print "[beampixel_dqm_sourceclient-live_cfg]::running pp"
+    print("[beampixel_dqm_sourceclient-live_cfg]::running pp")
 
 
     #----------------------------
@@ -112,7 +113,7 @@
     process.siPixelDigis.InputLabel          = cms.InputTag("rawDataCollector")
     process.siStripDigis.ProductLabel        = cms.InputTag("rawDataCollector")
 
-
+    
     #----------------------------
     # pixelVertexDQM Config
     #----------------------------
@@ -144,7 +145,7 @@
 # Heavy Ion Specific Section
 #----------------------------
 if (process.runType.getRunType() == process.runType.hi_run):
-    print "[beampixel_dqm_sourceclient-live_cfg]::running HI"
+    print("[beampixel_dqm_sourceclient-live_cfg]::running HI")
 
 
     #----------------------------
@@ -200,7 +201,7 @@
     process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt")
 else:
     process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt")
-print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName)
+print("[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName))
 
 
 #----------------------------
diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
index 426df8c353c57..e14e1dde331c7 100644
--- a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
@@ -1,13 +1,8 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("CSCDQMLIVE")
 
-#-------------------------------------------------
-# CSC L1 Emulator Configuration
-#-------------------------------------------------
-
-process.load("L1Trigger.CSCTriggerPrimitives.CSCTPE_setup_cfi")
-
 #-------------------------------------------------
 # DQM Module Configuration
 #-------------------------------------------------
@@ -153,8 +148,8 @@
     threshold = cms.untracked.string('ERROR')
   ),
   debugModules = cms.untracked.vstring('CSCMonitormodule'),
-#  destinations = cms.untracked.vstring('detailedInfo', 
-#    'critical', 
+#  destinations = cms.untracked.vstring('detailedInfo',
+#    'critical',
 #    'cout')
 
 )
@@ -164,9 +159,7 @@
 #--------------------------
 
 #process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver)
-# Configuration not working due to process.lctreader
-#process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.cscTriggerPrimitiveDigis * process.lctreader * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
-process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.cscTriggerPrimitiveDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
+process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
 
 
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
@@ -191,7 +184,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 
 if (process.runType.getRunType() == process.runType.hi_run):
     process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")
diff --git a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py
index e29bb00ea3ffa..b50793e7a5e78 100644
--- a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS
@@ -162,7 +163,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")
diff --git a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py
index 616d8fc45d369..5ddb7506f1e6e 100644
--- a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS
@@ -176,7 +177,7 @@
 #
 # process.l1EmulatorEventInfoClient.verbose = cms.untracked.bool(True)
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")
diff --git a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py
index 8025456aeba22..20371cf54497f 100644
--- a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS
@@ -172,7 +173,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")
diff --git a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py
index 8042a58ffd2fc..c7b24f6137478 100644
--- a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS
@@ -185,7 +186,7 @@
 #
 # process.l1EmulatorEventInfoClient.verbose = cms.untracked.bool(True)
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")
diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
index bb57bd794d842..a6362a54ffc17 100644
--- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
@@ -139,7 +139,6 @@
     process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
     process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
     process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
-    process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
     process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker")
     process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
@@ -154,6 +153,8 @@
     process.l1tStage2BmtfZeroSupp.rawData = cms.InputTag("rawDataRepacker")
     process.l1tStage2BmtfZeroSuppFatEvts.rawData = cms.InputTag("rawDataRepacker")
     process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker")
+    process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
 
 #--------------------------------------------------
 # L1T Online DQM Schedule
diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
index 735e5d534a9e5..614dbb3cfd59d 100644
--- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
@@ -135,8 +135,8 @@
     process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
     process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
     process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
-    process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
     process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker")
+    process.valBmtfAlgoSel.feds = cms.InputTag("rawDataRepacker")
     process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker")
     process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
     process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
@@ -147,6 +147,9 @@
     process.l1tdeStage2CaloLayer1.fedRawDataLabel = cms.InputTag("rawDataRepacker")
     process.gtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
     process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker")
+    process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.hltFatEventFilter.HLTPaths.append('HLT_HIPhysics_v*')
 
 #--------------------------------------------------
 # L1T Emulator Online DQM Schedule
diff --git a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py
index b57dae98c2897..d7a35b425baab 100644
--- a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # $Id: physics_dqm_sourceclient-live_cfg.py,v 1.11 2012/02/13 15:09:30 lilopera Exp $
 
 import FWCore.ParameterSet.Config as cms
@@ -59,7 +60,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 
 if (process.runType.getRunType() == process.runType.hi_run):
     process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
index ada44f38c718c..ebaa305eb8aae 100644
--- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
@@ -1,10 +1,13 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("PIXELDQMLIVE", eras.Run2_2018)
+process = cms.Process("PIXELDQMLIVE", eras.Run2_2018_pp_on_AA)
 
-live=True  #set to false for lxplus offline testing
+live=True
+#set to false for lxplus offline testing
+#live=False
 offlineTesting=not live
 
 TAG ="PixelPhase1" 
@@ -47,8 +50,8 @@
 
 
 process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_pp.root'
-if (process.runType.getRunType() == process.runType.hi_run):
-    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_hi.root'
+#if (process.runType.getRunType() == process.runType.hi_run):
+#    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_hi.root'
 
 if (process.runType.getRunType() == process.runType.cosmic_run):
     process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_cosmic.root'
@@ -95,17 +98,17 @@
 process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi")
 process.siPixelDigis.IncludeErrors = True
 
-process.siPixelDigis.InputLabel   = cms.InputTag("rawDataCollector")
-process.siStripDigis.InputLabel   = cms.InputTag("rawDataCollector")
+if (process.runType.getRunType() == process.runType.hi_run):    
+    #--------------------------------
+    # Heavy Ion Configuration Changes
+    #--------------------------------
+    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataRepacker")
+    process.siStripDigis.ProductLabel   = cms.InputTag("rawDataRepacker")
+    process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
+else :
+    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataCollector")
+    process.siStripDigis.InputLabel   = cms.InputTag("rawDataCollector")
 
-#--------------------------------
-# Heavy Ion Configuration Changes
-#--------------------------------
-#
-#if (process.runType.getRunType() == process.runType.hi_run):    
-#    process.load('Configuration.StandardSequences.ReconstructionHeavyIons_cff')
-#    process.load('Configuration.StandardSequences.RawToDigi_Repacked_cff')
-#    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataRepacker")
 
 ## Collision Reconstruction
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
@@ -144,7 +147,10 @@
 )
 
 process.load('HLTrigger.HLTfilters.hltHighLevel_cfi')
-process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*')
+if (process.runType.getRunType() == process.runType.hi_run):
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_HIZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*' , 'HLT_HICentralityVeto*' , 'HLT_HIMinimumBias*','HLT_HIPhysics*')
+else:
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*')
 process.hltHighLevel.andOr = cms.bool(True)
 process.hltHighLevel.throw =  cms.bool(False)
 
@@ -182,9 +188,9 @@
                          process.siPixelPhase1OnlineDQM_harvesting
                          )
    
-### pp COLLISION SETTING
+### pp/hi COLLISION SETTING
 
-if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1):
+if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.hi_run):
     # Reco for pp collisions
     process.load('RecoTracker.IterativeTracking.InitialStepPreSplitting_cff')
     process.InitialStepPreSplittingTask.remove(process.initialStepTrackRefsForJetsPreSplitting)
@@ -207,9 +213,9 @@
     process.RecoForDQM_TrkReco = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEventPreSplitting*process.siPixelClusterShapeCachePreSplitting*process.recopixelvertexing*process.InitialStepPreSplitting)
 
     if (process.runType.getRunType() == process.runType.hi_run):
-        process.SiPixelClusterSource.src = cms.InputTag("siPixelClustersPreSplitting")
-        process.Reco = cms.Sequence(process.siPixelDigis*process.pixeltrackerlocalreco)
-
+        #        process.SiPixelClusterSource.src = cms.InputTag("siPixelClustersPreSplitting")
+        #        process.Reco = cms.Sequence(process.siPixelDigis*process.pixeltrackerlocalreco)
+        process.Reco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco)
     else:
         process.Reco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco)
                           
@@ -236,4 +242,4 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
diff --git a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py
index 8fe47954aa8b3..cdc9302a927d0 100644
--- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("PixelLumiDQM")
@@ -101,7 +102,7 @@
 else:
     process.pixel_lumi_dqm.logFileName = cms.untracked.string("/nfshome0/dqmpro/pixel_lumi.txt")
 
-print process.pixel_lumi_dqm.logFileName
+print(process.pixel_lumi_dqm.logFileName)
     
 #--------------------------
 # Service
diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
index e22f5a166f38a..2106bf2a04a4a 100644
--- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
@@ -1,8 +1,9 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("SiStrpDQMLive", eras.Run2_2017)
+process = cms.Process("SiStrpDQMLive", eras.Run2_2018_pp_on_AA)
 
 process.MessageLogger = cms.Service("MessageLogger",
     debugModules = cms.untracked.vstring('siStripDigis',
@@ -184,7 +185,13 @@
 # HLT trigger selection (HLT_ZeroBias)
 # modified for 0 Tesla HLT menu (no ZeroBias_*)
 process.load('HLTrigger.HLTfilters.hltHighLevel_cfi')
-process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*')
+if (process.runType.getRunType() == process.runType.hi_run):
+    #--------------------------
+    # HI Runs HLT path
+    #--------------------------
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_HIZeroBias*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*' , 'HLT_HICentralityVeto*','HLT_HIMinimumBias*', 'HLT_HIPhysics*')
+else:
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*')
 process.hltHighLevel.andOr = cms.bool(True)
 process.hltHighLevel.throw =  cms.bool(False)
 
@@ -193,8 +200,10 @@
 #--------------------------
 process.SiStripSources_LocalReco = cms.Sequence(process.siStripFEDMonitor*process.SiStripMonitorDigi*process.SiStripMonitorClusterReal)
 process.DQMCommon                = cms.Sequence(process.stripQTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver)
-process.RecoForDQM_LocalReco     = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.gtDigis*process.trackerlocalreco)
-
+if (process.runType.getRunType() == process.runType.hi_run):
+    process.RecoForDQM_LocalReco     = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco)
+else :
+    process.RecoForDQM_LocalReco     = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.gtDigis*process.trackerlocalreco)
 #------------------------------------------------------
 # Switch for channel errors per FED ID trend plots.
 #------------------------------------------------------
@@ -386,7 +395,7 @@
     # it should already be ok, but the name could be changed
     process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias*' )
 
-#    process.DQMEventStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_600Tower*','HLT_L1*','HLT_Jet*','HLT_HT*','HLT_MinBias_*','HLT_Physics*', 'HLT_ZeroBias*'))
+ #        process.DQMEventStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_600Tower*','HLT_L1*','HLT_Jet*','HLT_HT*','HLT_MinBias_*','HLT_Physics*', 'HLT_ZeroBias*'))
 #
     process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_pp.root'
 
@@ -482,7 +491,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 ### HEAVY ION SETTING
 if (process.runType.getRunType() == process.runType.hi_run):
     process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")
@@ -491,7 +500,6 @@
     process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker")
     process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
-    process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
     process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker")
     process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
@@ -501,89 +509,121 @@
     process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
     process.siStripFEDMonitor.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
 
+    if ((process.runType.getRunType() == process.runType.hi_run) and live):
+        process.source.SelectEvents = cms.untracked.vstring(
+            'HLT_HICentralityVeto*',
+#            'HLT_HIMinimumBias*',
+#            'HLT_HIZeroBias*'
+            'HLT_HIPhysics*'
+            )
+
+    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_pp.root'
+
+
+    process.SiStripMonitorDigi.UseDCSFiltering = cms.bool(False)
+    process.SiStripMonitorClusterReal.UseDCSFiltering = cms.bool(False)
+
+    process.MonitorTrackResiduals_gentk.Tracks                 = 'initialStepTracksPreSplitting'
+    process.MonitorTrackResiduals_gentk.trajectoryInput        = 'initialStepTracksPreSplitting'
+    process.MonitorTrackResiduals_gentk.TrackProducer          = cms.string('initialStepTracksPreSplitting')
+    process.TrackMon_gentk.TrackProducer    = cms.InputTag('initialStepTracksPreSplitting')
+    process.TrackMon_gentk.allTrackProducer = cms.InputTag('initialStepTracksPreSplitting')
+    process.SiStripMonitorTrack_gentk.TrackProducer = 'initialStepTracksPreSplitting'
+
+    process.SiStripSources_TrkReco   = cms.Sequence(process.SiStripMonitorTrack_gentk*process.MonitorTrackResiduals_gentk*process.TrackMon_gentk)
+
+    ### STRIP
+    process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_cff")
+    process.SiStripAnalyser.UseGoodTracks  = cms.untracked.bool(True)
+    process.SiStripAnalyser.TkMapCreationFrequency  = -1
+    process.SiStripAnalyser.ShiftReportFrequency = -1
+    process.SiStripAnalyser.StaticUpdateFrequency = 5
+    process.SiStripAnalyser.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
+    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False)
+    process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
+
+    process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = cms.int32(25)
+    ### TRACKING
+    process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff")
+    process.TrackingAnalyser.ShiftReportFrequency = -1
+    process.TrackingAnalyser.StaticUpdateFrequency = 5
+    process.TrackingAnalyser.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
+    if offlineTesting :
+        process.TrackingAnalyser.verbose = cms.untracked.bool(True)
+    process.TrackingClient = cms.Sequence( process.TrackingAnalyser )
+
+    process.trackingQTester.qtList                  = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml')
+    process.trackingQTester.prescaleFactor          = cms.untracked.int32(1)
+    process.trackingQTester.getQualityTestsFromFile = cms.untracked.bool(True)
+    process.trackingQTester.qtestOnEndLumi          = cms.untracked.bool(True)
+    process.trackingQTester.qtestOnEndRun           = cms.untracked.bool(True)
+
+    # Reco for pp collisions
+
+    process.load('RecoTracker.IterativeTracking.InitialStepPreSplitting_cff')
+    '''process.InitialStepPreSplitting.remove(process.initialStepTrackRefsForJetsPreSplitting)
+    process.InitialStepPreSplitting.remove(process.caloTowerForTrkPreSplitting)
+    process.InitialStepPreSplitting.remove(process.ak4CaloJetsForTrkPreSplitting)
+    process.InitialStepPreSplitting.remove(process.jetsForCoreTrackingPreSplitting)
+    process.InitialStepPreSplitting.remove(process.siPixelClusters)
+    process.InitialStepPreSplitting.remove(process.siPixelRecHits)
+    process.InitialStepPreSplitting.remove(process.MeasurementTrackerEvent)
+    process.InitialStepPreSplitting.remove(process.siPixelClusterShapeCache)'''
+
+    process.InitialStepPreSplittingTask.remove(process.initialStepTrackRefsForJetsPreSplitting)
+    process.InitialStepPreSplittingTask.remove(process.caloTowerForTrkPreSplitting)
+    process.InitialStepPreSplittingTask.remove(process.ak4CaloJetsForTrkPreSplitting)
+    process.InitialStepPreSplittingTask.remove(process.jetsForCoreTrackingPreSplitting)
+    process.InitialStepPreSplittingTask.remove(process.siPixelClusters)
+    process.InitialStepPreSplittingTask.remove(process.siPixelRecHits)
+    process.InitialStepPreSplittingTask.remove(process.MeasurementTrackerEvent)
+
+    # Redefinition of siPixelClusters: has to be after RecoTracker.IterativeTracking.InitialStepPreSplitting_cff
+    process.load("RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi")
+
     # Select events based on the pixel cluster multiplicity
     import  HLTrigger.special.hltPixelActivityFilter_cfi
     process.multFilter = HLTrigger.special.hltPixelActivityFilter_cfi.hltPixelActivityFilter.clone(
         inputTag  = cms.InputTag('siPixelClusters'),
-        minClusters = cms.uint32(10000),
+        minClusters = cms.uint32(1),
         maxClusters = cms.uint32(50000)
         )
-    # Trigger selection
-#    process.DQMEventStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_HIJet*','HLT_HICentralityVeto*','HLT_HIFullTrack*','HLT_HIMinBias*'))
-#
-    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_hi.root'
-    # Quality test for HI
-    process.stripQTester = cms.EDAnalyzer("QualityTester",
-                                     qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_heavyion.xml'),
-                                     prescaleFactor = cms.untracked.int32(3),
-                                     getQualityTestsFromFile = cms.untracked.bool(True),
-                                     qtestOnEndLumi = cms.untracked.bool(True),
-                                     qtestOnEndRun = cms.untracked.bool(True)
-                                     )
-
-    process.trackingQTester.qtList                  = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml')
-    process.trackingQTester.prescaleFactor          = cms.untracked.int32(2)
-    process.trackingQTester.getQualityTestsFromFile = cms.untracked.bool(True)
-    process.trackingQTester.qtestOnEndLumi          = cms.untracked.bool(True)
-    process.trackingQTester.qtestOnEndRun           = cms.untracked.bool(True)
-
-    # Sources for HI
-    process.load("Configuration.StandardSequences.RawToDigi_Repacked_cff")
-    process.SiStripBaselineValidator.srcProcessedRawDigi =  cms.InputTag('siStripVRDigis','VirginRaw')
-    process.SiStripMonitorTrack_hi.TrackProducer = "hiSelectedTracks"
-    process.TrackMon_hi.TrackProducer = "hiSelectedTracks"
 
-    process.SiStripSources_TrkReco   = cms.Sequence(process.SiStripMonitorTrack_hi*process.TrackMon_hi)
-
-    ### STRIP
-    process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_HeavyIons_cff")
-    process.SiStripAnalyserHI.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
-    process.SiStripAnalyserHI.TkMapCreationFrequency  = -1
-    process.SiStripAnalyserHI.ShiftReportFrequency = -1
-    process.SiStripAnalyserHI.StaticUpdateFrequency = 5
-    process.SiStripAnalyserHI.MonitorSiStripBackPlaneCorrection = cms.bool(False)
-    process.SiStripClients  = cms.Sequence(process.SiStripAnalyserHI)
-    ### TRACKING
-    process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_HeavyIons_cff")
-    process.TrackingAnalyserHI.ShiftReportFrequency = -1
-    process.TrackingAnalyserHI.StaticUpdateFrequency = 5
-    process.TrackingAnalyserHI.RawDataTag            = cms.untracked.InputTag("rawDataCollector")
-    process.TrackingClient = cms.Sequence( process.TrackingAnalyserHI )
+    # BaselineValidator Module
+    from EventFilter.SiStripRawToDigi.SiStripDigis_cfi import siStripDigis as _siStripDigis
+    process.siStripDigisNoZS=_siStripDigis.clone()
+    process.siStripDigisNoZS.ProductLabel = cms.InputTag("rawDataCollector")
+    process.SiStripBaselineValidator.srcProcessedRawDigi =  cms.InputTag('siStripDigisNoZS','ZeroSuppressed')
 
-    process.load("RecoLocalTracker.Configuration.RecoLocalTrackerHeavyIons_cff")
 
-    # Reco for HI collisions
-    process.load("RecoHI.HiTracking.LowPtTracking_PbPb_cff")
+    from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
     process.PixelLayerTriplets.BPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
     process.PixelLayerTriplets.FPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
+    from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
+    process.pixelTracksHitTriplets.SeedComparitorPSet.clusterShapeCacheSrc = 'siPixelClusterShapeCachePreSplitting'
 
-    process.hiProtoTrackFilter.siPixelRecHits = "siPixelRecHitsPreSplitting"
-    process.hiPixel3ProtoTracks.RegionFactoryPSet.RegionPSet.siPixelRecHits = cms.InputTag("siPixelRecHitsPreSplitting")
-
-    process.hiFilter.clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting"
-
-    process.hiPrimTrackCandidates.MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEventPreSplitting")
-    process.hiGlobalPrimTracks.MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEventPreSplitting")
-    process.multFilter.inputTag = cms.InputTag("siPixelClustersPreSplitting")
-    process.SiStripMonitorTrack_hi.TrackProducer = cms.string('hiSelectedTracks')
-    process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.siStripVRDigis*process.gtDigis*process.trackerlocalreco*process.pixeltrackerlocalreco)
-    process.RecoForDQM_TrkReco = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEventPreSplitting*process.siPixelClusterShapeCachePreSplitting*process.hiBasicTracking*process.hiSelectedTracks)
+    process.RecoForDQM_TrkReco = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEventPreSplitting*process.siPixelClusterShapeCachePreSplitting*process.recopixelvertexing*process.InitialStepPreSplitting)
 
-    process.p = cms.Path(process.scalersRawToDigi*
-                         process.APVPhases*
-                         process.consecutiveHEs*
-                         process.hltTriggerTypeFilter*
-                         process.siStripFEDCheck *
-                         process.RecoForDQM_LocalReco*
-                         process.DQMCommon*
-                         process.SiStripClients*
-                         process.SiStripSources_LocalReco*
-                         process.RecoForDQM_TrkReco*
-                         process.SiStripSources_TrkReco*
-                         process.multFilter*
-                         process.SiStripBaselineValidator*
-                         process.TrackingClient
-                         )
+    process.p = cms.Path(
+        process.scalersRawToDigi*
+        process.APVPhases*
+        process.consecutiveHEs*
+        process.hltTriggerTypeFilter*
+        process.siStripFEDCheck *
+        process.siStripDigisNoZS*
+        process.SiStripBaselineValidator*
+        process.RecoForDQM_LocalReco*
+        process.siPixelClusters*
+        process.DQMCommon*
+        process.SiStripClients*
+        process.SiStripSources_LocalReco*
+        process.multFilter*
+        ##### TRIGGER SELECTION #####
+        process.hltHighLevel*
+        process.RecoForDQM_TrkReco*
+        process.SiStripSources_TrkReco*
+        process.TrackingClient
+    )
 
 
 ### process customizations included here
diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py
index ad975fa183566..b001700d8f369 100644
--- a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py
+++ b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py
@@ -24,7 +24,6 @@
 from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import *
 from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEGeometricESProducer_cfi import *
 
-from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 phase2_tracker.toReplaceWith(pixeltrackerlocalreco,
   cms.Sequence(
           siPhase2Clusters +
@@ -32,10 +31,6 @@
           siPixelRecHitsPreSplitting
   )
 )
-phase2_tracker.toModify(clusterSummaryProducer,
-  doStrips = False,
-  stripClusters = ''
-)
 phase2_tracker.toReplaceWith(trackerlocalreco,
   cms.Sequence(
           pixeltrackerlocalreco*clusterSummaryProducer
diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h
index 109d1be432f7f..45ce45ea1ac8c 100644
--- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h
+++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h
@@ -271,7 +271,6 @@ class PixelCPEBase : public PixelClusterParameterEstimator
    LocalVector driftDirection       (DetParam & theDetParam, LocalVector bfield ) const ;
    void computeLorentzShifts(DetParam &) const ;
    
-   bool isFlipped(DetParam const & theDetParam) const;              // is the det flipped or not?
    
    //---------------------------------------------------------------------------
    //  Cluster-level services.
diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py
index 058cff99e4d42..a34d575a56a15 100644
--- a/Validation/Configuration/python/globalValidation_cff.py
+++ b/Validation/Configuration/python/globalValidation_cff.py
@@ -195,3 +195,5 @@
 run3_GEM.toReplaceWith( globalValidation, _run3_globalValidation )
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
 phase2_muon.toReplaceWith( globalValidation, _phase2_globalValidation )
+from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+pp_on_AA_2018.toReplaceWith(globalValidation, globalValidation.copyAndExclude([pfTauRunDQMValidation]))