From 6c6a847b28ea039af3e695e876b584a488dad10c Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 26 Jun 2024 09:40:26 +0200 Subject: [PATCH] Revert "Add Unpacker for L1T Calo Layer 1 to unpack CICADA" --- .../implementations_stage2/CICADAUnpacker.cc | 55 ------------------- .../implementations_stage2/CICADAUnpacker.h | 19 ------- .../CaloLayer1Collections.cc | 1 - .../CaloLayer1Collections.h | 6 +- .../implementations_stage2/CaloLayer1Setup.cc | 6 -- .../CaloSummaryCollections.cc | 9 --- .../CaloSummaryCollections.h | 23 -------- 7 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.cc delete mode 100644 EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.h delete mode 100644 EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.cc delete mode 100644 EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.cc deleted file mode 100644 index f325e32f2386b..0000000000000 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.cc +++ /dev/null @@ -1,55 +0,0 @@ -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h" - -#include "CICADAUnpacker.h" - -#include - -using namespace edm; - -namespace l1t { - namespace stage2 { - bool CICADAUnpacker::unpack(const Block& block, UnpackerCollections* coll) { - LogDebug("L1T") << "Block Size = " << block.header().getSize(); - LogDebug("L1T") << "Board ID = " << block.amc().getBoardID(); - - auto res = static_cast(coll)->getCICADABxCollection(); - // default BX range to trigger standard -2 to 2 - // Even though CICADA will never have BX information - // And everything gets put in BX 0 - res->setBXRange(-2, 2); - - int amc_slot = block.amc().getAMCNumber(); - if (not(amc_slot == 7)) { - throw cms::Exception("CICADAUnpacker") - << "Calo Summary (CICADA) unpacker is unpacking an unexpected AMC. Expected AMC number 7, got AMC number " - << amc_slot << std::endl; - return false; - } else { - std::vector cicadaWords = {0, 0, 0, 0}; - //the last 4 words are CICADA words - for (uint32_t i = 2; i < 6; ++i) { - cicadaWords.at(i - 2) = ((block.payload().at(i)) >> 28); - } - - float cicadaScore = convertCICADABitsToFloat(cicadaWords); - res->push_back(0, cicadaScore); - return true; - } - } - - //convert the 4 CICADA bits/words into a proper number - float CICADAUnpacker::convertCICADABitsToFloat(const std::vector& cicadaBits) { - uint32_t tempResult = 0; - tempResult |= cicadaBits.at(0) << 12; - tempResult |= cicadaBits.at(1) << 8; - tempResult |= cicadaBits.at(2) << 4; - tempResult |= cicadaBits.at(3); - float result = 0.0; - result = (float)tempResult * pow(2.0, -8); - return result; - } - } // namespace stage2 -} // namespace l1t - -DEFINE_L1T_UNPACKER(l1t::stage2::CICADAUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.h deleted file mode 100644 index 8c6927d68700a..0000000000000 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CICADAUnpacker.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef EventFilter_L1TRawToDigi_CICADAUnpacker_h -#define EventFilter_L1TRawToDigi_CICADAUnpacker_h - -#include "EventFilter/L1TRawToDigi/interface/Unpacker.h" -#include "CaloLayer1Collections.h" - -namespace l1t { - namespace stage2 { - class CICADAUnpacker : public Unpacker { - public: - bool unpack(const Block& block, UnpackerCollections* coll) override; - - private: - float convertCICADABitsToFloat(const std::vector&); - }; - } // namespace stage2 -} // namespace l1t - -#endif diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.cc index 4ccf20081ee38..2e6ce53fdecab 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.cc @@ -12,7 +12,6 @@ namespace l1t { for (int i = 0; i < 5; ++i) { event_.put(std::move(ecalDigisBx_[i]), "EcalDigisBx" + std::to_string(i + 1)); } - event_.put(std::move(cicadaDigis_), "CICADAScore"); } } // namespace stage2 } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.h index ce1be86054b13..a0630d46cb881 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Collections.h @@ -6,7 +6,6 @@ #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h" #include "EventFilter/L1TRawToDigi/interface/UnpackerCollections.h" #include "L1TObjectCollections.h" -#include "DataFormats/L1CaloTrigger/interface/CICADA.h" namespace l1t { namespace stage2 { @@ -16,8 +15,7 @@ namespace l1t { : L1TObjectCollections(e), ecalDigis_(new EcalTrigPrimDigiCollection()), hcalDigis_(new HcalTrigPrimDigiCollection()), - caloRegions_(new L1CaloRegionCollection()), - cicadaDigis_(std::make_unique()) { + caloRegions_(new L1CaloRegionCollection()) { // Pre-allocate: // 72 iPhi values // 28 iEta values in Ecal, 28 + 12 iEta values in Hcal + HF @@ -39,7 +37,6 @@ namespace l1t { inline EcalTrigPrimDigiCollection* getEcalDigisBx(const unsigned int copy) override { return ecalDigisBx_[copy].get(); }; - inline CICADABxCollection* getCICADABxCollection() { return cicadaDigis_.get(); }; private: std::unique_ptr ecalDigis_; @@ -47,7 +44,6 @@ namespace l1t { std::unique_ptr caloRegions_; std::array, 5> ecalDigisBx_; - std::unique_ptr cicadaDigis_; }; } // namespace stage2 } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc index d0c417d427074..95b1631bcfeda 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Setup.cc @@ -6,8 +6,6 @@ #include "CaloLayer1Setup.h" -#include "DataFormats/L1CaloTrigger/interface/CICADA.h" - namespace l1t { namespace stage2 { std::unique_ptr CaloLayer1Setup::registerConsumes(const edm::ParameterSet& cfg, @@ -60,7 +58,6 @@ namespace l1t { for (int i = 0; i < 5; ++i) { prod.produces("EcalDigisBx" + std::to_string(i + 1)); } - prod.produces("CICADAScore"); } std::unique_ptr CaloLayer1Setup::getCollections(edm::Event& e) { @@ -75,9 +72,6 @@ namespace l1t { if (board < 18) { res[0] = UnpackerFactory::get()->make("stage2::CaloLayer1Unpacker"); } - if (fed == 1356 && amc == 7) { //calo summary board - res[0] = UnpackerFactory::get()->make("stage2::CICADAUnpacker"); - } } return res; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.cc deleted file mode 100644 index bedcfb42c9237..0000000000000 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "FWCore/Framework/interface/Event.h" - -#include "CaloSummaryCollections.h" - -namespace l1t { - namespace stage2 { - CaloSummaryCollections::~CaloSummaryCollections() { event_.put(std::move(cicadaDigis_)); } - } // namespace stage2 -} // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h deleted file mode 100644 index 543d284d16ec7..0000000000000 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef EventFilter_L1TRawToDigi_CaloSummaryCollections_h -#define EventFilter_L1TRawToDigi_CaloSummaryCollections_h - -#include "DataFormats/L1CaloTrigger/interface/CICADA.h" - -#include "EventFilter/L1TRawToDigi/interface/UnpackerCollections.h" - -namespace l1t { - namespace stage2 { - class CaloSummaryCollections : public UnpackerCollections { - public: - CaloSummaryCollections(edm::Event& e) - : UnpackerCollections(e), cicadaDigis_(std::make_unique()){}; - ~CaloSummaryCollections() override; - inline CICADABxCollection* getCICADABxCollection() { return cicadaDigis_.get(); }; - - private: - std::unique_ptr cicadaDigis_; - }; - } // namespace stage2 -} // namespace l1t - -#endif