From aa350cca6dd31e23acbb2419d8d614f16694d1f3 Mon Sep 17 00:00:00 2001 From: Marco Rovere Date: Thu, 22 Oct 2020 16:11:19 +0200 Subject: [PATCH] Code format --- .../TICL/plugins/TrackstersMergeProducer.cc | 3 +- .../src/HGVHistoProducerAlgo.cc | 44 +++++++++---------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc b/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc index 27b4d2024e081..7e5f8c2528bcd 100644 --- a/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc +++ b/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc @@ -493,7 +493,8 @@ void TrackstersMergeProducer::produce(edm::Event &evt, const edm::EventSetup &es // for all general tracks (high purity, pt > 1), check if they have been used: if not, promote them as charged hadrons for (unsigned i = 0; i < tracks.size(); ++i) { auto const &track = tracks[i]; - if (track.pt() > 1.f and track.quality(reco::TrackBase::highPurity) and track.hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) < 5 and + if (track.pt() > 1.f and track.quality(reco::TrackBase::highPurity) and + track.hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) < 5 and std::abs(track.outerEta()) > 1.48 and std::abs(track.outerEta()) < 3.0 and usedSeeds[i] == false) { // emit a charged hadron TICLCandidate tmpCandidate; diff --git a/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc b/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc index 1e550625ac09d..09802deb1262d 100644 --- a/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc +++ b/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc @@ -1771,8 +1771,8 @@ void HGVHistoProducerAlgo::multiClusters_to_CaloParticles(const Histograms& hist //det id of the first hit just to make the lcLayerId variable //which maps the layers in -z: 0->51 and in +z: 52->103 const auto firstHitDetId = hits_and_fractions[0].first; - int lcLayerId = - recHitTools_->getLayerWithOffset(firstHitDetId) + layers * ((recHitTools_->zside(firstHitDetId) + 1) >> 1) - 1; + int lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId) + + layers * ((recHitTools_->zside(firstHitDetId) + 1) >> 1) - 1; //Loop though the hits of the layer cluster under study for (unsigned int hitId = 0; hitId < numberOfHitsInLC; hitId++) { @@ -1827,7 +1827,7 @@ void HGVHistoProducerAlgo::multiClusters_to_CaloParticles(const Histograms& hist //Here cPOnLayer[caloparticle][layer] describe above is set. //Here for multi clusters with matched rechit the CP fraction times hit energy is added and saved . cPOnLayer[h.clusterId][lcLayerId].layerClusterIdToEnergyAndScore[mclId].first += - shared_fraction * hit->energy(); + shared_fraction * hit->energy(); cPOnLayer[h.clusterId][lcLayerId].layerClusterIdToEnergyAndScore[mclId].second = FLT_MAX; //cpsInMultiCluster[multicluster][CPids] //Connects a multi cluster with all related caloparticles. @@ -1886,26 +1886,26 @@ void HGVHistoProducerAlgo::multiClusters_to_CaloParticles(const Histograms& hist } LogDebug("HGCalValidator") << std::setw(12) << "multiCluster" - << "\t" //LogDebug("HGCalValidator") - << std::setw(10) << "mulcl energy" - << "\t" << std::setw(5) << "nhits" - << "\t" << std::setw(12) << "noise hits" - << "\t" << std::setw(22) << "maxCPId_byNumberOfHits" - << "\t" << std::setw(8) << "nhitsCP" - << "\t" << std::setw(16) << "maxCPId_byEnergy" - << "\t" << std::setw(23) << "maxEnergySharedMCLandCP" - << "\t" << std::setw(22) << "totalCPEnergyFromAllLayerCP" - << "\t" << std::setw(22) << "energyFractionOfMCLinCP" - << "\t" << std::setw(25) << "energyFractionOfCPinMCL" - << "\t" << std::endl; + << "\t" //LogDebug("HGCalValidator") + << std::setw(10) << "mulcl energy" + << "\t" << std::setw(5) << "nhits" + << "\t" << std::setw(12) << "noise hits" + << "\t" << std::setw(22) << "maxCPId_byNumberOfHits" + << "\t" << std::setw(8) << "nhitsCP" + << "\t" << std::setw(16) << "maxCPId_byEnergy" + << "\t" << std::setw(23) << "maxEnergySharedMCLandCP" + << "\t" << std::setw(22) << "totalCPEnergyFromAllLayerCP" + << "\t" << std::setw(22) << "energyFractionOfMCLinCP" + << "\t" << std::setw(25) << "energyFractionOfCPinMCL" + << "\t" << std::endl; LogDebug("HGCalValidator") << std::setw(12) << mclId << "\t" //LogDebug("HGCalValidator") - << std::setw(10) << multiClusters[mclId].energy() << "\t" << std::setw(5) - << numberOfHitsInMCL << "\t" << std::setw(12) << numberOfNoiseHitsInMCL << "\t" - << std::setw(22) << maxCPId_byNumberOfHits << "\t" << std::setw(8) - << maxCPNumberOfHitsInMCL << "\t" << std::setw(16) << maxCPId_byEnergy << "\t" - << std::setw(23) << maxEnergySharedMCLandCP << "\t" << std::setw(22) - << totalCPEnergyFromLayerCP << "\t" << std::setw(22) << energyFractionOfMCLinCP << "\t" - << std::setw(25) << energyFractionOfCPinMCL << std::endl; + << std::setw(10) << multiClusters[mclId].energy() << "\t" << std::setw(5) + << numberOfHitsInMCL << "\t" << std::setw(12) << numberOfNoiseHitsInMCL << "\t" + << std::setw(22) << maxCPId_byNumberOfHits << "\t" << std::setw(8) + << maxCPNumberOfHitsInMCL << "\t" << std::setw(16) << maxCPId_byEnergy << "\t" + << std::setw(23) << maxEnergySharedMCLandCP << "\t" << std::setw(22) + << totalCPEnergyFromLayerCP << "\t" << std::setw(22) << energyFractionOfMCLinCP << "\t" + << std::setw(25) << energyFractionOfCPinMCL << std::endl; } //end of loop through multi clusters }