Diff modsOn

diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
index efa6b10..53231b5 100644
--- a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
+++ b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
@@ -33,8 +33,6 @@ SiStripMonitorDigi.TProfNShotsVsTime.subdetswitchon = True
 SiStripMonitorDigi.TProfNShotsVsTime.globalswitchon = True
 SiStripMonitorDigi.TProfGlobalNShots.globalswitchon = True
 
-from DQM.SiStripMonitorClient.pset4GenericTriggerEventFlag_cfi import *
-
 # SiStripMonitorCluster ####
 from DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi import *
 SiStripMonitorClusterBPTX = SiStripMonitorCluster.clone()
@@ -49,7 +47,14 @@ SiStripMonitorClusterBPTX.TH1MainDiagonalPosition.globalswitchon = True
 SiStripMonitorClusterBPTX.TH1StripNoise2ApvCycle.globalswitchon  = True
 SiStripMonitorClusterBPTX.TH1StripNoise3ApvCycle.globalswitchon  = True
 SiStripMonitorClusterBPTX.ClusterHisto = True
-SiStripMonitorClusterBPTX.BPTXfilter = genericTriggerEventFlag4L1bd
+SiStripMonitorClusterBPTX.BPTXfilter = cms.PSet(
+    andOr         = cms.bool( False ),
+    dbLabel       = cms.string("SiStripDQMTrigger"),
+    l1Algorithms = cms.vstring( 'L1Tech_BPTX_plus_AND_minus.v0', 'L1_ZeroBias' ),
+    andOrL1       = cms.bool( True ),
+    errorReplyL1  = cms.bool( True ),
+    l1BeforeMask  = cms.bool( True ) # specifies, if the L1 algorithm decision should be read as before (true) or after (false) masking is applied. 
+)
 SiStripMonitorClusterBPTX.PixelDCSfilter = cms.PSet(
     andOr         = cms.bool( False ),
     dcsInputTag   = cms.InputTag( "scalersRawToDigi" ),
@@ -65,14 +70,7 @@ SiStripMonitorClusterBPTX.StripDCSfilter = cms.PSet(
     errorReplyDcs = cms.bool( True ),
 )
 
-from Configuration.StandardSequences.Eras import eras
-eras.stage2L1Trigger.toModify(SiStripMonitorClusterBPTX,
-    BPTXfilter = dict(
-        stage2 = cms.bool(True),
-        l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
-        l1tExtBlkInputTag = cms.InputTag("gtStage2Digis")
-    )
-)
+
 
 # Clone for SiStripMonitorTrack for all PDs but Minimum Bias and Jet ####
 import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi 
@@ -86,17 +84,117 @@ SiStripMonitorTrackCommon.TH1ClusterStoNCorr.ringView = cms.bool( True )
 import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 SiStripMonitorTrackMB = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 SiStripMonitorTrackMB.TrackProducer = 'generalTracks'
-SiStripMonitorTrackMB.Mod_On        = False
-SiStripMonitorTrackMB.genericTriggerEventPSet = genericTriggerEventFlag4HLTdb
-SiStripMonitorTrackMB.TH1ClusterCharge.ringView = cms.bool( True )
-SiStripMonitorTrackMB.TH1ClusterStoNCorr.ringView = cms.bool( True )
+SiStripMonitorTrackMB.Mod_On        = True
+SiStripMonitorTrackMB.andOr         = cms.bool( False )
+SiStripMonitorTrackMB.dbLabel       = cms.string("SiStripDQMTrigger")
+SiStripMonitorTrackMB.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+SiStripMonitorTrackMB.hltPaths = cms.vstring("HLT_ZeroBias_v*","HLT_HIZeroBias_v*")
+SiStripMonitorTrackMB.hltDBKey = cms.string("Tracker_MB")
+SiStripMonitorTrackMB.errorReplyHlt  = cms.bool( False )
+SiStripMonitorTrackMB.andOrHlt = cms.bool(True) # True:=OR; False:=AND
+# Histo configuration
+SiStripMonitorTrackMB.TH1ClusterCharge.ringView       = cms.bool(True)
+SiStripMonitorTrackMB.TH1ClusterChargePerCM.ringView  = cms.bool(True)
+SiStripMonitorTrackMB.TH1ClusterStoNCorr.ringView     = cms.bool(True)
+SiStripMonitorTrackMB.TH1ClusterChargePerCM.layerView = cms.bool(True)
+
+
+SiStripMonitorTrackIB = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
+SiStripMonitorTrackIB.TrackProducer = 'generalTracks'
+SiStripMonitorTrackIB.Mod_On        = True
+SiStripMonitorTrackIB.andOr         = cms.bool( False )
+SiStripMonitorTrackIB.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+SiStripMonitorTrackIB.hltPaths = cms.vstring("HLT_ZeroBias_FirstCollisionAfterAbortGap_*")
+SiStripMonitorTrackIB.hltDBKey = cms.string("Tracker_IB")
+SiStripMonitorTrackIB.errorReplyHlt  = cms.bool( False )
+SiStripMonitorTrackIB.andOrHlt = cms.bool(True) # True:=OR; False:=AND
+#Histo configuration
+SiStripMonitorTrackIB.TkHistoMap_On = cms.bool(False)
+#SiStripMonitorTrackIB.TH1ClusterNoise.layerView      = cms.bool(False) 
+#SiStripMonitorTrackIB.TH1ClusterWidth.layerView      = cms.bool(False) 
+SiStripMonitorTrackIB.TH1ClusterCharge.ringView       = cms.bool(True)
+SiStripMonitorTrackIB.TH1ClusterChargePerCM.ringView  = cms.bool(True) 
+SiStripMonitorTrackIB.TH1ClusterStoNCorr.ringView     = cms.bool(True)
+SiStripMonitorTrackIB.TH1ClusterChargePerCM.layerView = cms.bool(True)
+SiStripMonitorTrackIB.TopFolderName = cms.string("SiStrip/FirstCollisionAfterAbortGap")
+
+
+SiStripMonitorTrackFOT1 = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
+SiStripMonitorTrackFOT1.TrackProducer = 'generalTracks'
+SiStripMonitorTrackFOT1.Mod_On        = True
+SiStripMonitorTrackFOT1.andOr         = cms.bool( False )
+SiStripMonitorTrackFOT1.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+SiStripMonitorTrackFOT1.hltPaths = cms.vstring("HLT_*")
+SiStripMonitorTrackFOT1.hltDBKey = cms.string("")
+SiStripMonitorTrackFOT1.errorReplyHlt  = cms.bool( False )
+SiStripMonitorTrackFOT1.andOrHlt = cms.bool(True) # True:=OR; False:=AND
+#Histo configuration
+SiStripMonitorTrackFOT1.TkHistoMap_On = cms.bool(False)
+#SiStripMonitorTrackFOT1.TH1ClusterNoise.layerView      = cms.bool(False) 
+#SiStripMonitorTrackFOT1.TH1ClusterWidth.layerView      = cms.bool(False) 
+SiStripMonitorTrackFOT1.TH1ClusterCharge.ringView       = cms.bool(True)
+SiStripMonitorTrackFOT1.TH1ClusterChargePerCM.ringView  = cms.bool(True)
+SiStripMonitorTrackFOT1.TH1ClusterStoNCorr.ringView     = cms.bool(True)
+SiStripMonitorTrackFOT1.TH1ClusterChargePerCM.layerView = cms.bool(True)
+SiStripMonitorTrackFOT1.SelectBunchInput = cms.bool(True)
+SiStripMonitorTrackFOT1.TopFolderName    = cms.string("SiStrip/FirstBunchOfTrainShort")
+
+
+SiStripMonitorTrackFOT2 = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
+SiStripMonitorTrackFOT2.TrackProducer = 'generalTracks'
+SiStripMonitorTrackFOT2.Mod_On        = True
+SiStripMonitorTrackFOT2.andOr         = cms.bool( False )
+SiStripMonitorTrackFOT2.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+SiStripMonitorTrackFOT2.hltPaths = cms.vstring("HLT_*")
+SiStripMonitorTrackFOT2.hltDBKey = cms.string("")
+SiStripMonitorTrackFOT2.errorReplyHlt  = cms.bool( False )
+SiStripMonitorTrackFOT2.andOrHlt = cms.bool(True) # True:=OR; False:=AND
+#Histo configuration
+SiStripMonitorTrackFOT2.TkHistoMap_On = cms.bool(False)
+#SiStripMonitorTrackFOT2.TH1ClusterNoise.layerView      = cms.bool(False) 
+#SiStripMonitorTrackFOT2.TH1ClusterWidth.layerView      = cms.bool(False) 
+SiStripMonitorTrackFOT2.TH1ClusterCharge.ringView       = cms.bool(True)
+SiStripMonitorTrackFOT2.TH1ClusterChargePerCM.ringView  = cms.bool(True)
+SiStripMonitorTrackFOT2.TH1ClusterStoNCorr.ringView     = cms.bool(True)
+SiStripMonitorTrackFOT2.TH1ClusterChargePerCM.layerView = cms.bool(True)
+SiStripMonitorTrackFOT2.SelectBunchInput = cms.bool(True)
+SiStripMonitorTrackFOT2.TopFolderName    = cms.string("SiStrip/FirstBunchOfTrainLong")
+
+
+
+SiStripMonitorTrackALT = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
+SiStripMonitorTrackALT.TrackProducer = 'generalTracks'
+SiStripMonitorTrackALT.Mod_On        = True
+SiStripMonitorTrackALT.andOr         = cms.bool( False )
+SiStripMonitorTrackALT.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+SiStripMonitorTrackALT.hltPaths = cms.vstring("HLT*")
+SiStripMonitorTrackALT.hltDBKey = cms.string("")
+SiStripMonitorTrackALT.errorReplyHlt  = cms.bool( False )
+SiStripMonitorTrackALT.andOrHlt = cms.bool(True) # True:=OR; False:=AND
+#Histo configuration
+SiStripMonitorTrackALT.TkHistoMap_On = cms.bool(False)
+#SiStripMonitorTrackALT.TH1ClusterNoise.layerView      = cms.bool(False)
+#SiStripMonitorTrackALT.TH1ClusterWidth.layerView      = cms.bool(False)
SiStripMonitorTrackALT.TH1ClusterChargePerCM.ringView  = cms.bool(True)
+SiStripMonitorTrackALT.TH1ClusterStoNCorr.ringView     = cms.bool(True)
+SiStripMonitorTrackALT.TH1ClusterChargePerCM.layerView = cms.bool(True)
+SiStripMonitorTrackALT.SelectBunchInput = cms.bool(True)
+SiStripMonitorTrackALT.TopFolderName    = cms.string("SiStrip/AfterLastTrain")
+
 
 ### TrackerMonitorTrack defined and used only for MinimumBias ####
 from DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi import *
 MonitorTrackResiduals.trajectoryInput = 'generalTracks'
 MonitorTrackResiduals.Tracks          = 'generalTracks'
-MonitorTrackResiduals.Mod_On        = False
-MonitorTrackResiduals.genericTriggerEventPSet = genericTriggerEventFlag4HLTdb
+MonitorTrackResiduals.Mod_On        = True
+MonitorTrackResiduals.andOr         = cms.bool( False )
+MonitorTrackResiduals.dbLabel       = cms.string("SiStripDQMTrigger")
+MonitorTrackResiduals.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
+MonitorTrackResiduals.hltPaths = cms.vstring("HLT_ZeroBias_v*","HLT_HIZeroBias_v*")
+MonitorTrackResiduals.hltDBKey = cms.string("Tracker_MB")
+MonitorTrackResiduals.errorReplyHlt  = cms.bool( False )
+MonitorTrackResiduals.andOrHlt = cms.bool(True) 
 
 # DQM Services
 dqmInfoSiStrip = cms.EDAnalyzer("DQMEventInfo",
@@ -132,20 +230,21 @@ from RecoLuminosity.LumiProducer.lumiProducer_cff import *
 #    *SiStripMonitorTrackMB*MonitorTrackResiduals
 #    *dqmInfoSiStrip)
 
+
 SiStripDQMTier0 = cms.Sequence(
     APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
-    *SiStripMonitorTrackCommon*MonitorTrackResiduals
-    *dqmInfoSiStrip)
+    *SiStripMonitorTrackCommon *SiStripMonitorTrackIB* SiStripMonitorTrackFOT1* SiStripMonitorTrackFOT2* SiStripMonitorTrackALT
+    *MonitorTrackResiduals *dqmInfoSiStrip)
 
 SiStripDQMTier0Common = cms.Sequence(
     APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX        
-    *SiStripMonitorTrackCommon
+    *SiStripMonitorTrackCommon *SiStripMonitorTrackIB * SiStripMonitorTrackFOT1* SiStripMonitorTrackFOT2* SiStripMonitorTrackALT
     *dqmInfoSiStrip)
 
 SiStripDQMTier0MinBias = cms.Sequence(
     APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
-    *SiStripMonitorTrackMB*MonitorTrackResiduals
-    *dqmInfoSiStrip)
+    *SiStripMonitorTrackMB*SiStripMonitorTrackIB* SiStripMonitorTrackFOT1* SiStripMonitorTrackFOT2* SiStripMonitorTrackALT
+    *MonitorTrackResiduals*dqmInfoSiStrip)