Update CICADA emulator element pieces to create BX Vectors

aloeliger · aloeliger · commit 4cbf9c4c31fb · 2024-06-26T07:51:35.000-05:00
This change is done in preparation for updating the unpacker to handle multiple BX's worth of CICADA information
diff --git a/DataFormats/L1CaloTrigger/interface/CICADA.h b/DataFormats/L1CaloTrigger/interface/CICADA.h
@@ -0,0 +1,10 @@
+#ifndef DataFormats_L1Trigger_CICADA_h
+#define DataFormats_L1Trigger_CICADA_h
+
+#include "DataFormats/L1Trigger/interface/BXVector.h"
+
+namespace l1t {
+  typedef BXVector<float> CICADABxCollection;
+}
+
+#endif
diff --git a/DataFormats/L1CaloTrigger/src/classes.h b/DataFormats/L1CaloTrigger/src/classes.h
@@ -2,3 +2,4 @@
 #include <vector>
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/Common/interface/Wrapper.h"
+#include "DataFormats/L1CaloTrigger/interface/CICADA.h"
diff --git a/DataFormats/L1CaloTrigger/src/classes_def.xml b/DataFormats/L1CaloTrigger/src/classes_def.xml
@@ -13,4 +13,8 @@
   <class name="std::vector<L1CaloRegion>"/>
   <class name="edm::Wrapper<std::vector<L1CaloEmCand>>" splitLevel="0"/>
   <class name="edm::Wrapper<std::vector<L1CaloRegion>>" splitLevel="0"/>
+
+  <class name="l1t::CICADABxCollection"/>
+  <class name="BXVector<float>"/>
+  <class name="edm::Wrapper<BXVector<float>>"/>
 </lcgdict>
diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc
@@ -51,6 +51,7 @@
 
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/L1CaloTrigger/interface/L1CaloRegion.h"
+#include "DataFormats/L1CaloTrigger/interface/CICADA.h"
 
 #include "DataFormats/Math/interface/LorentzVector.h"
 
@@ -166,7 +167,7 @@ L1TCaloSummary<INPUT, OUTPUT>::L1TCaloSummary(const edm::ParameterSet& iConfig)
 
   //anomaly trigger loading
   model = loader.load_model();
-  produces<float>("CICADAScore");
+  produces<l1t::CICADABxCollection>("CICADAScore");
 }
 
 //
@@ -180,7 +181,8 @@ void L1TCaloSummary<INPUT, OUTPUT>::produce(edm::Event& iEvent, const edm::Event
 
   std::unique_ptr<L1JetParticleCollection> bJetCands(new L1JetParticleCollection);
 
-  std::unique_ptr<float> CICADAScore = std::make_unique<float>();
+  std::unique_ptr<l1t::CICADABxCollection> CICADAScore = std::make_unique<l1t::CICADABxCollection>();
+  CICADAScore->setBXRange(-2,2);
 
   UCTGeometry g;
 
@@ -254,10 +256,10 @@ void L1TCaloSummary<INPUT, OUTPUT>::produce(edm::Event& iEvent, const edm::Event
   model->predict();
   model->read_result(modelResult);
 
-  *CICADAScore = modelResult[0].to_float();
+  CICADAScore->push_back(0, modelResult[0].to_float());
 
   if (overwriteWithTestPatterns)
-    edm::LogInfo("L1TCaloSummary") << "Test Pattern Output: " << *CICADAScore;
+    edm::LogInfo("L1TCaloSummary") << "Test Pattern Output: " << CICADAScore->at(0, 0);
 
   summaryCard.setRegionData(inputRegions);
 
diff --git a/L1Trigger/L1TGlobal/interface/GlobalBoard.h b/L1Trigger/L1TGlobal/interface/GlobalBoard.h
@@ -69,7 +69,7 @@ namespace l1t {
                                const edm::EDGetTokenT<BXVector<l1t::Jet>>&,
                                const edm::EDGetTokenT<BXVector<l1t::EtSum>>&,
                                const edm::EDGetTokenT<BXVector<l1t::EtSum>>&,
-                               const edm::EDGetTokenT<float>&,
+                               const edm::EDGetTokenT<BXVector<float>>&,
                                const bool receiveEG,
                                const int nrL1EG,
                                const bool receiveTau,
diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc
@@ -139,7 +139,7 @@ L1TGlobalProducer::L1TGlobalProducer(const edm::ParameterSet& parSet)
   m_jetInputToken = consumes<BXVector<Jet>>(m_jetInputTag);
   m_sumInputToken = consumes<BXVector<EtSum>>(m_sumInputTag);
   m_sumZdcInputToken = consumes<BXVector<EtSum>>(m_sumZdcInputTag);
-  m_CICADAInputToken = consumes<float>(m_CICADAInputTag);
+  m_CICADAInputToken = consumes<BXVector<float>>(m_CICADAInputTag);
   m_muInputToken = consumes<BXVector<Muon>>(m_muInputTag);
   if (m_useMuonShowers)
     m_muShowerInputToken = consumes<BXVector<MuonShower>>(m_muShowerInputTag);
diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h
@@ -133,7 +133,7 @@ class L1TGlobalProducer : public edm::stream::EDProducer<> {
   edm::EDGetTokenT<BXVector<l1t::Jet>> m_jetInputToken;
   edm::EDGetTokenT<BXVector<l1t::EtSum>> m_sumInputToken;
   edm::EDGetTokenT<BXVector<l1t::EtSum>> m_sumZdcInputToken;
-  edm::EDGetTokenT<float> m_CICADAInputToken;
+  edm::EDGetTokenT<BXVector<float>> m_CICADAInputToken;
 
   /// input tag for external conditions
   edm::InputTag m_extInputTag;
diff --git a/L1Trigger/L1TGlobal/src/CICADACondition.cc b/L1Trigger/L1TGlobal/src/CICADACondition.cc
@@ -41,7 +41,7 @@ l1t::CICADACondition& l1t::CICADACondition::operator=(const l1t::CICADACondition
 
 const bool l1t::CICADACondition::evaluateCondition(const int bxEval) const {
   bool condResult = false;
-  const float cicadaScore = m_uGtB->getCICADAScore();  //needs to be implemented
+  const float cicadaScore = m_uGtB->getCICADAScore();
 
   // This gets rid of a GT emulator convention "iCondition".
   // This usually indexes the next line, which is somewhat concerning
diff --git a/L1Trigger/L1TGlobal/src/GlobalBoard.cc b/L1Trigger/L1TGlobal/src/GlobalBoard.cc
@@ -146,7 +146,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,
                                              const edm::EDGetTokenT<BXVector<l1t::Jet>>& jetInputToken,
                                              const edm::EDGetTokenT<BXVector<l1t::EtSum>>& sumInputToken,
                                              const edm::EDGetTokenT<BXVector<l1t::EtSum>>& sumZdcInputToken,
-                                             const edm::EDGetTokenT<float>& CICADAInputToken,
+                                             const edm::EDGetTokenT<BXVector<float>>& CICADAInputToken,
                                              const bool receiveEG,
                                              const int nrL1EG,
                                              const bool receiveTau,
@@ -347,7 +347,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,
     }
   }
   if (receiveCICADA) {
-    edm::Handle<float> cicadaScoreHandle;
+    edm::Handle<BXVector<float>> cicadaScoreHandle;
     iEvent.getByToken(CICADAInputToken, cicadaScoreHandle);
     if (not cicadaScoreHandle.isValid()) {
       if (m_verbosity) {
@@ -357,7 +357,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,
         setCICADAScore(0.0);
       }
     } else
-      setCICADAScore(*cicadaScoreHandle);
+      setCICADAScore(cicadaScoreHandle->at(0, 0)); //CICADA emulation will only provide a central BX, and one value. Unpacking may have more values, but that can't be guaranteed.
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,`
`146`	`146`	`const edm::EDGetTokenT<BXVector<l1t::Jet>>& jetInputToken,`
`147`	`147`	`const edm::EDGetTokenT<BXVector<l1t::EtSum>>& sumInputToken,`
`148`	`148`	`const edm::EDGetTokenT<BXVector<l1t::EtSum>>& sumZdcInputToken,`
`149`		`- const edm::EDGetTokenT<float>& CICADAInputToken,`
	`149`	`+ const edm::EDGetTokenT<BXVector<float>>& CICADAInputToken,`
`150`	`150`	`const bool receiveEG,`
`151`	`151`	`const int nrL1EG,`
`152`	`152`	`const bool receiveTau,`
`@@ -347,7 +347,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`	`if (receiveCICADA) {`
`350`		`- edm::Handle<float> cicadaScoreHandle;`
	`350`	`+ edm::Handle<BXVector<float>> cicadaScoreHandle;`
`351`	`351`	`iEvent.getByToken(CICADAInputToken, cicadaScoreHandle);`
`352`	`352`	`if (not cicadaScoreHandle.isValid()) {`
`353`	`353`	`if (m_verbosity) {`
`@@ -357,7 +357,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,`
`357`	`357`	`setCICADAScore(0.0);`
`358`	`358`	`}`
`359`	`359`	`} else`
`360`		`- setCICADAScore(*cicadaScoreHandle);`
	`360`	`+ setCICADAScore(cicadaScoreHandle->at(0, 0)); //CICADA emulation will only provide a central BX, and one value. Unpacking may have more values, but that can't be guaranteed.`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`