Skip to content

Commit

Permalink
code-checks and code-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@osschar
osschar committed Oct 26, 2022
1 parent 406d7ee commit 3b3802d
Show file tree
Hide file tree
Showing 14 changed files with 123 additions and 113 deletions.
13 changes: 9 additions & 4 deletions RecoTracker/MkFit/plugins/MkFitGeometryESProducer.cc
View file
Expand Up @@ -227,8 +227,10 @@ void MkFitGeometryESProducer::fillShapeAndPlacement(const GeomDet *det,
trackerTopo_->side(detid) == static_cast<unsigned>(TrackerDetSide::PosEndcap));
#ifdef DUMP_MKF_GEO
printf(" subdet=%d layer=%d side=%d is_stereo=%d --> mkflayer=%d\n",
detid.subdetId(), trackerTopo_->layer(detid),
trackerTopo_->side(detid), trackerTopo_->isStereo(detid),
detid.subdetId(),
trackerTopo_->layer(detid),
trackerTopo_->side(detid),
trackerTopo_->isStereo(detid),
lay);
#endif

Expand Down Expand Up @@ -425,8 +427,11 @@ std::unique_ptr<MkFitGeometry> MkFitGeometryESProducer::produce(const TrackerRec
printf("Total number of modules %u, 14-bits fit up to %u modules\n", n_mod, 1u << 13);
#endif

return std::make_unique<MkFitGeometry>(
iRecord.get(geomToken_), iRecord.get(trackerToken_), iRecord.get(ttopoToken_), std::move(trackerInfo), layerNrConv_);
return std::make_unique<MkFitGeometry>(iRecord.get(geomToken_),
iRecord.get(trackerToken_),
iRecord.get(ttopoToken_),
std::move(trackerInfo),
layerNrConv_);
}

DEFINE_FWK_EVENTSETUP_MODULE(MkFitGeometryESProducer);
30 changes: 20 additions & 10 deletions RecoTracker/MkFitCMS/interface/LayerNumberConverter.h
View file
Expand Up @@ -8,23 +8,27 @@ namespace mkfit {
class LayerNumberConverter {
public:
LayerNumberConverter(TkLayout layout) : lo_(layout) {}
void reset(TkLayout layout) { lo_= layout; }
void reset(TkLayout layout) { lo_ = layout; }
unsigned int nLayers() const {
if (lo_ == TkLayout::phase0)
return 69;
if (lo_ == TkLayout::phase1)
return 72;
if (lo_ == TkLayout::phase2)
return 60; // 4 + 12 + 2*(12 + 10) = 16 + 22 + 22 = 60
return 60; // 4 + 12 + 2*(12 + 10) = 16 + 22 + 22 = 60
return 10;
}
TkLayout getEra() const { return lo_; }
int convertLayerNumber(int det, int lay, bool useMatched, int isStereo, bool posZ) const {
if (lo_ == TkLayout::phase2) {
if (det == 1) return lay - 1;
if (det == 2) return 16 + lay - 1 + (posZ ? 0 : 22);
if (det == 5) return 4 + (2 * (lay - 1)) + isStereo;
if (det == 4) return 16 + 12 + (2 * (lay - 1)) + isStereo + (posZ ? 0 : 22);
if (det == 1)
return lay - 1;
if (det == 2)
return 16 + lay - 1 + (posZ ? 0 : 22);
if (det == 5)
return 4 + (2 * (lay - 1)) + isStereo;
if (det == 4)
return 16 + 12 + (2 * (lay - 1)) + isStereo + (posZ ? 0 : 22);
throw std::runtime_error("bad subDet");
}

Expand All @@ -47,12 +51,18 @@ namespace mkfit {
}
bool doesHaveStereo(int det, int lay) const {
if (lo_ == TkLayout::phase2) {
if (det == 1 || det == 2) return false;
if (det == 4 || det == 5) return true;
if (det == 1 || det == 2)
return false;
if (det == 4 || det == 5)
return true;
throw std::runtime_error("bad subDet");
}
if (det == 3 || det == 5) { return lay == 1 || lay == 2; }
if (det == 4 || det == 6) { return true; }
if (det == 3 || det == 5) {
return lay == 1 || lay == 2;
}
if (det == 4 || det == 6) {
return true;
}
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/MkFitCMS/interface/MkStdSeqs.h
View file
Expand Up @@ -36,8 +36,8 @@ namespace mkfit {

// Quality filters used directly (not through IterationConfig)

template<class TRACK>
bool qfilter_nan_n_silly(const TRACK &t, const MkJob&) {
template <class TRACK>
bool qfilter_nan_n_silly(const TRACK &t, const MkJob &) {
return !(t.hasNanNSillyValues());
}

Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/MkFitCMS/src/MkSeedPartitioners-2017.cc
View file
Expand Up @@ -347,9 +347,9 @@ namespace {

struct register_seed_partitioners {
register_seed_partitioners() {
IterationConfig::register_seed_partitioner("2017:0", partitionSeeds0);
IterationConfig::register_seed_partitioner("2017:1", partitionSeeds1);
IterationConfig::register_seed_partitioner("2017:1:debug", partitionSeeds1debug);
IterationConfig::register_seed_partitioner("2017:0", partitionSeeds0);
IterationConfig::register_seed_partitioner("2017:1", partitionSeeds1);
IterationConfig::register_seed_partitioner("2017:1:debug", partitionSeeds1debug);
}
} rsp_instance;
} // namespace
12 changes: 6 additions & 6 deletions RecoTracker/MkFitCMS/src/MkSeedPartitioners-2029.cc
View file
Expand Up @@ -7,9 +7,9 @@ namespace {
using namespace mkfit;

[[maybe_unused]] void partitionSeeds1(const TrackerInfo &trk_info,
const TrackVec &in_seeds,
const EventOfHits &eoh,
IterationSeedPartition &part) {
const TrackVec &in_seeds,
const EventOfHits &eoh,
IterationSeedPartition &part) {
// Seeds are placed into eta regions and sorted on region + eta.

// Merge mono and stereo limits for relevant layers / parameters.
Expand Down Expand Up @@ -243,8 +243,8 @@ namespace {

struct register_seed_partitioners {
register_seed_partitioners() {
IterationConfig::register_seed_partitioner("2029:1", partitionSeeds1);
IterationConfig::register_seed_partitioner("2029:1:debug", partitionSeeds1debug);
IterationConfig::register_seed_partitioner("2029:1", partitionSeeds1);
IterationConfig::register_seed_partitioner("2029:1:debug", partitionSeeds1debug);
}
} rsp_instance;
} // namespace
} // namespace
33 changes: 15 additions & 18 deletions RecoTracker/MkFitCMS/src/MkStdSeqs.cc
View file
Expand Up @@ -338,11 +338,9 @@ namespace mkfit {

namespace {
struct register_seed_cleaners {
register_seed_cleaners() {
IterationConfig::register_seed_cleaner("2017:default", clean_cms_seedtracks_iter);
}
register_seed_cleaners() { IterationConfig::register_seed_cleaner("2017:default", clean_cms_seedtracks_iter); }
} rsc_instance;
}
} // namespace

//=========================================================================
// Duplicate cleaning
Expand Down Expand Up @@ -599,14 +597,13 @@ namespace mkfit {
namespace {
struct register_duplicate_cleaners {
register_duplicate_cleaners() {
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates", clean_duplicates);
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates_sharedhits",
clean_duplicates_sharedhits);
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates_sharedhits_pixelseed",
clean_duplicates_sharedhits_pixelseed);
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates", clean_duplicates);
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates_sharedhits", clean_duplicates_sharedhits);
IterationConfig::register_duplicate_cleaner("2017:clean_duplicates_sharedhits_pixelseed",
clean_duplicates_sharedhits_pixelseed);
}
} rdc_instance;
}
} // namespace

//=========================================================================
// Quality filters
Expand All @@ -623,7 +620,7 @@ namespace mkfit {

// simple hit-count quality filter; used with pixel-based seeds
template <class TRACK>
bool qfilter_n_hits_pixseed(const TRACK &t, const MkJob& j) {
bool qfilter_n_hits_pixseed(const TRACK &t, const MkJob &j) {
return t.nFoundHits() >= j.params_cur().minHitsQF;
}

Expand Down Expand Up @@ -681,7 +678,7 @@ namespace mkfit {

/// quality filter tuned for pixelLess iteration during backward search
template <class TRACK>
bool qfilter_pixelLessBkwd(const TRACK &t, const MkJob& j) {
bool qfilter_pixelLessBkwd(const TRACK &t, const MkJob &j) {
const BeamSpot &bspot = j.m_beam_spot;
const TrackerInfo &tk_info = j.m_trk_info;
float d0BS = t.d0BeamSpot(bspot.x, bspot.y);
Expand Down Expand Up @@ -709,14 +706,14 @@ namespace mkfit {
namespace {
struct register_quality_filters {
register_quality_filters() {
IterationConfig::register_candidate_filter("2017:qfilter_n_hits", qfilter_n_hits<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_n_hits_pixseed", qfilter_n_hits_pixseed<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_n_layers", qfilter_n_layers<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_pixelLessFwd", qfilter_pixelLessFwd<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_pixelLessBkwd", qfilter_pixelLessBkwd<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_n_hits", qfilter_n_hits<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_n_hits_pixseed", qfilter_n_hits_pixseed<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_n_layers", qfilter_n_layers<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_pixelLessFwd", qfilter_pixelLessFwd<TrackCand>);
IterationConfig::register_candidate_filter("2017:qfilter_pixelLessBkwd", qfilter_pixelLessBkwd<TrackCand>);
}
} rqf_instance;
}
} // namespace

} // namespace StdSeq
} // namespace mkfit
1 change: 0 additions & 1 deletion RecoTracker/MkFitCMS/src/runFunctions.cc
View file
Expand Up @@ -65,7 +65,6 @@ namespace mkfit {
builder.filter_comb_cands(itconf.m_pre_bkfit_filter);
}


job.switch_to_backward();

if (do_backward_fit) {
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/MkFitCMS/standalone/mkFit.cc
View file
Expand Up @@ -159,7 +159,7 @@ namespace {

void init_deadvectors() {
deadvectors.resize(Config::TrkInfo.n_layers());
#include "RecoTracker/MkFitCMS/standalone/deadmodules.h"
#include "RecoTracker/MkFitCMS/standalone/deadmodules.h"
}

} // namespace
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/MkFitCore/interface/IterationConfig.h
View file
Expand Up @@ -139,7 +139,7 @@ namespace mkfit {
IterationSeedPartition &);
using partition_seeds_func = std::function<partition_seeds_cf>;
// Passed to MkBuilder::filter_comb_cands().
using filter_candidates_cf = bool(const TrackCand &, const MkJob&);
using filter_candidates_cf = bool(const TrackCand &, const MkJob &);
using filter_candidates_func = std::function<filter_candidates_cf>;
// Called directly.
using clean_duplicates_cf = void(TrackVec &, const IterationConfig &);
Expand Down Expand Up @@ -172,7 +172,6 @@ namespace mkfit {
float dc_drth_obarrel = 0.001;
float dc_drth_forward = 0.001;


// Iteration parameters (could be a ptr)
IterationParams m_params;
IterationParams m_backward_params;
Expand Down Expand Up @@ -301,7 +300,8 @@ namespace mkfit {
const IterationConfig &operator[](int i) const { return m_iterations[i]; }

void setupStandardFunctionsFromNames() {
for (auto &i : m_iterations) i.setupStandardFunctionsFromNames();
for (auto &i : m_iterations)
i.setupStandardFunctionsFromNames();
}
};

Expand Down
1 change: 0 additions & 1 deletion RecoTracker/MkFitCore/interface/MkBuilder.h
View file
Expand Up @@ -25,7 +25,6 @@ namespace mkfit {
// MkJob
//==============================================================================


//==============================================================================
// MkBuilder
//==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/MkFitCore/interface/MkJob.h
View file
Expand Up @@ -35,6 +35,6 @@ namespace mkfit {
}
};

}
} // namespace mkfit

#endif

0 comments on commit 3b3802d

Please sign in to comment.