Changes for L1 concerns about emulator sequence and plot titles

cms-sw · Aug 27, 2024 · 83fe29e · 83fe29e
1 parent 274119f
commit 83fe29e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 100 deletions.
diff --git a/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py b/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py
@@ -1,10 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
-from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-
-from L1Trigger.Configuration.SimL1Emulator_cff import *
 from L1Trigger.Configuration.CaloTriggerPrimitives_cff import *
 simEcalTriggerPrimitiveDigis.Label = 'ecalDigis'
 simHcalTriggerPrimitiveDigis.inputLabel = cms.VInputTag(
@@ -15,95 +10,13 @@
             cms.InputTag('hcalDigis'),
             cms.InputTag('hcalDigis')
 )
-simDtTriggerPrimitiveDigis.digiTag = cms.InputTag("muonDTDigis")
-simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCComparatorDigi')
-simCscTriggerPrimitiveDigis.CSCWireDigiProducer       = cms.InputTag( 'muonCSCDigis', 'MuonCSCWireDigi' )  
-L1TReEmul = cms.Sequence(simEcalTriggerPrimitiveDigis * simHcalTriggerPrimitiveDigis * SimL1Emulator)
-
-from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Summary_cfi import simCaloStage2Layer1Summary as _simCaloStage2Layer1Summary
-cicadaEmulFromDigis = _simCaloStage2Layer1Summary.clone(caloLayer1Regions = cms.InputTag("caloLayer1Digis", ""))
-L1TReEmul.replace(simCaloStage2Layer1Summary, cicadaEmulFromDigis)
-
-# TwinMux
-stage2L1Trigger.toModify(simTwinMuxDigis,
-    RPC_Source         = 'rpcTwinMuxRawToDigi',
-    DTDigi_Source      = 'twinMuxStage2Digis:PhIn',
-    DTThetaDigi_Source = 'twinMuxStage2Digis:ThIn'
-)
-# BMTF
-stage2L1Trigger.toModify(simBmtfDigis,
-DTDigi_Source         = "simTwinMuxDigis",
-DTDigi_Theta_Source   = "bmtfDigis"
-)
-# KBMTF
-stage2L1Trigger.toModify(simKBmtfStubs,
-srcPhi       = 'simTwinMuxDigis',
-srcTheta     = 'bmtfDigis'
-)
-# OMTF
-stage2L1Trigger.toModify(simOmtfDigis,
-    srcRPC  = 'muonRPCDigis',
-    srcCSC  = 'csctfDigis',
-    srcDTPh = 'bmtfDigis',
-    srcDTTh = 'bmtfDigis'
-)
-# EMTF
-stage2L1Trigger.toModify(simEmtfDigis,
-    CSCInput = 'emtfStage2Digis',
-    RPCInput = 'muonRPCDigis'
-)
-# Calo Layer1
-stage2L1Trigger.toModify(simCaloStage2Layer1Digis,
-    ecalToken = 'ecalDigis:EcalTriggerPrimitives',
-    hcalToken = 'hcalDigis:'
-)
-
-(~stage2L1Trigger).toModify(simRctDigis,
-    ecalDigis = ['ecalDigis:EcalTriggerPrimitives'],
-    hcalDigis = ['hcalDigis:']
-)
-(~stage2L1Trigger).toModify(simRpcTriggerDigis, label = 'muonRPCDigis')
 
-# if not hasattr(process, 'L1TReEmulPath'):
-#     process.L1TReEmulPath = cms.Path(process.L1TReEmul)    
-#     process.schedule.append(process.L1TReEmulPath)
+from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Summary_cfi import *
+from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Digis_cfi import *
+from DQM.L1TMonitor.L1TCaloLayer1Summary_cfi import *
 
-stage2L1Trigger_2017.toModify(simOmtfDigis,
-    srcRPC   = 'omtfStage2Digis',
-    srcCSC   = 'omtfStage2Digis',
-    srcDTPh  = 'omtfStage2Digis',
-    srcDTTh  = 'omtfStage2Digis'
-)
-
-stage2L1Trigger.toModify(simEmtfDigis,
-    CSCInput  = cms.InputTag('emtfStage2Digis'),
-    RPCInput  = cms.InputTag('muonRPCDigis'),
-    CPPFInput = cms.InputTag('emtfStage2Digis'),
-    GEMEnable = cms.bool(False),
-    GEMInput  = cms.InputTag('muonGEMPadDigis'),
-    CPPFEnable = cms.bool(True), # Use CPPF-emulated clustered RPC hits from CPPF as the RPC hits
-)
-
-run3_GEM.toModify(simMuonGEMPadDigis,
-    InputCollection         = 'muonGEMDigis',
-)
-
-run3_GEM.toModify(simTwinMuxDigis,
-    RPC_Source         = 'rpcTwinMuxRawToDigi',
-    DTDigi_Source      = 'simDtTriggerPrimitiveDigis',
-    DTThetaDigi_Source = 'simDtTriggerPrimitiveDigis'
-)
-
-run3_GEM.toModify(simKBmtfStubs,
-    srcPhi   = 'bmtfDigis',
-    srcTheta = 'bmtfDigis'
-)
-
-run3_GEM.toModify(simBmtfDigis,
-    DTDigi_Source       = 'bmtfDigis',
-    DTDigi_Theta_Source = 'bmtfDigis'
-)
+simCaloStage2Layer1Summary.caloLayer1Regions = cms.InputTag("caloLayer1Digis", "")
+simCaloStage2Layer1Digis.ecalToken = cms.InputTag("ecalDigis", "EcalTriggerPrimitives")
+simCaloStage2Layer1Digis.hcalToken = cms.InputTag("hcalDigis", "")
 
-from DQM.L1TMonitor.L1TCaloLayer1Summary_cfi import l1tCaloLayer1Summary as _l1tCaloLayer1Summary
-l1tCaloLayer1Summary = _l1tCaloLayer1Summary.clone(simCICADAScore = cms.InputTag("cicadaEmulFromDigis", "CICADAScore"))
-l1tCaloLayer1SummarySeq = cms.Sequence(L1TReEmul * l1tCaloLayer1Summary)
+l1tCaloLayer1SummarySeq = cms.Sequence(simEcalTriggerPrimitiveDigis * simHcalTriggerPrimitiveDigis * simCaloStage2Layer1Digis * simCaloStage2Layer1Summary * l1tCaloLayer1Summary)
diff --git a/DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc b/DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc
@@ -102,15 +102,30 @@ void L1TCaloLayer1Summary::bookHistograms(DQMStore::IBooker& ibooker, edm::Run c
   histoCaloLayer1CICADAScore = ibooker.book1D("caloLayer1CICADAScore", "CaloLayer1 CICADAScore", 50, 0, 200);
   histoGtCICADAScore = ibooker.book1D("gtCICADAScore", "GT CICADAScore at BX0", 50, 0, 200);
   histoCaloMinusGt = ibooker.book1D("caloMinusGtCICADAScore", "CaloLayer1 - GT CICADAScore at BX0", 50, -50, 50);
-  histoSimCICADAScore = ibooker.book1D("simCaloLayer1CICADAScore", "simCaloLayer1 CICADAScore", 50, 0, 200);
-  histoCaloMinusSim = ibooker.book1D("caloMinusSimCICADAScore", "CaloLayer1 - simCaloLayer1 CICADAScore", 50, -50, 50);
+  histoSimCICADAScore =
+      ibooker.book1D("simCaloLayer1CICADAScore", "simCaloLayer1 CICADAScore (input: DAQ regions)", 50, 0, 200);
+  histoCaloMinusSim = ibooker.book1D(
+      "caloMinusSimCICADAScore", "CaloLayer1 - simCaloLayer1 (input: DAQ regions) CICADAScore", 50, -50, 50);
 
   ibooker.setCurrentFolder(histFolder_ + "/Regions");
-  histoCaloMinusSimRegions = ibooker.book2D(
-      "caloMinusSumRegions", "CaloLayer1 - simCaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, -400, 400);
+  histoCaloMinusSimRegions =
+      ibooker.book2D("caloMinusSumRegions",
+                     "CaloLayer1 - simCaloLayer1 (input: DAQ trigger primatives) Regions;Region;ET Difference",
+                     252,
+                     -0.5,
+                     252.5,
+                     100,
+                     -400,
+                     400);
   histoCaloRegions = ibooker.book2D("caloLayer1Regions", "CaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, 0, 800);
-  histoSimRegions =
-      ibooker.book2D("simCaloLayer1Regions", "simCaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, 0, 800);
+  histoSimRegions = ibooker.book2D("simCaloLayer1Regions",
+                                   "simCaloLayer1 Regions (input: DAQ trigger primatives);Region;ET",
+                                   252,
+                                   -0.5,
+                                   252.5,
+                                   100,
+                                   0,
+                                   800);
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------