From 42124f85ce63f33d748d998b21b5498b9a714170 Mon Sep 17 00:00:00 2001 From: Andrew Loeliger Date: Fri, 26 Jan 2024 09:31:53 -0600 Subject: [PATCH 1/3] Update CICADA emulator templates and update model version to pattern testing model --- .../L1TCaloLayer1/plugins/L1TCaloSummary.cc | 21 ++++++++++++++----- .../python/simCaloStage2Layer1Summary_cfi.py | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc index d8ec5cbffa7c7..e70edf2751201 100644 --- a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc +++ b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc @@ -336,8 +336,19 @@ void L1TCaloSummary::fillDescriptions(edm::ConfigurationDescripti descriptions.addDefault(desc); } -typedef L1TCaloSummary, ap_fixed<11, 5>> L1TCaloSummaryCICADAv1; -typedef L1TCaloSummary, ap_ufixed<16, 8>> L1TCaloSummaryCICADAv2; -//define type version plugins -DEFINE_FWK_MODULE(L1TCaloSummaryCICADAv1); -DEFINE_FWK_MODULE(L1TCaloSummaryCICADAv2); +// Initial version, X.0.0, input/output typing +typedef L1TCaloSummary, ap_fixed<11, 5>> L1TCaloSummary_CICADA_v1p0p0; +typedef L1TCaloSummary, ap_ufixed<16, 8>> L1TCaloSummary_CICADA_v2p0p0; +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v1p0p0); +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v2p0p0); +// X.1.0 version input.output typing +typedef L1TCaloSummary, ap_fixed<11,5>> L1TCaloSummary_CICADA_v1p1p0; +typedef L1TCaloSummary, ap_ufixed<16,8>> L1TCaloSummary_CICADA_v2p1p0; +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v1p1p0); +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v2p1p0); +// X.1.1 version input/output typing +typedef L1TCaloSummary, ap_ufixed<16,8,AP_RND,AP_SAT,AP_SAT>> L1TCaloSummary_CICADA_vXp1p1; +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_vXp1p1); +// X.1.2 version input/output typing +typedef L1TCaloSummary, ap_ufixed<16,8,AP_RND_CONV,AP_SAT>> L1TCaloSummary_CICADA_vXp1p2; +DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_vXp1p2); diff --git a/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py b/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py index 91fd111a33b27..4d7c51e0c4f99 100644 --- a/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py +++ b/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py @@ -2,7 +2,7 @@ from L1Trigger.L1TCaloLayer1.CICADATestPatterns import standardCICADATestPatterns -simCaloStage2Layer1Summary = cms.EDProducer('L1TCaloSummaryCICADAv2', +simCaloStage2Layer1Summary = cms.EDProducer('L1TCaloSummary_CICADA_vXp1p1', nPumBins = cms.uint32(18), pumLUT00n= cms.vdouble(0.43, 0.32, 0.29, 0.36, 0.33, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25), pumLUT00p= cms.vdouble(0.45, 0.32, 0.29, 0.35, 0.31, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25), @@ -50,7 +50,7 @@ verbose = cms.bool(False), # See UCTLayer1.hh for firmware version firmwareVersion = cms.int32(1), - CICADAModelVersion = cms.string("CICADAModel_v2p1"), + CICADAModelVersion = cms.string("CICADA_v1p1p1"), useTestPatterns = cms.bool(False), testPatterns = standardCICADATestPatterns ) From 13361b9d729d34828ee36936b314c6e3fd549250 Mon Sep 17 00:00:00 2001 From: Andrew Loeliger Date: Fri, 26 Jan 2024 10:02:06 -0600 Subject: [PATCH 2/3] fix format --- L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc index e70edf2751201..4237afee3dcb8 100644 --- a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc +++ b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc @@ -342,13 +342,13 @@ typedef L1TCaloSummary, ap_ufixed<16, 8>> L1TCaloSummary_CICADA_v2p0 DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v1p0p0); DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v2p0p0); // X.1.0 version input.output typing -typedef L1TCaloSummary, ap_fixed<11,5>> L1TCaloSummary_CICADA_v1p1p0; -typedef L1TCaloSummary, ap_ufixed<16,8>> L1TCaloSummary_CICADA_v2p1p0; +typedef L1TCaloSummary, ap_fixed<11, 5>> L1TCaloSummary_CICADA_v1p1p0; +typedef L1TCaloSummary, ap_ufixed<16, 8>> L1TCaloSummary_CICADA_v2p1p0; DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v1p1p0); DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_v2p1p0); // X.1.1 version input/output typing -typedef L1TCaloSummary, ap_ufixed<16,8,AP_RND,AP_SAT,AP_SAT>> L1TCaloSummary_CICADA_vXp1p1; +typedef L1TCaloSummary, ap_ufixed<16, 8, AP_RND, AP_SAT, AP_SAT>> L1TCaloSummary_CICADA_vXp1p1; DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_vXp1p1); // X.1.2 version input/output typing -typedef L1TCaloSummary, ap_ufixed<16,8,AP_RND_CONV,AP_SAT>> L1TCaloSummary_CICADA_vXp1p2; +typedef L1TCaloSummary, ap_ufixed<16, 8, AP_RND_CONV, AP_SAT>> L1TCaloSummary_CICADA_vXp1p2; DEFINE_FWK_MODULE(L1TCaloSummary_CICADA_vXp1p2); From b1e5fc7cba182b366e1f561d1c0175096e743b65 Mon Sep 17 00:00:00 2001 From: Andrew Loeliger Date: Mon, 29 Jan 2024 06:04:27 -0600 Subject: [PATCH 3/3] Fix mistyped CICADA model name --- .../L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py b/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py index 4d7c51e0c4f99..a5c5373a0ca63 100644 --- a/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py +++ b/L1Trigger/L1TCaloLayer1/python/simCaloStage2Layer1Summary_cfi.py @@ -50,7 +50,7 @@ verbose = cms.bool(False), # See UCTLayer1.hh for firmware version firmwareVersion = cms.int32(1), - CICADAModelVersion = cms.string("CICADA_v1p1p1"), + CICADAModelVersion = cms.string("CICADAModel_v1p1p1"), useTestPatterns = cms.bool(False), testPatterns = standardCICADATestPatterns )