Skip to content

Commit

Permalink
Removing m_allCells from CaloTopoClusterFCCee algorithm
Browse files Browse the repository at this point in the history
  • Loading branch information
@kjvbrt
kjvbrt committed Mar 21, 2024
1 parent c432481 commit 0e99c59
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 65 deletions.
19 changes: 8 additions & 11 deletions RecCalorimeter/src/components/CaloTopoClusterInputTool.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ StatusCode CaloTopoClusterInputTool::initialize() {
StatusCode CaloTopoClusterInputTool::finalize() { return GaudiTool::finalize(); }

StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, double>& aCells) {
for (auto& iCell : aCells) {
iCell.second = 0;
}
uint totalNumberOfCells = 0;

// 1. ECAL barrel
Expand All @@ -56,7 +53,7 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += ecalBarrelCells->size();

// 2. ECAL endcap calorimeter
const edm4hep::CalorimeterHitCollection* ecalEndcapCells = m_ecalEndcapCells.get();
debug() << "Input Ecal endcap cell collection size: " << ecalEndcapCells->size() << endmsg;
Expand All @@ -65,7 +62,7 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += ecalEndcapCells->size();

// 3. ECAL forward calorimeter
const edm4hep::CalorimeterHitCollection* ecalFwdCells = m_ecalFwdCells.get();
debug() << "Input Ecal forward cell collection size: " << ecalFwdCells->size() << endmsg;
Expand All @@ -74,7 +71,7 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += ecalFwdCells->size();

// 4. HCAL barrel
const edm4hep::CalorimeterHitCollection* hcalBarrelCells = m_hcalBarrelCells.get();
debug() << "Input hadronic barrel cell collection size: " << hcalBarrelCells->size() << endmsg;
Expand All @@ -83,7 +80,7 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += hcalBarrelCells->size();

// 5. HCAL extended barrel
const edm4hep::CalorimeterHitCollection* hcalExtBarrelCells = m_hcalExtBarrelCells.get();
debug() << "Input hadronic extended barrel cell collection size: " << hcalExtBarrelCells->size() << endmsg;
Expand All @@ -92,16 +89,16 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += hcalExtBarrelCells->size();
// 6. HCAL endcap calorimeter

// 6. HCAL endcap calorimeter
const edm4hep::CalorimeterHitCollection* hcalEndcapCells = m_hcalEndcapCells.get();
debug() << "Input Hcal endcap cell collection size: " << hcalEndcapCells->size() << endmsg;
// Loop over a collection of calorimeter cells and build calo towers
for (const auto& iCell : *hcalEndcapCells) {
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += hcalEndcapCells->size();

// 7. HCAL forward calorimeter
const edm4hep::CalorimeterHitCollection* hcalFwdCells = m_hcalFwdCells.get();
debug() << "Input Hcal forward cell collection size: " << hcalFwdCells->size() << endmsg;
Expand All @@ -110,7 +107,7 @@ StatusCode CaloTopoClusterInputTool::cellIDMap(std::unordered_map<uint64_t, doub
aCells.insert_or_assign(iCell.getCellID(), iCell.getEnergy());
}
totalNumberOfCells += hcalFwdCells->size();

//if (totalNumberOfCells != aCells.size()){
//error() << "Map size != total number of cells! " << endmsg;
//return StatusCode::FAILURE;
Expand Down
93 changes: 46 additions & 47 deletions RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
#include "CaloTopoClusterFCCee.h"
#include "../../../RecCalorimeter/src/components/NoiseCaloCellsFromFileTool.h"

// std
#include <algorithm>
#include <memory>
#include <numeric>
#include <unordered_set>
#include <vector>

// k4geo
#include "detectorCommon/DetUtils_k4geo.h"

// k4FWCore
#include "k4Interface/IGeoSvc.h"

// edm4hep
#include "edm4hep/Cluster.h"
// EDM4hep
#include "edm4hep/ClusterCollection.h"
#include "edm4hep/CalorimeterHit.h"
#include "edm4hep/CalorimeterHitCollection.h"

// DD4hep
#include "DD4hep/Detector.h"
#include "DD4hep/Readout.h"

// std C++ includes
#include <algorithm>
#include <map>
#include <memory>
#include <numeric>
#include <unordered_map>
#include <unordered_set>
#include <vector>

DECLARE_COMPONENT(CaloTopoClusterFCCee)

CaloTopoClusterFCCee::CaloTopoClusterFCCee(const std::string& name, ISvcLocator* svcLoc) : GaudiAlgorithm(name, svcLoc) {
Expand Down Expand Up @@ -94,30 +90,32 @@ StatusCode CaloTopoClusterFCCee::initialize() {
}

StatusCode CaloTopoClusterFCCee::execute() {
// Create output collections
auto edmClusters = m_clusterCollection.createAndPut();
auto edmClusterCells = m_clusterCellsCollection.createAndPut();

//std::unordered_map<uint64_t, double> allCells; // transform it into a member variable to avoid
// recreating such a huge map at every event. Only update the energy values
std::unordered_map<uint64_t, double> allCells;
std::vector<std::pair<uint64_t, double>> firstSeeds;
// get input cell map from input tool
StatusCode sc_prepareCellMap = m_inputTool->cellIDMap(m_allCells);

// Get input cell map from the input tool
StatusCode sc_prepareCellMap = m_inputTool->cellIDMap(allCells);
if (sc_prepareCellMap.isFailure()) {
error() << "Unable to create cell map!" << endmsg;
return StatusCode::FAILURE;
}
debug() << "Active Cells : " << m_allCells.size() << endmsg;
if (allCells.empty()) {
debug() << "No active cells, skipping event..." << endmsg;
return StatusCode::SUCCESS;
}
debug() << "Number of active cells: " << allCells.size() << endmsg;

// on first event, create cache
// On first event, create cache
if (m_min_noise.empty()) {
createCache(m_allCells);
createCache(allCells);
}

// Create output collections
auto edmClusters = m_clusterCollection.createAndPut();
std::unique_ptr<edm4hep::CalorimeterHitCollection> edmClusterCells(new edm4hep::CalorimeterHitCollection());

// Finds seeds
CaloTopoClusterFCCee::findingSeeds(m_allCells, m_seedSigma, firstSeeds);
CaloTopoClusterFCCee::findingSeeds(allCells, m_seedSigma, firstSeeds);
debug() << "Number of seeds found : " << firstSeeds.size() << endmsg;

// decending order of seeds
Expand All @@ -129,7 +127,7 @@ StatusCode CaloTopoClusterFCCee::execute() {
std::map<uint, std::vector<std::pair<uint64_t, int>>> preClusterCollection;
StatusCode sc_buildProtoClusters = CaloTopoClusterFCCee::buildingProtoCluster(m_neighbourSigma,
m_lastNeighbourSigma,
firstSeeds, m_allCells,
firstSeeds, allCells,
preClusterCollection);
if (sc_buildProtoClusters.isFailure()) {
error() << "Unable to build the protoclusters!" << endmsg;
Expand Down Expand Up @@ -159,8 +157,8 @@ StatusCode CaloTopoClusterFCCee::execute() {
dd4hep::DDSegmentation::CellID cID = pair.first;
// auto cellID = pair.first;
// get CalorimeterHit by cellID
auto newCell = edmClusterCells->create();
newCell.setEnergy(m_allCells[cID]);
auto newCell = edm4hep::MutableCalorimeterHit();
newCell.setEnergy(allCells[cID]);
newCell.setCellID(cID);
newCell.setType(pair.second);
energy += newCell.getEnergy();
Expand All @@ -177,7 +175,7 @@ StatusCode CaloTopoClusterFCCee::execute() {
posCell = m_cellPositionsHCalBarrelNoSegTool->xyzPosition(cID);
else
posCell = m_cellPositionsHCalBarrelTool->xyzPosition(cID);
}
}
//else if (systemId == 9) // HCAL EXT BARREL system id
// posCell = m_cellPositionsHCalExtBarrelTool->xyzPosition(cID);
//else if (systemId == 6) // EMEC system id
Expand All @@ -200,10 +198,11 @@ StatusCode CaloTopoClusterFCCee::execute() {
vecEnergy.push_back(newCell.getEnergy());
sumPhi += posCell.Phi() * newCell.getEnergy();
sumTheta += posCell.Theta() * newCell.getEnergy();

cluster.addToHits(newCell);
auto er = m_allCells.erase(cID);

edmClusterCells->push_back(newCell);
auto er = allCells.erase(cID);

if (er!=1)
info() << "Problem in erasing cell ID from map." << endmsg;
}
Expand All @@ -228,19 +227,17 @@ StatusCode CaloTopoClusterFCCee::execute() {
posPhi.clear();
posTheta.clear();
vecEnergy.clear();

}

m_clusterCellsCollection.put(std::move(edmClusterCells));

debug() << "Number of clusters with cells in E and HCal: " << clusterWithMixedCells << endmsg;
debug() << "Total energy of clusters: " << checkTotEnergy << endmsg;
debug() << "Leftover cells : " << m_allCells.size() << endmsg;
debug() << "Leftover cells : " << allCells.size() << endmsg;
return StatusCode::SUCCESS;
}

void CaloTopoClusterFCCee::findingSeeds(const std::unordered_map<uint64_t, double>& aCells,
int aNumSigma,
std::vector<std::pair<uint64_t, double>>& aSeeds) {
int aNumSigma,
std::vector<std::pair<uint64_t, double>>& aSeeds) {
for (const auto& cell : aCells) {
// retrieve the noise const and offset assigned to cell
// first try to use the cache
Expand All @@ -250,11 +247,11 @@ void CaloTopoClusterFCCee::findingSeeds(const std::unordered_map<uint64_t, doubl

double min_threshold = m_min_offset[layer] + m_min_noise[layer] * aNumSigma;

debug() << "m_min_offset[layer] = " << m_min_offset[layer] << endmsg;
debug() << "m_min_noise[layer] = " << m_min_noise[layer] << endmsg;
debug() << "aNumSigma = " << aNumSigma << endmsg;
debug() << "min_threshold = " << min_threshold << endmsg;
debug() << "abs(cell.second) = " << abs(cell.second) << endmsg;
verbose() << "m_min_offset[layer] = " << m_min_offset[layer] << endmsg;
verbose() << "m_min_noise[layer] = " << m_min_noise[layer] << endmsg;
verbose() << "aNumSigma = " << aNumSigma << endmsg;
verbose() << "min_threshold = " << min_threshold << endmsg;
verbose() << "abs(cell.second) = " << abs(cell.second) << endmsg;

if (abs(cell.second) < min_threshold) {
// if we are below the minimum threshold for the full layer, no need to retrieve the exact value
Expand Down Expand Up @@ -456,14 +453,17 @@ CaloTopoClusterFCCee::searchForNeighbours(const uint64_t aCellId,

StatusCode CaloTopoClusterFCCee::finalize() { return GaudiAlgorithm::finalize(); }

void CaloTopoClusterFCCee::createCache(const std::unordered_map<uint64_t, double>& aCells) {
// cache the minimum offset and noise per layer for faster lookups down the chain.

/**
* \brief Cache the minimum offset and noise per layer for faster lookups down
* the chain.
*/
void CaloTopoClusterFCCee::createCache(const std::unordered_map<uint64_t, double>& aCells) {
std::unordered_map<int, std::vector<double>> offsets;
std::unordered_map<int, std::vector<double>> noises;
std::unordered_set<int> layers;

// fill all noises and offsets values
// Fill all noises and offsets values
for (const auto& cell : aCells) {
int system = m_decoder->get(cell.first, m_index_system);
if (system == 4) { //ECal barrel
Expand All @@ -489,5 +489,4 @@ void CaloTopoClusterFCCee::createCache(const std::unordered_map<uint64_t, double
for (auto& n : noises) {
m_min_noise[n.first] = *std::min_element(n.second.begin(), n.second.end());
}

}
14 changes: 7 additions & 7 deletions RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#ifndef RECFCCEECALORIMETER_CALOTOPOCLUSTERFCCEE_H
#define RECFCCEECALORIMETER_CALOTOPOCLUSTERFCCEE_H

// std
#include <cstdint>
#include <unordered_map>
#include <map>

// Gaudi
#include "GaudiAlg/GaudiAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
Expand All @@ -13,12 +18,10 @@
#include "k4Interface/ICellPositionsTool.h"
#include "k4Interface/ITopoClusterInputTool.h"

#include <unordered_map>
#include <map>

// k4SimGeant4
class IGeoSvc;

// datamodel
// Datamodel
namespace edm4hep {
class CalorimeterHit;
class CalorimeterHitCollection;
Expand Down Expand Up @@ -143,14 +146,11 @@ class CaloTopoClusterFCCee : public GaudiAlgorithm {
dd4hep::DDSegmentation::BitFieldCoder* m_decoder_ecal;
int m_index_layer_ecal;

std::unordered_map<uint64_t, double> m_allCells;

// minimum noise and offset per barrel ECal layer
// this serves as a very small cache for fast lookups and avoid looking into the huge map for most of the cells.
std::vector<double> m_min_offset;
std::vector<double> m_min_noise;

void createCache(const std::unordered_map<uint64_t, double>& aCells);

};
#endif /* RECFCCEECALORIMETER_CALOTOPOCLUSTERFCCEE_H */

0 comments on commit 0e99c59

Please sign in to comment.