diff --git a/RecoTracker/LST/BuildFile.xml b/RecoTracker/LST/BuildFile.xml index 5495e48778569..09ddabd9727ba 100644 --- a/RecoTracker/LST/BuildFile.xml +++ b/RecoTracker/LST/BuildFile.xml @@ -1,9 +1,10 @@ - - + + + diff --git a/RecoTracker/LST/plugins/BuildFile.xml b/RecoTracker/LST/plugins/BuildFile.xml index da6bc17a3e5df..1b6e79b68e8b4 100644 --- a/RecoTracker/LST/plugins/BuildFile.xml +++ b/RecoTracker/LST/plugins/BuildFile.xml @@ -12,6 +12,7 @@ + @@ -24,30 +25,18 @@ - + - + - + + - - - - - - - - - - - - - diff --git a/RecoTracker/LST/plugins/alpaka/LSTModulesDevESProducer.cc b/RecoTracker/LST/plugins/alpaka/LSTModulesDevESProducer.cc index bc1f764313569..e6b3c42b7ed10 100644 --- a/RecoTracker/LST/plugins/alpaka/LSTModulesDevESProducer.cc +++ b/RecoTracker/LST/plugins/alpaka/LSTModulesDevESProducer.cc @@ -8,41 +8,43 @@ #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" // LST includes -#include -#include -#include +#include "RecoTracker/LSTCore/interface/alpaka/Module.h" +#include "RecoTracker/LSTCore/interface/alpaka/LST.h" namespace ALPAKA_ACCELERATOR_NAMESPACE { class LSTModulesDevESProducer : public ESProducer { public: - LSTModulesDevESProducer(const edm::ParameterSet &iConfig); + LSTModulesDevESProducer(const edm::ParameterSet& iConfig); - static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); std::unique_ptr> produceHost(TrackerRecoGeometryRecord const& iRecord); - std::unique_ptr> produceDevice(device::Record const& iRecord); + std::unique_ptr> produceDevice( + device::Record const& iRecord); private: edm::ESGetToken, TrackerRecoGeometryRecord> lstESHostToken_; }; - LSTModulesDevESProducer::LSTModulesDevESProducer(const edm::ParameterSet &iConfig) : ESProducer(iConfig) { + LSTModulesDevESProducer::LSTModulesDevESProducer(const edm::ParameterSet& iConfig) : ESProducer(iConfig) { setWhatProduced(this, &LSTModulesDevESProducer::produceHost); auto cc = setWhatProduced(this, &LSTModulesDevESProducer::produceDevice); lstESHostToken_ = cc.consumes(); } - void LSTModulesDevESProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { + void LSTModulesDevESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; descriptions.addWithDefaultLabel(desc); } - std::unique_ptr> LSTModulesDevESProducer::produceHost(TrackerRecoGeometryRecord const& iRecord) { + std::unique_ptr> LSTModulesDevESProducer::produceHost( + TrackerRecoGeometryRecord const& iRecord) { return SDL::loadAndFillESHost(); } - std::unique_ptr> LSTModulesDevESProducer::produceDevice(device::Record const& iRecord) { + std::unique_ptr> LSTModulesDevESProducer::produceDevice( + device::Record const& iRecord) { auto const& lstESHostData = iRecord.get(lstESHostToken_); SDL::QueueAcc& queue = iRecord.queue(); return SDL::loadAndFillESDevice(queue, &lstESHostData); diff --git a/RecoTracker/LST/plugins/alpaka/LSTProducer.cc b/RecoTracker/LST/plugins/alpaka/LSTProducer.cc index 811a78cbb3431..4aca0528539ef 100644 --- a/RecoTracker/LST/plugins/alpaka/LSTProducer.cc +++ b/RecoTracker/LST/plugins/alpaka/LSTProducer.cc @@ -19,7 +19,7 @@ #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" -#include +#include "RecoTracker/LSTCore/interface/alpaka/LST.h" namespace ALPAKA_ACCELERATOR_NAMESPACE { diff --git a/RecoTracker/LST/src/alpaka/ES_ModulesDev.cc b/RecoTracker/LST/src/alpaka/ES_ModulesDev.cc index 981c3f45346b0..9c66dda420db0 100644 --- a/RecoTracker/LST/src/alpaka/ES_ModulesDev.cc +++ b/RecoTracker/LST/src/alpaka/ES_ModulesDev.cc @@ -1,4 +1,4 @@ -#include +#include "RecoTracker/LSTCore/interface/alpaka/LST.h" #include "HeterogeneousCore/AlpakaCore/interface/alpaka/typelookup.h" // Temporary hack: The DevHost instantiation is needed in both CPU and GPU plugins, @@ -7,4 +7,4 @@ TYPELOOKUP_DATA_REG(SDL::LSTESHostData); TYPELOOKUP_DATA_REG(SDL::LSTESDeviceData); TYPELOOKUP_DATA_REG(ALPAKA_ACCELERATOR_NAMESPACE::ESDeviceProduct>>); TYPELOOKUP_ALPAKA_TEMPLATED_DATA_REG(SDL::LSTESHostData); -TYPELOOKUP_ALPAKA_TEMPLATED_DATA_REG(SDL::LSTESDeviceData); \ No newline at end of file +TYPELOOKUP_ALPAKA_TEMPLATED_DATA_REG(SDL::LSTESDeviceData); diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/endcap_orientation.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/endcap_orientation.bin deleted file mode 100644 index fa7d3dda3f8a3..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/endcap_orientation.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/module_connection_tracing_merged.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/module_connection_tracing_merged.bin deleted file mode 100644 index 6ed959eef6245..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/module_connection_tracing_merged.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet4.bin deleted file mode 100644 index 7a0237fac6aee..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet5.bin deleted file mode 100644 index f85bcc9766d90..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet4.bin deleted file mode 100644 index f225832c06ae7..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet5.bin deleted file mode 100644 index 4478f2e825c34..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet4.bin deleted file mode 100644 index 667c5c35afcb3..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet5.bin deleted file mode 100644 index 369b929a75a18..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet4.bin deleted file mode 100644 index b2ebf3153b629..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet5.bin deleted file mode 100644 index 91bd62cabd0e0..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_neg_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet4.bin deleted file mode 100644 index e49cd7a73910b..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet5.bin deleted file mode 100644 index fd2ada3bf82b0..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet4.bin deleted file mode 100644 index 077791f356c67..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet5.bin deleted file mode 100644 index 01cfa1fe7f47f..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/pixelmap/pLS_map_pos_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/sensor_centroids.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/sensor_centroids.bin deleted file mode 100644 index 64b1dd0c32e76..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/sensor_centroids.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/tilted_barrel_orientation.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/tilted_barrel_orientation.bin deleted file mode 100644 index c8428fe5fac45..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.6/tilted_barrel_orientation.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/endcap_orientation.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/endcap_orientation.bin deleted file mode 100644 index fa7d3dda3f8a3..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/endcap_orientation.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin deleted file mode 100644 index a6c34be8f5b14..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet4.bin deleted file mode 100644 index b988505a0db92..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet5.bin deleted file mode 100644 index 03b4fbb32edd4..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet4.bin deleted file mode 100644 index d4ea388853c4a..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet5.bin deleted file mode 100644 index 26bc908eb92aa..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet4.bin deleted file mode 100644 index 256a0be180658..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet5.bin deleted file mode 100644 index 549ab860c6682..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet4.bin deleted file mode 100644 index b547a8e1de18d..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet5.bin deleted file mode 100644 index be3256a37280e..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_neg_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet4.bin deleted file mode 100644 index 775ad282dee4c..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet5.bin deleted file mode 100644 index 6c2f2f7c99646..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer1_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet4.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet4.bin deleted file mode 100644 index 1ca0d5c1476b9..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet4.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet5.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet5.bin deleted file mode 100644 index 8d467a7e9e294..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/pixelmap/pLS_map_pos_layer2_subdet5.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/sensor_centroids.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/sensor_centroids.bin deleted file mode 100644 index 64b1dd0c32e76..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/sensor_centroids.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin b/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin deleted file mode 100644 index c8428fe5fac45..0000000000000 Binary files a/RecoTracker/LSTCore/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin and /dev/null differ diff --git a/RecoTracker/LSTCore/data/README.md b/RecoTracker/LSTCore/data/README.md deleted file mode 100644 index e9bddce768472..0000000000000 --- a/RecoTracker/LSTCore/data/README.md +++ /dev/null @@ -1,5 +0,0 @@ -This folder contains the geometry and module map inputs required by the main LST algorithm. These files are generated from the [LSTGeometry](https://github.com/SegmentLinking/LSTGeometry) repository and are organized by their outer tracker (OT) and inner tracker (IT) version as well as the pT cut used to generate the module map and pixel map. - -## Current Geometry Versions - -- OT800_IT615 : [Tracker Version OT800_IT615](https://cms-tklayout.web.cern.ch/cms-tklayout/layouts-work/recent-layouts/OT800_IT615/info.html) \ No newline at end of file