Merge pull request #8602 from jingyucms/jingyu-l1t-stage1-dqm-75x

Histogram for L1T Stage1
cms-sw · Apr 30, 2015 · decb972 · decb972
2 parents 5bc9523 + 6c8764e
commit decb972
Show file tree

Hide file tree

Showing 19 changed files with 885 additions and 553 deletions.
diff --git a/DQM/L1TMonitor/interface/L1ExtraDQM.h b/DQM/L1TMonitor/interface/L1ExtraDQM.h
diff --git a/DQM/L1TMonitor/interface/L1TGCT.h b/DQM/L1TMonitor/interface/L1TGCT.h
@@ -150,19 +150,22 @@ class L1TGCT : public DQMEDAnalyzer {
   MonitorElement* l1GctCenJetsEtEtaPhi_; 
   MonitorElement* l1GctForJetsEtEtaPhi_;
   MonitorElement* l1GctTauJetsEtEtaPhi_;
+  MonitorElement* l1GctIsoTauJetsEtEtaPhi_;
   MonitorElement* l1GctIsoEmRankEtaPhi_;
   MonitorElement* l1GctNonIsoEmRankEtaPhi_;
 
   MonitorElement* l1GctAllJetsOccEtaPhi_; 
   MonitorElement* l1GctCenJetsOccEtaPhi_;
   MonitorElement* l1GctForJetsOccEtaPhi_;  
-  MonitorElement* l1GctTauJetsOccEtaPhi_;  
+  MonitorElement* l1GctTauJetsOccEtaPhi_;
+  MonitorElement* l1GctIsoTauJetsOccEtaPhi_;
   MonitorElement* l1GctIsoEmOccEtaPhi_;    
   MonitorElement* l1GctNonIsoEmOccEtaPhi_; 
 
   MonitorElement* l1GctCenJetsRank_;
   MonitorElement* l1GctForJetsRank_;
   MonitorElement* l1GctTauJetsRank_;
+  MonitorElement* l1GctIsoTauJetsRank_;
   MonitorElement* l1GctIsoEmRank_;
   MonitorElement* l1GctNonIsoEmRank_;
 
@@ -217,11 +220,13 @@ class L1TGCT : public DQMEDAnalyzer {
   edm::InputTag gctCenJetsSource_;
   edm::InputTag gctForJetsSource_;
   edm::InputTag gctTauJetsSource_;
+  edm::InputTag gctIsoTauJetsSource_;
   edm::InputTag gctEnergySumsSource_;
   edm::InputTag gctIsoEmSource_;
   edm::InputTag gctNonIsoEmSource_;
 
   /// filter TriggerType
+  bool m_stage1_layer2_;
   int filterTriggerType_;
 
   //define Token(-s)
@@ -230,6 +235,7 @@ class L1TGCT : public DQMEDAnalyzer {
   edm::EDGetTokenT<L1GctJetCandCollection> gctCenJetsSourceToken_;
   edm::EDGetTokenT<L1GctJetCandCollection> gctForJetsSourceToken_;
   edm::EDGetTokenT<L1GctJetCandCollection> gctTauJetsSourceToken_;
+  edm::EDGetTokenT<L1GctJetCandCollection> gctIsoTauJetsSourceToken_;
   edm::EDGetTokenT<L1GctHFRingEtSumsCollection> gctEnergySumsSourceToken_;
   edm::EDGetTokenT<L1GctHFBitCountsCollection> l1HFCountsToken_;
   edm::EDGetTokenT<L1GctEtMissCollection> l1EtMissToken_;

diff --git a/DQM/L1TMonitor/python/L1ExtraDQM_cff.py b/DQM/L1TMonitor/python/L1ExtraDQM_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQM.L1TMonitor.l1ExtraDQM_cfi import *
-
+from DQM.L1TMonitor.l1ExtraDQMStage1_cfi import *
 
 # for DQM, unpack all BxInEvent available for GCT, GMT & GT (common unpacker for GMT and GT)
 # use clones dqmGctDigis and dqmGtDigis, to not interfere with RawToDigi from standard sequences
@@ -42,6 +42,26 @@
 #
 dqmL1ExtraParticles.centralBxOnly = cms.bool(False)
 
+# get stage1 digis
+import L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi
+dqmL1ExtraParticlesStage1 = L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi.l1extraParticles.clone()
+#
+dqmL1ExtraParticlesStage1.muonSource = 'dqmGtDigis'
+dqmL1ExtraParticlesStage1.etTotalSource = 'caloStage1LegacyFormatDigis'
+dqmL1ExtraParticlesStage1.nonIsolatedEmSource = 'caloStage1LegacyFormatDigis:nonIsoEm'
+dqmL1ExtraParticlesStage1.etMissSource = 'caloStage1LegacyFormatDigis'
+dqmL1ExtraParticlesStage1.htMissSource = 'caloStage1LegacyFormatDigis'
+dqmL1ExtraParticlesStage1.forwardJetSource = 'caloStage1LegacyFormatDigis:forJets'
+dqmL1ExtraParticlesStage1.centralJetSource = 'caloStage1LegacyFormatDigis:cenJets'
+dqmL1ExtraParticlesStage1.tauJetSource = 'caloStage1LegacyFormatDigis:tauJets'
+dqmL1ExtraParticlesStage1.isoTauJetSource = 'caloStage1LegacyFormatDigis:isoTauJets'
+dqmL1ExtraParticlesStage1.isolatedEmSource = 'caloStage1LegacyFormatDigis:isoEm'
+dqmL1ExtraParticlesStage1.etHadSource = 'caloStage1LegacyFormatDigis'
+dqmL1ExtraParticlesStage1.hfRingEtSumsSource = 'caloStage1LegacyFormatDigis'
+dqmL1ExtraParticlesStage1.hfRingBitCountsSource = 'caloStage1LegacyFormatDigis'
+#
+dqmL1ExtraParticlesStage1.centralBxOnly = cms.bool(False)
+
 #
 # Modify for running with the Stage 1 trigger. Note that these changes are already
 # applied to l1extraParticles before it is cloned, but the changes are overwritten

diff --git a/DQM/L1TMonitor/python/L1ExtraInputTagSetStage1_cff.py b/DQM/L1TMonitor/python/L1ExtraInputTagSetStage1_cff.py
@@ -0,0 +1,25 @@
+# Set of input tags for L1Extra
+#
+# V.M. Ghete 2010-03-14
+
+import FWCore.ParameterSet.Config as cms
+
+L1ExtraInputTagSetStage1 = cms.PSet(
+    L1ExtraInputTags=cms.PSet(
+
+        TagL1ExtraMuon=cms.InputTag("dqmL1ExtraParticlesStage1"),
+
+        TagL1ExtraIsoEG=cms.InputTag("dqmL1ExtraParticlesStage1", "Isolated"),
+        TagL1ExtraNoIsoEG=cms.InputTag("dqmL1ExtraParticlesStage1", "NonIsolated"),
+
+        TagL1ExtraCenJet=cms.InputTag("dqmL1ExtraParticlesStage1", "Central"),
+        TagL1ExtraForJet=cms.InputTag("dqmL1ExtraParticlesStage1", "Forward"),
+        TagL1ExtraTauJet=cms.InputTag("dqmL1ExtraParticlesStage1", "Tau"),
+
+        TagL1ExtraEtMissMET=cms.InputTag("dqmL1ExtraParticlesStage1", "MET"),
+        TagL1ExtraEtMissHTM=cms.InputTag("dqmL1ExtraParticlesStage1", "MHT"),
+
+        TagL1ExtraHFRings=cms.InputTag("dqmL1ExtraParticlesStage1")
+        )
+    )
+
diff --git a/DQM/L1TMonitor/python/L1TGCT_cfi.py b/DQM/L1TMonitor/python/L1TGCT_cfi.py
@@ -4,10 +4,12 @@
     gctCentralJetsSource = cms.InputTag("gctDigis","cenJets"),
     gctForwardJetsSource = cms.InputTag("gctDigis","forJets"),
     gctTauJetsSource = cms.InputTag("gctDigis","tauJets"),
+    gctIsoTauJetsSource = cms.InputTag("gctDigis","fake"),
     gctEnergySumsSource = cms.InputTag("gctDigis"),
     gctIsoEmSource = cms.InputTag("gctDigis","isoEm"),
     gctNonIsoEmSource = cms.InputTag("gctDigis","nonIsoEm"),
     verbose = cms.untracked.bool(False),
+    stage1_layer2_ = cms.bool(False),
     DQMStore = cms.untracked.bool(True),
     disableROOToutput = cms.untracked.bool(True),
     filterTriggerType = cms.int32(1)

diff --git a/DQM/L1TMonitor/python/L1TMonitor_cff.py b/DQM/L1TMonitor/python/L1TMonitor_cff.py
@@ -13,12 +13,10 @@
 # V.M. Ghete 2011-05-25 revised version of L1 Trigger DQM
 #                       
 
-
 #
 # DQM modules
 #
 
-
 # Bx Timing DQM module
 from DQM.L1TMonitor.BxTiming_cfi import *
 
@@ -33,6 +31,7 @@
 
 # GCT DQM module 
 from DQM.L1TMonitor.L1TGCT_cfi import *
+from DQM.L1TMonitor.L1TStage1Layer2_cfi import *
 
 # DTTPG DQM module 
 # not run in L1T - do we need it? FIXME
@@ -78,6 +77,17 @@
 l1s.l1GtData = cms.InputTag("gtDigis")
 l1s.dqmFolder = cms.untracked.string("L1T/L1Scalers_SM") 
 
+############################################################
+# Stage1 unpacker
+from L1Trigger.L1TCommon.l1tRawToDigi_cfi import *
+#caloStage1Digis.FedId = cms.int32(809)
+
+# transfer stage1 format digis to legacy format digis
+
+from L1Trigger.L1TCommon.caloStage1LegacyFormatDigis_cfi import *
+
+#################################################################
+
 
 #
 # define sequences 
@@ -91,6 +101,11 @@
 l1tGctSeq = cms.Sequence(
                     l1tGct
                     )
+
+l1tStage1Layer2Seq = cms.Sequence(
+                    l1tStage1Layer2
+                    )
+
 # for L1ExtraDQM, one must run GGT and GMT/GT unpacker and L1Extra producer 
 # with special configurations
 
@@ -101,6 +116,13 @@
                         l1ExtraDQM
                         )
 
+l1ExtraStage1DqmSeq = cms.Sequence(
+    dqmGtDigis *
+    dqmL1ExtraParticlesStage1 *
+    l1ExtraDQMStage1
+    )
+
+
 # L1T monitor sequence 
 #     modules are independent, so the order is irrelevant 
 
@@ -118,6 +140,22 @@
                           l1tGctSeq
                           )
 
+l1tMonitorStage1Online = cms.Sequence(
+                          bxTiming +
+                          l1tDttf +
+                          l1tCsctf + 
+                          l1tRpctf +
+                          l1tGmt +
+                          l1tGt +
+                          caloStage1Digis *
+                          caloStage1LegacyFormatDigis*
+                          l1ExtraStage1DqmSeq +
+                          #l1tBPTX +
+                          #l1tRate +
+                          l1tStage1Layer2Seq +
+                          l1tRctSeq 
+                          )
+
 
 # sequence for L1 Trigger DQM modules on EndPath 
 # FIXME clarify why needed on EndPath

diff --git a/DQM/L1TMonitor/python/L1TStage1Layer2_cfi.py b/DQM/L1TMonitor/python/L1TStage1Layer2_cfi.py
@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+l1tStage1Layer2 = cms.EDAnalyzer("L1TGCT",
+    gctCentralJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets"),
+    gctForwardJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets"),
+    gctTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets"),
+    gctIsoTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets"),       
+    gctEnergySumsSource = cms.InputTag("caloStage1LegacyFormatDigis"),
+    gctIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm"),
+    gctNonIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm"),
+    stage1_layer2_ = cms.bool(True),
+    verbose = cms.untracked.bool(False),
+    DQMStore = cms.untracked.bool(True),
+    disableROOToutput = cms.untracked.bool(True),
+    filterTriggerType = cms.int32(1)
+)
+
diff --git a/DQM/L1TMonitor/python/inputsource_file_cfi.py b/DQM/L1TMonitor/python/inputsource_file_cfi.py
@@ -64,7 +64,7 @@
     dataType = 'RAW'
     useDAS = False
     readFiles.extend( [ 
-            'file:/afs/cern.ch/cms/CAF/CMSCOMM/COMM_DQM/DQMTest/MinimumBias__RAW__v1__165633__1CC420EE-B686-E011-A788-0030487CD6E8.root'                       
+            'file:/afs/cern.ch/cms/CAF/CMSCOMM/COMM_DQM/DQMTest/MinimumBias__RAW__v1__165633__1CC420EE-B686-E011-A788-0030487CD6E8.root'
             ]);    
 
 elif sampleIdentifier == 'FileStream_105760' :

diff --git a/DQM/L1TMonitor/python/l1ExtraDQMStage1_cfi.py b/DQM/L1TMonitor/python/l1ExtraDQMStage1_cfi.py
@@ -0,0 +1,33 @@
+import FWCore.ParameterSet.Config as cms
+
+# L1Extra DQM 
+#     
+# V.M. Ghete 2010-02-27
+
+from DQM.L1TMonitor.L1ExtraInputTagSetStage1_cff import *
+
+
+l1ExtraDQMStage1 = cms.EDAnalyzer("L1ExtraDQM",
+
+    # L1Extra input tags
+    L1ExtraInputTagSetStage1,
+    L1ExtraIsoTauJetSource_ = cms.InputTag("dqmL1ExtraParticlesStage1", "IsoTau"),
+    #
+    DQMStore = cms.untracked.bool(True),
+    DirName=cms.string("L1T/L1ExtraStage1"),
+    disableROOToutput = cms.untracked.bool(True),
+    verbose = cms.untracked.bool(False),
+    stage1_layer2_ = cms.bool(True),
+    #
+    #
+    # number of BxInEvent for GCT and GMT  
+    #  0 - zero BxInEvent 
+    #  1 - central BxInEvent, (BX 0 - bunch cross with L1A)
+    #  3 - (-1, 0, +1)
+    #  5 - (-2, -1, 0, +1, 2)
+    # -1 - take it from event setup FIXME NOT IMPLEMENTED YET
+    NrBxInEventGmt = cms.int32(5),
+    NrBxInEventGct = cms.int32(5)
+
+)
+
diff --git a/DQM/L1TMonitor/python/l1ExtraDQM_cfi.py b/DQM/L1TMonitor/python/l1ExtraDQM_cfi.py
@@ -12,10 +12,14 @@
     # L1Extra input tags
     L1ExtraInputTagSet,
     #
+    L1ExtraIsoTauJetSource_ = cms.InputTag("fake"),
     DQMStore = cms.untracked.bool(True),
-    DirName=cms.untracked.string("L1T/L1Extra"),
+    #DirName=cms.untracked.string("L1T/L1Extra"),
+    DirName=cms.string("L1T/L1Extra"),
     disableROOToutput = cms.untracked.bool(True),
     verbose = cms.untracked.bool(False),
+    #stage1_layer2_ = cms.untracked.bool(False),
+    stage1_layer2_ = cms.bool(False),
     #
     #
     # number of BxInEvent for GCT and GMT