Skip to content

Commit 4276c5e

Browse files
lecristelecriste
committed
code-format
1 parent 5c65796 commit 4276c5e

File tree

4 files changed

+34
-32
lines changed

4 files changed

+34
-32
lines changed

‎SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSimTSAssociatorByEnergyScoreImpl.cc‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
7777
for (auto const& lcaf : tssInSimTrackster[st].lcs_and_fractions) {
7878
const auto lcEn = lcaf.second * layerClusters[lcaf.first].energy();
7979
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
80-
<< "\tLC/fraction/energy: " << (uint32_t)lcaf.first << "/" << lcaf.second << "/"
81-
<< lcEn << std::endl;
80+
<< "\tLC/fraction/energy: " << (uint32_t)lcaf.first << "/" << lcaf.second << "/" << lcEn << std::endl;
8281
tot_energy += lcEn;
8382
}
8483
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "\tTot Sum lcaf: " << tot_energy << std::endl;
@@ -128,8 +127,8 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
128127
stsInTrackster[tsId].emplace_back(st.clusterId, 0.f);
129128
}
130129
}
131-
} // End loop over LayerClusters in Trackster
132-
} // End of loop over Tracksters
130+
} // End loop over LayerClusters in Trackster
131+
} // End of loop over Tracksters
133132

134133
#ifdef EDM_ML_DEBUG
135134
for (unsigned int tsId = 0; tsId < nTracksters; ++tsId) {
@@ -255,8 +254,7 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
255254
for (auto const& lcaf : tssInSimTrackster[st].lcs_and_fractions) {
256255
const auto lcEn = lcaf.second * layerClusters[lcaf.first].energy();
257256
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
258-
<< "\tLC/fraction/energy: " << (uint32_t)lcaf.first << "/" << lcaf.second << "/"
259-
<< lcEn << std::endl;
257+
<< "\tLC/fraction/energy: " << (uint32_t)lcaf.first << "/" << lcaf.second << "/" << lcEn << std::endl;
260258
tot_energy += lcEn;
261259
}
262260
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "\tTot Sum lcaf: " << tot_energy << std::endl;
@@ -325,7 +323,7 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
325323
if (lcWithST) {
326324
const auto findLCIt = std::find(lcToSimTracksterId_Map[lcId].begin(),
327325
lcToSimTracksterId_Map[lcId].end(),
328-
hgcal::lcInfoInTrackster{stPair.first, 0.f});
326+
hgcal::lcInfoInTrackster{stPair.first, 0.f});
329327
if (findLCIt != lcToSimTracksterId_Map[lcId].end()) {
330328
stFraction = findLCIt->fraction;
331329
}
@@ -334,19 +332,17 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
334332
(lcFractionInTs - stFraction) * (lcFractionInTs - stFraction) * lcEnergyWeight * invTracksterEnergyWeight;
335333
#ifdef EDM_ML_DEBUG
336334
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
337-
<< "lcId:\t" << (uint32_t)lcId << "\ttracksterId:\t" << tsId
338-
<< "\ttsFraction,stFraction:\t" << lcFractionInTs << ", " << stFraction
339-
<< "\tlcEnergyWeight:\t" << lcEnergyWeight
340-
<< "\tcurrent score:\t" << stPair.second
341-
<< "\tinvTracksterEnergyWeight:\t" << invTracksterEnergyWeight << "\n";
335+
<< "lcId:\t" << (uint32_t)lcId << "\ttracksterId:\t" << tsId << "\ttsFraction,stFraction:\t"
336+
<< lcFractionInTs << ", " << stFraction << "\tlcEnergyWeight:\t" << lcEnergyWeight << "\tcurrent score:\t"
337+
<< stPair.second << "\tinvTracksterEnergyWeight:\t" << invTracksterEnergyWeight << "\n";
342338
#endif
343339
}
344-
} // End of loop over LayerClusters in Trackster
340+
} // End of loop over LayerClusters in Trackster
345341

346342
#ifdef EDM_ML_DEBUG
347343
if (stsInTrackster[tsId].empty())
348344
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "trackster Id:\t" << tsId << "\tST id:\t-1"
349-
<< "\tscore\t-1\n";
345+
<< "\tscore\t-1\n";
350346
#endif
351347
} // End of loop over Tracksters
352348

@@ -420,7 +416,7 @@ hgcal::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
420416
#ifdef EDM_ML_DEBUG
421417
if (tssInSimTrackster[stId].tracksterIdToEnergyAndScore.empty())
422418
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "ST Id:\t" << stId << "\tTS id:\t-1 "
423-
<< "\tscore\t-1\n";
419+
<< "\tscore\t-1\n";
424420

425421
for (const auto& tsPair : tssInSimTrackster[stId].tracksterIdToEnergyAndScore) {
426422
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
@@ -443,8 +439,8 @@ hgcal::RecoToSimCollectionSimTracksters TSToSimTSAssociatorByEnergyScoreImpl::as
443439
const auto& stsInTrackster = std::get<0>(links);
444440
for (size_t tsId = 0; tsId < stsInTrackster.size(); ++tsId) {
445441
for (auto& stPair : stsInTrackster[tsId]) {
446-
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
447-
<< "Trackster Id:\t" << tsId << "\tSimTrackster id:\t" << stPair.first << "\tscore:\t" << stPair.second << "\n";
442+
LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "Trackster Id:\t" << tsId << "\tSimTrackster id:\t"
443+
<< stPair.first << "\tscore:\t" << stPair.second << "\n";
448444
// Fill AssociationMap
449445
returnValue.insert(edm::Ref<ticl::TracksterCollection>(tCH, tsId), // Ref to TS
450446
std::make_pair(edm::Ref<ticl::TracksterCollection>(sTCH, stPair.first),
@@ -465,7 +461,7 @@ hgcal::SimToRecoCollectionSimTracksters TSToSimTSAssociatorByEnergyScoreImpl::as
465461
for (size_t stId = 0; stId < tssInSimTrackster.size(); ++stId) {
466462
for (auto& tsPair : tssInSimTrackster[stId].tracksterIdToEnergyAndScore) {
467463
returnValue.insert(
468-
edm::Ref<ticl::TracksterCollection>(sTCH, stId), // Ref to ST
464+
edm::Ref<ticl::TracksterCollection>(sTCH, stId), // Ref to ST
469465
std::make_pair(edm::Ref<ticl::TracksterCollection>(tCH, tsPair.first), // Pair <Ref to TS,
470466
std::make_pair(tsPair.second.first, tsPair.second.second)) // pair <energy, score> >
471467
);

‎SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSimTSAssociatorByEnergyScoreImpl.h‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ class TSToSimTSAssociatorByEnergyScoreImpl : public hgcal::TracksterToSimTrackst
4444
std::shared_ptr<hgcal::RecHitTools>,
4545
const std::unordered_map<DetId, const HGCRecHit *> *);
4646

47-
hgcal::RecoToSimCollectionSimTracksters associateRecoToSim(const edm::Handle<ticl::TracksterCollection> &tCH,
48-
const edm::Handle<reco::CaloClusterCollection> &lCCH,
49-
const edm::Handle<ticl::TracksterCollection> &sTCH) const override;
47+
hgcal::RecoToSimCollectionSimTracksters associateRecoToSim(
48+
const edm::Handle<ticl::TracksterCollection> &tCH,
49+
const edm::Handle<reco::CaloClusterCollection> &lCCH,
50+
const edm::Handle<ticl::TracksterCollection> &sTCH) const override;
5051

51-
hgcal::SimToRecoCollectionSimTracksters associateSimToReco(const edm::Handle<ticl::TracksterCollection> &tCH,
52-
const edm::Handle<reco::CaloClusterCollection> &lCCH,
53-
const edm::Handle<ticl::TracksterCollection> &sTCH) const override;
52+
hgcal::SimToRecoCollectionSimTracksters associateSimToReco(
53+
const edm::Handle<ticl::TracksterCollection> &tCH,
54+
const edm::Handle<reco::CaloClusterCollection> &lCCH,
55+
const edm::Handle<ticl::TracksterCollection> &sTCH) const override;
5456

5557
private:
5658
const bool hardScatterOnly_;

‎SimDataFormats/Associations/interface/TracksterToSimTracksterAssociator.h‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,26 @@ namespace hgcal {
2323

2424
// ---------- const member functions ---------------------
2525
/// Associate a Trackster to SimClusters
26-
hgcal::RecoToSimCollectionSimTracksters associateRecoToSim(const edm::Handle<ticl::TracksterCollection> &tCH,
27-
const edm::Handle<reco::CaloClusterCollection> &lCCH,
28-
const edm::Handle<ticl::TracksterCollection> &sTCH) const {
26+
hgcal::RecoToSimCollectionSimTracksters associateRecoToSim(
27+
const edm::Handle<ticl::TracksterCollection> &tCH,
28+
const edm::Handle<reco::CaloClusterCollection> &lCCH,
29+
const edm::Handle<ticl::TracksterCollection> &sTCH) const {
2930
return m_impl->associateRecoToSim(tCH, lCCH, sTCH);
3031
};
3132

3233
/// Associate a SimCluster to Tracksters
33-
hgcal::SimToRecoCollectionSimTracksters associateSimToReco(const edm::Handle<ticl::TracksterCollection> &tCH,
34-
const edm::Handle<reco::CaloClusterCollection> &lCCH,
35-
const edm::Handle<ticl::TracksterCollection> &sTCH) const {
34+
hgcal::SimToRecoCollectionSimTracksters associateSimToReco(
35+
const edm::Handle<ticl::TracksterCollection> &tCH,
36+
const edm::Handle<reco::CaloClusterCollection> &lCCH,
37+
const edm::Handle<ticl::TracksterCollection> &sTCH) const {
3638
return m_impl->associateSimToReco(tCH, lCCH, sTCH);
3739
}
3840

3941
private:
4042
TracksterToSimTracksterAssociator(const TracksterToSimTracksterAssociator &) = delete; // stop default
4143

42-
const TracksterToSimTracksterAssociator &operator=(const TracksterToSimTracksterAssociator &) = delete; // stop default
44+
const TracksterToSimTracksterAssociator &operator=(const TracksterToSimTracksterAssociator &) =
45+
delete; // stop default
4346

4447
// ---------- member data --------------------------------
4548
std::unique_ptr<TracksterToSimTracksterAssociatorBaseImpl> m_impl;

‎SimDataFormats/Associations/interface/TracksterToSimTracksterAssociatorBaseImpl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ namespace hgcal {
2222
typedef edm::AssociationMap<
2323
edm::OneToManyWithQualityGeneric<ticl::TracksterCollection, ticl::TracksterCollection, std::pair<float, float>>>
2424
SimToRecoCollectionSimTracksters;
25-
typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric<ticl::TracksterCollection, ticl::TracksterCollection, float>>
25+
typedef edm::AssociationMap<
26+
edm::OneToManyWithQualityGeneric<ticl::TracksterCollection, ticl::TracksterCollection, float>>
2627
RecoToSimCollectionSimTracksters;
2728

2829
class TracksterToSimTracksterAssociatorBaseImpl {

0 commit comments

Comments
 (0)