Merge pull request #43799 from aloeliger/CICADAPatternTestUpdateFix

Update CICADA emulator templates and update model version to pattern testing model
cms-sw · Feb 7, 2024 · 93f14ae · 93f14ae
2 parents ae2ba49 + b1e5fc7
commit 93f14ae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc
@@ -336,8 +336,19 @@ void L1TCaloSummary<INPUT, OUTPUT>::fillDescriptions(edm::ConfigurationDescripti
   descriptions.addDefault(desc);
 }
 
-typedef L1TCaloSummary<ap_ufixed<10, 10>, ap_fixed<11, 5>> L1TCaloSummaryCICADAv1;
-typedef L1TCaloSummary<ap_uint<10>, 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_ufixed<10, 10>, ap_fixed<11, 5>> L1TCaloSummary_CICADA_v1p0p0;
+typedef L1TCaloSummary<ap_uint<10>, 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_ufixed<10, 10>, ap_fixed<11, 5>> L1TCaloSummary_CICADA_v1p1p0;
+typedef L1TCaloSummary<ap_uint<10>, 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_uint<10>, 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_uint<10>, 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
@@ -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("CICADAModel_v1p1p1"),
     useTestPatterns = cms.bool(False),
     testPatterns = standardCICADATestPatterns
 )