Skip to content

Rename SimDataformats TICL associator as TICLAssociationMap #51649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Aug 21, 2026
Merged

Rename SimDataformats TICL associator as TICLAssociationMap #51649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions PhysicsTools/NanoAOD/interface/AssociationMapFlatTableProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,46 +247,50 @@ class AssociationOneToManyFlatTableProducer : public SimpleFlatTableProducerBase

// OneToOne, Fraction and Fraction with Score
template <typename Source, typename Target>
using AssociationMapOneToOneFraction =
ticl::AssociationMap<vector<ticl::AssociationElement<ticl::FractionType>>, std::vector<Source>, std::vector<Target>>;
using AssociationMapOneToOneFraction = ticl::
TICLAssociationMap<vector<ticl::AssociationElement<ticl::FractionType>>, std::vector<Source>, std::vector<Target>>;

template <typename Source, typename Target>
using AssociationMapOneToOneFractionScore =
ticl::AssociationMap<vector<ticl::AssociationElement<std::pair<ticl::FractionType, float>>>,
std::vector<Source>,
std::vector<Target>>;
ticl::TICLAssociationMap<vector<ticl::AssociationElement<std::pair<ticl::FractionType, float>>>,
std::vector<Source>,
std::vector<Target>>;

// OneToOne, SharedEnergy and SharedEnergy with Score
template <typename Source, typename Target>
using AssociationMapOneToOneSharedEnergy = ticl::
AssociationMap<vector<ticl::AssociationElement<ticl::SharedEnergyType>>, std::vector<Source>, std::vector<Target>>;
using AssociationMapOneToOneSharedEnergy =
ticl::TICLAssociationMap<vector<ticl::AssociationElement<ticl::SharedEnergyType>>,
std::vector<Source>,
std::vector<Target>>;

template <typename Source, typename Target>
using AssociationMapOneToOneSharedEnergyScore =
ticl::AssociationMap<vector<ticl::AssociationElement<std::pair<ticl::SharedEnergyType, float>>>,
std::vector<Source>,
std::vector<Target>>;
ticl::TICLAssociationMap<vector<ticl::AssociationElement<std::pair<ticl::SharedEnergyType, float>>>,
std::vector<Source>,
std::vector<Target>>;

// OneToMany, Fraction and Fraction with Score
template <typename Source, typename Target>
using AssociationMapOneToManyFraction =
ticl::AssociationMap<vector<vector<ticl::AssociationElement<ticl::FractionType>>>, vector<Source>, vector<Target>>;
using AssociationMapOneToManyFraction = ticl::
TICLAssociationMap<vector<vector<ticl::AssociationElement<ticl::FractionType>>>, vector<Source>, vector<Target>>;

template <typename Source, typename Target>
using AssociationMapOneToManyFractionScore =
ticl::AssociationMap<vector<vector<ticl::AssociationElement<pair<ticl::FractionType, float>>>>,
vector<Source>,
vector<Target>>;
ticl::TICLAssociationMap<vector<vector<ticl::AssociationElement<pair<ticl::FractionType, float>>>>,
vector<Source>,
vector<Target>>;

// OneToMany, SharedEnergy and SharedEnergy with Score
template <typename Source, typename Target>
using AssociationMapOneToManySharedEnergy = ticl::
AssociationMap<vector<vector<ticl::AssociationElement<ticl::SharedEnergyType>>>, vector<Source>, vector<Target>>;
using AssociationMapOneToManySharedEnergy =
ticl::TICLAssociationMap<vector<vector<ticl::AssociationElement<ticl::SharedEnergyType>>>,
vector<Source>,
vector<Target>>;

template <typename Source, typename Target>
using AssociationMapOneToManySharedEnergyScore =
ticl::AssociationMap<vector<vector<ticl::AssociationElement<pair<ticl::SharedEnergyType, float>>>>,
vector<Source>,
vector<Target>>;
ticl::TICLAssociationMap<vector<vector<ticl::AssociationElement<pair<ticl::SharedEnergyType, float>>>>,
vector<Source>,
vector<Target>>;

#endif
2 changes: 1 addition & 1 deletion PhysicsTools/TruthInfo/plugins/TruthBranchCaloAssociationProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

namespace {
// Raw-index AssociationMap (object index -> [(branch id, sharedEnergy, score)]).
using BranchAssociationMap = ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore>;
using BranchAssociationMap = ticl::TICLAssociationMap<ticl::mapWithSharedEnergyAndScore>;
} // namespace

class TruthBranchCaloAssociationProducer : public edm::stream::EDProducer<> {
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/TruthInfo/plugins/TruthBranchTrackingAssociationProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

namespace {
// Raw-index AssociationMap (object index -> [(branch id, sharedHits, score)]).
using BranchAssociationMap = ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore>;
using BranchAssociationMap = ticl::TICLAssociationMap<ticl::mapWithSharedEnergyAndScore>;
} // namespace

class TruthBranchTrackingAssociationProducer : public edm::stream::EDProducer<> {
Expand Down
4 changes: 2 additions & 2 deletions RecoHGCal/TICL/plugins/TICLDumper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"

using TracksterToTracksterMap =
ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore, std::vector<ticl::Trackster>, std::vector<ticl::Trackster>>;
using TracksterToTracksterMap = ticl::
TICLAssociationMap<ticl::mapWithSharedEnergyAndScore, std::vector<ticl::Trackster>, std::vector<ticl::Trackster>>;
// Helper class for geometry, magnetic field, etc
class DetectorTools {
public:
Expand Down
24 changes: 12 additions & 12 deletions SimCalorimetry/HGCalAssociatorProducers/plugins/AllHitToTracksterAssociatorsProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ AllHitToTracksterAssociatorsProducerT<HIT>::AllHitToTracksterAssociatorsProducer
}

for (const auto& tracksterToken : tracksterCollectionTokens_) {
produces<ticl::AssociationMap<ticl::mapWithFraction>>("hitTo" + tracksterToken.first);
produces<ticl::AssociationMap<ticl::mapWithFraction>>(tracksterToken.first + "ToHit");
produces<ticl::TICLAssociationMap<ticl::mapWithFraction>>("hitTo" + tracksterToken.first);
produces<ticl::TICLAssociationMap<ticl::mapWithFraction>>(tracksterToken.first + "ToHit");
}
}

Expand All @@ -62,8 +62,8 @@ void AllHitToTracksterAssociatorsProducerT<HIT>::produce(edm::StreamID,
if (!layer_clusters.isValid()) {
edm::LogWarning("AllHitToTracksterAssociatorsProducer") << "Missing LayerCluster collection.";
for (const auto& tracksterToken : tracksterCollectionTokens_) {
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
}
return;
}
Expand All @@ -74,8 +74,8 @@ void AllHitToTracksterAssociatorsProducerT<HIT>::produce(edm::StreamID,
if (!iEvent.getHandle(hitsToken_)) {
edm::LogWarning("AllHitToTracksterAssociatorsProducer") << "Missing edm::RefProdVector<RecHitCollection>.";
for (const auto& tracksterToken : tracksterCollectionTokens_) {
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
}
return;
}
Expand All @@ -95,8 +95,8 @@ void AllHitToTracksterAssociatorsProducerT<HIT>::produce(edm::StreamID,
LogDebug("HitToSimClusterCaloParticleAssociatorProducer")
<< "Only empty RecHitCollections found. Association maps will be empty.";
for (const auto& tracksterToken : tracksterCollectionTokens_) {
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
}
return;
}
Expand All @@ -108,13 +108,13 @@ void AllHitToTracksterAssociatorsProducerT<HIT>::produce(edm::StreamID,
if (!tracksters.isValid()) {
LogDebug("AllHitToTracksterAssociatorsProducer")
<< "Missing Tracksters for collection " << tracksterToken.first << ". Association maps will be empty.";
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
continue;
}

auto hitToTracksterMap = std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(rechitSpan.size());
auto tracksterToHitMap = std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(tracksters->size());
auto hitToTracksterMap = std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(rechitSpan.size());
auto tracksterToHitMap = std::make_unique<ticl::TICLAssociationMap<ticl::mapWithFraction>>(tracksters->size());

for (unsigned int tracksterId = 0; tracksterId < tracksters->size(); ++tracksterId) {
const auto& trackster = (*tracksters)[tracksterId];
Expand Down
20 changes: 10 additions & 10 deletions ...rimetry/HGCalAssociatorProducers/plugins/AllLayerClusterToTracksterAssociatorsProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ AllLayerClusterToTracksterAssociatorsProducer::AllLayerClusterToTracksterAssocia

// Produce separate association maps for each trackster collection using the trackster label
for (const auto& tracksterToken : tracksterCollectionTokens_) {
produces<
ticl::AssociationMap<ticl::mapWithSharedEnergy, std::vector<reco::CaloCluster>, std::vector<ticl::Trackster>>>(
tracksterToken.first);
produces<ticl::TICLAssociationMap<ticl::mapWithSharedEnergy,
std::vector<reco::CaloCluster>,
std::vector<ticl::Trackster>>>(tracksterToken.first);
}
}

Expand All @@ -58,9 +58,9 @@ void AllLayerClusterToTracksterAssociatorsProducer::produce(edm::StreamID,
if (!layerClustersHandle.isValid()) {
edm::LogWarning("MissingInput") << "Layer clusters collection not found. Producing empty maps.";
for (const auto& tracksterToken : tracksterCollectionTokens_) {
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergy,
std::vector<reco::CaloCluster>,
std::vector<ticl::Trackster>>>(),
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithSharedEnergy,
std::vector<reco::CaloCluster>,
std::vector<ticl::Trackster>>>(),
tracksterToken.first);
}
return;
Expand All @@ -71,16 +71,16 @@ void AllLayerClusterToTracksterAssociatorsProducer::produce(edm::StreamID,
// If tracksters collection is missing, produce empty map and continue
if (!trackstersHandle.isValid()) {
LogDebug("MissingInput") << "Tracksters collection '" << tracksterToken.first << "' not found.";
iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergy,
std::vector<reco::CaloCluster>,
std::vector<ticl::Trackster>>>(),
iEvent.put(std::make_unique<ticl::TICLAssociationMap<ticl::mapWithSharedEnergy,
std::vector<reco::CaloCluster>,
std::vector<ticl::Trackster>>>(),
tracksterToken.first);
continue;
}

// Create association map
auto lcToTracksterMap = std::make_unique<
ticl::AssociationMap<ticl::mapWithSharedEnergy, std::vector<reco::CaloCluster>, std::vector<ticl::Trackster>>>(
ticl::TICLAssociationMap<ticl::mapWithSharedEnergy, std::vector<reco::CaloCluster>, std::vector<ticl::Trackster>>>(
layerClustersHandle, trackstersHandle, iEvent);

// Loop over tracksters
Expand Down
Loading