change L1 DQM configuration for stage1

Configuration/StandardSequences/python/RawToDigi_Data_cff.py

@@ -41,3 +41,21 @@
 #False by default ecalDigis.DoRegional = False
 
 
+## Make changes for Run 2
+##
+def _modifyRawToDigiForStage1Trigger( theProcess ) :
+    """
+    Modifies the RawToDigi sequence if using the Stage 1 L1 trigger
+    """
+    theProcess.load("L1Trigger.L1TCommon.l1tRawToDigi_cfi")
+    theProcess.load("L1Trigger.L1TCommon.caloStage1LegacyFormatDigis_cfi")
+    # Note that this function is applied before the objects in this file are added
+    # to the process. So things declared in this file should be used "bare", i.e.
+    # not with "theProcess." in front of them. caloStage1Digis and caloStage1LegacyFormatDigis
+    # are an exception because they are not declared in this file but loaded into the
+    # process in the "load" statements above.
+    L1RawToDigiSeq = cms.Sequence( gctDigis + theProcess.caloStage1Digis + theProcess.caloStage1LegacyFormatDigis)
+    RawToDigi.replace( gctDigis, L1RawToDigiSeq )
+
+# A unique name is required for this object, so I'll call it "modify<python filename>ForRun2_"
+modifyConfigurationStandardSequencesRawToDigiForRun2_ = eras.stage1L1Trigger.makeProcessModifier( _modifyRawToDigiForStage1Trigger )

DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py

@@ -74,10 +74,10 @@
 # for GCT, unpack all five samples
 process.gctDigis.numberOfGctSamplesToUnpack = cms.uint32(5)
 
-if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
-else:
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
+#if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
+process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
+#else:
+#    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
 # 
 process.l1tMonitorPath = cms.Path(process.l1tMonitorOnline)
 
@@ -103,9 +103,9 @@
 process.schedule = cms.Schedule(process.rawToDigiPath,
                                 process.l1tMonitorPath,
                                 process.l1tSyncPath,
-                                process.l1tMonitorClientPath,
-                                process.l1tMonitorEndPath,
-                                process.l1tMonitorClientEndPath,
+                                #process.l1tMonitorClientPath,
+                                #process.l1tMonitorEndPath,
+                                #process.l1tMonitorClientEndPath,
                                 process.dqmEndPath
                                 )
 
@@ -125,20 +125,21 @@
 # remove module(s) or system sequence from l1tMonitorPath
 #        quality test disabled also
 #
-#process.l1tMonitorOnline.remove(process.bxTiming)
+process.l1tMonitorOnline.remove(process.bxTiming)
 process.l1tMonitorOnline.remove(process.l1tBPTX)
 
 #process.l1tMonitorOnline.remove(process.l1tLtc)
 
-#process.l1tMonitorOnline.remove(process.l1Dttf)
+process.l1tMonitorOnline.remove(process.l1tDttf)
 
-#process.l1tMonitorOnline.remove(process.l1tCsctf) 
+process.l1tMonitorOnline.remove(process.l1tCsctf) 
 
-#process.l1tMonitorOnline.remove(process.l1tRpctf)
+process.l1tMonitorOnline.remove(process.l1tRpctf)
 
-#process.l1tMonitorOnline.remove(process.l1tGmt)
+process.l1tMonitorOnline.remove(process.l1tGmt)
 
 #process.l1tMonitorOnline.remove(process.l1tGt) 
+process.l1tGt.HistFolder = cms.untracked.string("L1T/L1TGTTestCrate")
 
 #process.l1tMonitorOnline.remove(process.l1ExtraDqmSeq)
 
@@ -151,8 +152,8 @@
 
 # remove module(s) or system sequence from l1tMonitorEndPath
 #
-#process.l1tMonitorEndPathSeq.remove(process.l1s)
-#process.l1tMonitorEndPathSeq.remove(process.l1tscalers)
+process.l1tMonitorEndPathSeq.remove(process.l1s)
+process.l1tMonitorEndPathSeq.remove(process.l1tscalers)
 
 #
 process.schedule.remove(process.l1tSyncPath)

DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py

@@ -67,10 +67,10 @@
 process.RawToDigi.remove("scalersRawToDigi")
 process.RawToDigi.remove("castorDigis")
 
-if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
-else:
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
+#if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
+process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
+#else:
+#    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
 
 # L1HvVal + emulator monitoring path
 process.l1HwValEmulatorMonitorPath = cms.Path(process.l1HwValEmulatorMonitor)
@@ -96,7 +96,7 @@
 #
 process.schedule = cms.Schedule(process.rawToDigiPath,
                                 process.l1HwValEmulatorMonitorPath,
-                                process.l1EmulatorMonitorClientPath,
+                                #process.l1EmulatorMonitorClientPath,
                                 process.l1EmulatorMonitorEndPath)
 
 #---------------------------------------------
@@ -107,18 +107,25 @@
 # remove a module from hardware validation
 # cff file: L1Trigger.HardwareValidation.L1HardwareValidation_cff
 #
-# process.L1HardwareValidation.remove(process.deCsctf)
+process.l1HwValEmulatorMonitorPath.remove(process.l1TdeCSCTF)
 #
 process.L1HardwareValidation.remove(process.deDt)
 
-process.L1HardwareValidation.remove(process.l1TdeRCTRun1)
+process.l1HwValEmulatorMonitorPath.remove(process.l1TdeRCTRun1)
 #
 # remove a L1 trigger system from the comparator integrated in hardware validation
 # cfi file: L1Trigger.HardwareValidation.L1Comparator_cfi
 #
 # process.l1compare.COMPARE_COLLS = [0, 0, 1, 1,  0, 1, 0, 0, 1, 0, 1, 0]
-#
+process.l1compare.COMPARE_COLLS = [0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]
+
+process.l1demon.COMPARE_COLLS = [0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]
+
+process.l1demon.HistFolder = cms.untracked.string('L1TEMU/Legacy')
+
+process.l1TdeGCT.HistFolder = cms.untracked.string('L1TEMU/Legacy/GCTexpert')
 
+process.l1GtHwValidation.DirName = cms.untracked.string("L1TEMU/Legacy/GTexpert")
 
 #
 # remove an expert module for L1 trigger system

DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py

@@ -75,38 +75,23 @@
 # for GCT, unpack all five samples
 process.gctDigis.numberOfGctSamplesToUnpack = cms.uint32(5)
 
-if (process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
-else:
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
+#if (process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
+process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
+#else:
+#    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
 # 
 
+process.l1tMonitorPath = cms.Path(process.l1tMonitorStage1Online)
+
 # separate L1TSync path due to the use of the HltHighLevel filter
 process.l1tSyncPath = cms.Path(process.l1tSyncHltFilter+process.l1tSync)
 
 #
 
-process.l1tMonitorPath = cms.Path(process.l1tMonitorStage1Online)
+#process.l1tMonitorPath = cms.Path(process.l1tMonitorStage1Online)
 process.l1tMonitorClientPath = cms.Path(process.l1tMonitorStage1Client)
-# Update HfRing thresholds to accomodate di-iso tau trigger thresholds
-from L1TriggerConfig.L1ScalesProducers.l1CaloScales_cfi import l1CaloScales
-l1CaloScales.L1HfRingThresholds = cms.vdouble(0.0, 24.0, 28.0, 32.0, 36.0, 40.0, 44.0, 48.0)
-l1CaloScales.L1HtMissThresholds = cms.vdouble(
-    0.00, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09,
-    0.10, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19,
-    0.20, 0.21, 0.22, 0.23, 0.24, 0.25, 0.26, 0.27, 0.28, 0.29,
-    0.30, 0.31, 0.32, 0.33, 0.34, 0.35, 0.36, 0.37, 0.38, 0.39,
-    0.40, 0.41, 0.42, 0.43, 0.44, 0.45, 0.46, 0.47, 0.48, 0.49,
-    0.50, 0.51, 0.52, 0.53, 0.54, 0.55, 0.56, 0.57, 0.58, 0.59,
-    0.60, 0.61, 0.62, 0.63, 0.64, 0.65, 0.66, 0.67, 0.68, 0.69,
-    0.70, 0.71, 0.72, 0.73, 0.74, 0.75, 0.76, 0.77, 0.78, 0.79,
-    0.80, 0.81, 0.82, 0.83, 0.84, 0.85, 0.86, 0.87, 0.88, 0.89,
-    0.90, 0.91, 0.92, 0.93, 0.94, 0.95, 0.96, 0.97, 0.98, 0.99,
-    1.00, 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09,
-    1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19,
-    1.20, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, 1.27
-    )
 
+process.stage1UnpackPath = cms.Path(process.caloStage1Digis+process.caloStage1LegacyFormatDigis)
 #
 process.l1tMonitorEndPath = cms.EndPath(process.l1tMonitorEndPathSeq)
 
@@ -121,6 +106,7 @@
 
 #
 process.schedule = cms.Schedule(process.rawToDigiPath,
+                                process.stage1UnpackPath,
                                 process.l1tMonitorPath,
                                 process.l1tSyncPath,
                                 process.l1tMonitorClientPath,
@@ -145,26 +131,30 @@
 # remove module(s) or system sequence from l1tMonitorPath
 #        quality test disabled also
 #
-process.l1tMonitorStage1Online.remove(process.bxTiming)
-#process.l1tMonitorStage1Online.remove(process.l1tBPTX)
+#process.l1tMonitorStage1Online.remove(process.bxTiming)
+process.l1tMonitorStage1Online.remove(process.l1tBPTX)
+
+process.l1tMonitorStage1Online.remove(process.l1tRctRun1)
+
+process.l1tMonitorStage1Online.remove(process.l1tRctRun1)
 
 #process.l1tMonitorOnline.remove(process.l1tLtc)
 
-process.l1tMonitorStage1Online.remove(process.l1tDttf)
+#process.l1tMonitorStage1Online.remove(process.l1tDttf)
 
-process.l1tMonitorStage1Online.remove(process.l1tCsctf) 
+#process.l1tMonitorStage1Online.remove(process.l1tCsctf) 
 
-process.l1tMonitorStage1Online.remove(process.l1tRpctf)
+#process.l1tMonitorStage1Online.remove(process.l1tRpctf)
 
-process.l1tMonitorStage1Online.remove(process.l1tGmt)
+#process.l1tMonitorStage1Online.remove(process.l1tGmt)
 
 #process.l1tMonitorOnline.remove(process.l1tGt)
-process.l1tGt.HistFolder = cms.untracked.string("L1TStage1/L1TStage1GT") 
 
 #process.l1tMonitorOnline.remove(process.l1ExtraDqmSeq)
-process.l1ExtraDQMStage1.DirName=cms.string("L1TStage1/L1ExtraStage1")
 
-#process.l1tMonitorStage1Online.remove(process.l1tRate)
+process.l1tMonitorStage1Online.remove(process.l1tRate)
+
+#process.l1tMonitorOnline.remove(process.l1tRctRun1)
 
 #process.l1tMonitorStage1Online.remove(process.l1tRctSeq)
 
@@ -175,24 +165,6 @@
 #
 #process.l1tMonitorEndPathSeq.remove(process.l1s)
 
-process.l1tMonitorEndPathSeq.remove(process.l1tscalers)
-process.l1s.dqmFolder = cms.untracked.string("L1TStage1/L1Stage1Scalers_SM") 
-
-process.l1tMonitorStage1Client.remove(process.l1TriggerQualityTests)
-
-process.l1tStage1Layer2Client.monitorDir = cms.untracked.string('L1TStage1/stage1layer2')
-
-process.l1tsClient.dqmFolder = cms.untracked.string("L1TStage1/L1Stage1Scalers_SM")
-
-process.l1TriggerStage1Clients.remove(process.l1tEventInfoClient)
-#process.l1TriggerStage1Clients.remove(process.l1tsClient)
-process.l1TriggerStage1Clients.remove(process.l1tDttfClient)
-process.l1TriggerStage1Clients.remove(process.l1tCsctfClient)
-process.l1TriggerStage1Clients.remove(process.l1tRpctfClient)
-process.l1TriggerStage1Clients.remove(process.l1tGmtClient)
-process.l1TriggerStage1Clients.remove(process.l1tOccupancyClient)
-process.l1TriggerStage1Clients.remove(process.l1tTestsSummary)
-process.l1TriggerStage1Clients.remove(process.l1tEventInfoClient)
 #
 process.schedule.remove(process.l1tSyncPath)
 

DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py

@@ -67,10 +67,10 @@
 process.RawToDigi.remove("scalersRawToDigi")
 process.RawToDigi.remove("castorDigis")
 
-if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
-else:
-    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
+#if ( process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run_stage1):
+process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
+#else:
+#    process.gtDigis.DaqGtFedId = cms.untracked.int32(809)
 
 # L1HvVal + emulator monitoring path
 process.l1HwValEmulatorMonitorPath = cms.Path(process.l1Stage1HwValEmulatorMonitor)
@@ -79,6 +79,10 @@
 #process.load("L1TriggerConfig.RCTConfigProducers.l1RCTOmdsFedVectorProducer_cfi")
 #process.valRctDigis.getFedsFromOmds = cms.bool(True)
 
+process.stage1UnpackerPath = cms.Path(process.caloStage1Digis+process.caloStage1LegacyFormatDigis)
+process.caloStage1LegacyFormatDigis.bxMin = cms.int32(-2)
+process.caloStage1LegacyFormatDigis.bxMax = cms.int32(2)
+
 #
 process.l1EmulatorMonitorClientPath = cms.Path(process.l1EmulatorMonitorClient)
 
@@ -89,8 +93,9 @@
 
 #
 process.schedule = cms.Schedule(process.rawToDigiPath,
+                                process.stage1UnpackerPath,
                                 process.l1HwValEmulatorMonitorPath,
-                                #process.l1EmulatorMonitorClientPath,
+                                process.l1EmulatorMonitorClientPath,
                                 process.l1EmulatorMonitorEndPath)
 
 #---------------------------------------------
@@ -113,13 +118,13 @@
 #process.l1compare.COMPARE_COLLS = [0, 0, 1, 1,  0, 1, 0, 0, 1, 0, 1, 0]
 #
 
-process.l1compareforstage1.COMPARE_COLLS = [
-        0,  0,  0,  1,   0,  0,  0,  0,  0,  0,  0, 0
-        ]
+#process.l1compareforstage1.COMPARE_COLLS = [
+#        0,  0,  0,  1,   0,  0,  0,  0,  0,  0,  0, 0
+#        ]
 
-process.l1demonstage1.COMPARE_COLLS = [
-        0,  0,  0,  1,   0,  0,  0,  0,  0,  0,  0, 0
-        ]
+#process.l1demonstage1.COMPARE_COLLS = [
+#        0,  0,  0,  1,   0,  0,  0,  0,  0,  0,  0, 0
+#        ]
       #ETP,HTP,RCT,GCT, DTP,DTF,CTP,CTF,RPC,LTC,GMT,GT
 
 
@@ -130,15 +135,15 @@
 # process.l1ExpertDataVsEmulator.remove(process.l1GtHwValidation)
 #
 
-process.l1ExpertDataVsEmulatorStage1.remove(process.l1TdeCSCTF)
+#process.l1ExpertDataVsEmulatorStage1.remove(process.l1TdeCSCTF)
 
 #process.l1ExpertDataVsEmulatorStage1.remove(process.l1TdeRCT)
 
-process.l1demonstage1.HistFolder = cms.untracked.string('L1TEMUStage1')
+process.l1demonstage1.HistFolder = cms.untracked.string('L1TEMU')
 
-process.l1TdeStage1Layer2.HistFolder = cms.untracked.string('L1TEMUStage1/Stage1Layer2expert')
+process.l1TdeStage1Layer2.HistFolder = cms.untracked.string('L1TEMU/Stage1Layer2expert')
 
-process.l1Stage1GtHwValidation.DirName = cms.untracked.string("L1TEMUStage1/GTexpert")
+process.l1Stage1GtHwValidation.DirName = cms.untracked.string("L1TEMU/GTexpert")
 
 #
 # remove a module / sequence from l1EmulatorMonitorClient

DQM/L1TMonitor/interface/BxTiming.h

@@ -107,10 +107,7 @@ class BxTiming : public DQMEDAnalyzer {
 
   MonitorElement* hBxOccyGtTrigType[nttype_]; // gt bx occupancy per trigger type
   MonitorElement**hBxOccyTrigBit[NSYS];       // subsystem bx occupancy per selected trigger bit
-  MonitorElement* runId_;
-  MonitorElement* lumisecId_;
-  MonitorElement* eventId_;
-  MonitorElement* runStartTimeStamp_;
+
 
 };
 

DQM/L1TMonitor/interface/L1GtHwValidation.h

@@ -262,10 +262,6 @@ class L1GtHwValidation: public DQMEDAnalyzer  {
     MonitorElement* m_fdlDataEmulTechDecisionMask[TotalBxInEvent][NumberOfGtRecords];
     MonitorElement* m_fdlDataEmulTechDecision_Err[NumberOfGtRecords];
 
-
-    MonitorElement* runId_;
-    MonitorElement* lumisecId_;
-
     MonitorElement* m_excludedAlgorithmsAgreement;
 
     /// PSB

DQM/L1TMonitor/interface/L1TDTTF.h

@@ -91,8 +91,7 @@ class L1TDTTF : public DQMEDAnalyzer {
   MonitorElement* dttf_gmt_match;
   MonitorElement* dttf_gmt_missed;
   MonitorElement* dttf_gmt_ghost;
-  MonitorElement* runId_;
-  MonitorElement* lumisecId_;
+
   // MonitorElement* dttf_gmt_ghost_phys;
 
   int nev_; // Number of events processed

DQM/L1TMonitor/interface/L1TDTTPG.h

@@ -100,9 +100,6 @@ class L1TDTTPG : public DQMEDAnalyzer {
   MonitorElement *dttf_p_q[3];
   MonitorElement *dttf_p_qual[3];
 
-  MonitorElement *runId_;
-  MonitorElement *lumisecId_;
-
   int nev_; // Number of events processed
   std::string outputFile_; //file name for ROOT ouput
   bool verbose_;

DQM/L1TMonitor/interface/L1TGCT.h

@@ -210,8 +210,6 @@ class L1TGCT : public DQMEDAnalyzer {
   MonitorElement* l1GctHFRingRatioNegEta_;
   MonitorElement* l1GctHFRingETSumOccBx_;
   MonitorElement* l1GctHFRingTowerCountOccBx_;
-  MonitorElement* runId_;
-  MonitorElement* lumisecId_;
 
   int nev_; // Number of events processed
   std::string outputFile_; //file name for ROOT ouput

DQM/L1TMonitor/interface/L1TGT.h

@@ -155,9 +155,6 @@ class L1TGT: public DQMEDAnalyzer {
 
     MonitorElement* m_monOrbitNrDiffTcsFdlEvm;
     MonitorElement* m_monLsNrDiffTcsFdlEvm;
-    MonitorElement* runId_;
-    MonitorElement* lumisecId_;
-    MonitorElement* runStartTimeStamp_;
     // maximum difference in orbit number, luminosity number
     // histogram range: -(MaxOrbitNrDiffTcsFdlEvm+1), (MaxOrbitNrDiffTcsFdlEvm+1)
     //   if value is greater than the maximum difference, fill an entry in the last but one bin