Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Package - Phase2 L1CaloTrigger #29904

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
68b26e2
Phase2 L1CaloTrigger - only Standalone EG in Barrel and EndCap.
rekovic May 19, 2020
d09d889
Code format.
rekovic May 19, 2020
d102d91
Address ccoments with get_ and fabs.
rekovic Jun 10, 2020
621214d
Address comment delete commented out, use cmath and simplify return.
rekovic Jun 10, 2020
f85da31
code-format.
rekovic Jun 16, 2020
e64c8e6
Stream Producer and data file path, two producers in the L1 sequence..
rekovic Jun 21, 2020
c2e1ba7
Code format.
rekovic Jun 21, 2020
95511a6
Address use M_PI.
rekovic Jun 23, 2020
2ddaf41
Address remove non-used method.
rekovic Jun 23, 2020
6b0904d
Address magic numbers.
rekovic Jun 23, 2020
ec7c5c4
Address remove non-implemented method.
rekovic Jun 23, 2020
f918065
Address member variables end with trailing underscore.
rekovic Jun 23, 2020
67e3905
Address remove non-used method.
rekovic Jun 23, 2020
701a211
Address simplifly and constexpr.
rekovic Jun 23, 2020
a8ed56b
Address const auto&.
rekovic Jun 23, 2020
ddca11a
Address comment on separate line and magic number.
rekovic Jun 23, 2020
4dc527e
Remove commented code.
rekovic Jun 23, 2020
39f9585
Address remove cout and use LogError and throw exception.
rekovic Jun 23, 2020
a51bab9
Code format.
rekovic Jun 23, 2020
4fa2d6f
Address const auto&
rekovic Jun 23, 2020
6c69e61
Address comments in separate line, magic numbers, combine in one if s…
rekovic Jun 23, 2020
327fa88
Address magic numbers and Address comment on separate line.
rekovic Jun 23, 2020
0bd29da
Addressing put comments in separate lines. simplify max, magic numbers.
rekovic Jun 23, 2020
405229c
Code-format.
rekovic Jun 23, 2020
1e540a7
Address comments on separate line.
rekovic Jun 24, 2020
1ba72dc
Address remove deprecated comment, Address const auto&.
rekovic Jun 24, 2020
c4dd173
Address make_unique.
rekovic Jun 24, 2020
9f97012
Address constexpr.
rekovic Jun 24, 2020
32e46c3
Address remove commented code, code-format.
rekovic Jun 24, 2020
6baaa17
Address const auto&.
rekovic Jun 24, 2020
3fcc1a5
Address const auto&.
rekovic Jun 24, 2020
07c44fb
Address remove commented code.
rekovic Jun 24, 2020
149a811
Address const auto&.
rekovic Jun 24, 2020
7fafde1
Address store pt, Address class private members, providing getters an…
rekovic Jun 24, 2020
f88ef6a
Address constexpr.
rekovic Jun 24, 2020
04078a1
Address constexpr.
rekovic Jun 24, 2020
8cd1ab9
Address remove commented code.
rekovic Jun 24, 2020
6360b51
Addres typo.
rekovic Jun 24, 2020
802d5ea
Address use fillDescription and not existsAs.
rekovic Jun 24, 2020
9bf3861
Address remove non-needed forward declaration. code format.
rekovic Jun 24, 2020
3db6617
Address functions in namespace.
rekovic Jun 24, 2020
42cf1b5
Remove unneeded tag.
rekovic Jun 24, 2020
a33b61a
Address move multiline functions.
rekovic Jun 24, 2020
5da1500
Address constexpr.
rekovic Jun 24, 2020
680252b
Address magic numbers - add comment.
rekovic Jun 24, 2020
b4fdcc3
code format.
rekovic Jun 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions L1Trigger/Configuration/python/SimL1Emulator_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
SimL1EmulatorCore = cms.Sequence(SimL1EmulatorCoreTask)

SimL1EmulatorTask = cms.Task(SimL1EmulatorCoreTask)
SimL1Emulator = cms.Sequence( SimL1EmulatorTask )

#
# Emulators are configured from DB (GlobalTags)
Expand All @@ -58,10 +57,39 @@
# soon to be removed when availble in GTs
from L1Trigger.L1TTwinMux.fakeTwinMuxParams_cff import *

# Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger
from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import *
_phase2_siml1emulator = SimL1EmulatorTask.copy()

# # Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger
from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import *
_phase2_siml1emulator.add(hgcalTriggerPrimitivesTask)

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator )

#phase2_hgcal.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator )

SimL1Emulator = cms.Sequence( SimL1EmulatorTask )

# ########################################################################
# Customisation for the phase2_trigger era, assumes TrackTrigger available
# ########################################################################
phase2_SimL1Emulator = SimL1Emulator.copy()

#%% # Vertex
#%% # ########################################################################
#from L1Trigger.VertexFinder.VertexProducer_cff import *
#%%
#%% phase2_SimL1Emulator += VertexProducer
#_phase2_siml1emulator.add(VertexProducer)

#%% # Barrel EGamma
#%% # ########################################################################
from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import *
_phase2_siml1emulator.add(L1EGammaClusterEmuProducer)

from L1Trigger.L1CaloTrigger.l1EGammaEEProducer_cfi import *
_phase2_siml1emulator.add(l1EGammaEEProducer)


from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger
phase2_trigger.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator)
7 changes: 7 additions & 0 deletions L1Trigger/L1CaloTrigger/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<use name="DataFormats/Math"/>
<use name="FWCore/ParameterSet"/>
<use name="clhep"/>

<export>
<lib name="1"/>
</export>
1 change: 1 addition & 0 deletions L1Trigger/L1CaloTrigger/data/calib_ee_v1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"eta_l":{"0":1.52,"1":1.52,"2":1.52,"3":1.52,"4":1.52,"5":1.52,"6":1.52,"7":1.7,"8":1.7,"9":1.7,"10":1.7,"11":1.7,"12":1.7,"13":1.7,"14":1.9,"15":1.9,"16":1.9,"17":1.9,"18":1.9,"19":1.9,"20":1.9,"21":2.1,"22":2.1,"23":2.1,"24":2.1,"25":2.1,"26":2.1,"27":2.1,"28":2.4,"29":2.4,"30":2.4,"31":2.4,"32":2.4,"33":2.4,"34":2.4},"eta_h":{"0":1.7,"1":1.7,"2":1.7,"3":1.7,"4":1.7,"5":1.7,"6":1.7,"7":1.9,"8":1.9,"9":1.9,"10":1.9,"11":1.9,"12":1.9,"13":1.9,"14":2.1,"15":2.1,"16":2.1,"17":2.1,"18":2.1,"19":2.1,"20":2.1,"21":2.4,"22":2.4,"23":2.4,"24":2.4,"25":2.4,"26":2.4,"27":2.4,"28":2.8,"29":2.8,"30":2.8,"31":2.8,"32":2.8,"33":2.8,"34":2.8},"pt_l":{"0":4.0,"1":10.0,"2":16.0,"3":22.0,"4":28.0,"5":34.0,"6":40.0,"7":4.0,"8":10.0,"9":16.0,"10":22.0,"11":28.0,"12":34.0,"13":40.0,"14":4.0,"15":10.0,"16":16.0,"17":22.0,"18":28.0,"19":34.0,"20":40.0,"21":4.0,"22":10.0,"23":16.0,"24":22.0,"25":28.0,"26":34.0,"27":40.0,"28":4.0,"29":10.0,"30":16.0,"31":22.0,"32":28.0,"33":34.0,"34":40.0},"pt_h":{"0":10.0,"1":16.0,"2":22.0,"3":28.0,"4":34.0,"5":40.0,"6":100.0,"7":10.0,"8":16.0,"9":22.0,"10":28.0,"11":34.0,"12":40.0,"13":100.0,"14":10.0,"15":16.0,"16":22.0,"17":28.0,"18":34.0,"19":40.0,"20":100.0,"21":10.0,"22":16.0,"23":22.0,"24":28.0,"25":34.0,"26":40.0,"27":100.0,"28":10.0,"29":16.0,"30":22.0,"31":28.0,"32":34.0,"33":40.0,"34":100.0},"calib":{"0":0.781180458,"1":0.8757045734,"2":0.9345304925,"3":0.9570185807,"4":0.949534431,"5":0.9507192889,"6":0.9667923344,"7":0.8513474654,"8":0.9050018099,"9":0.93,"10":0.9298693439,"11":0.9484821791,"12":0.9458081705,"13":0.9601151301,"14":0.8652961403,"15":0.910329904,"16":0.9258969437,"17":0.93706504,"18":0.9420715067,"19":0.9399362027,"20":0.9578185647,"21":0.8637430213,"22":0.9080246025,"23":0.9175739403,"24":0.9264721776,"25":0.9385671802,"26":0.9401631075,"27":0.9606143525,"28":0.8574439563,"29":0.8939776511,"30":0.9143750216,"31":0.9295711103,"32":0.9326748977,"33":0.9412633665,"34":0.9580564903}}
Loading