Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

Commit

Permalink
Removed unnecessary moduleConnectionMap
Browse files Browse the repository at this point in the history
  • Loading branch information
ariostas committed May 17, 2024
1 parent e01f6b9 commit 4863476
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 1 addition & 3 deletions SDL/Event.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ namespace SDL {
const std::shared_ptr<const modulesBuffer<Dev>> modulesBuffers;
const std::shared_ptr<const pixelMap> pixelMapping;
const std::shared_ptr<const EndcapGeometry<Dev, true>> endcapGeometry;
const std::shared_ptr<const ModuleConnectionMap> moduleConnectionMap;

public:
// Constructor used for CMSSW integration. Uses an external queue.
Expand All @@ -109,8 +108,7 @@ namespace SDL {
nPixels(deviceESData->nPixels),
modulesBuffers(deviceESData->modulesBuffers),
pixelMapping(deviceESData->pixelMapping),
endcapGeometry(deviceESData->endcapGeometry),
moduleConnectionMap(deviceESData->moduleConnectionMap) {
endcapGeometry(deviceESData->endcapGeometry) {
init(verbose);
}
void resetEvent();
Expand Down
3 changes: 1 addition & 2 deletions SDL/LST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ std::unique_ptr<SDL::LSTESDeviceData<SDL::Dev>> SDL::loadAndFillESDevice(SDL::Qu
nPixels,
modulesBuffers,
endcapGeometry,
pixelMapping,
moduleConnectionMap);
pixelMapping);
}

void SDL::LST<SDL::Acc>::run(SDL::QueueAcc& queue,
Expand Down
7 changes: 2 additions & 5 deletions SDL/LST.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,19 @@ namespace SDL {
const std::shared_ptr<const modulesBuffer<Dev>> modulesBuffers;
const std::shared_ptr<const EndcapGeometry<Dev, true>> endcapGeometry;
const std::shared_ptr<const pixelMap> pixelMapping;
const std::shared_ptr<const ModuleConnectionMap> moduleConnectionMap;

LSTESDeviceData(uint16_t nModulesIn,
uint16_t nLowerModulesIn,
unsigned int nPixelsIn,
std::shared_ptr<modulesBuffer<Dev>> modulesBuffersIn,
std::shared_ptr<EndcapGeometry<Dev, true>> endcapGeometryIn,
std::shared_ptr<pixelMap> pixelMappingIn,
std::shared_ptr<const ModuleConnectionMap> moduleConnectionMapIn)
std::shared_ptr<pixelMap> pixelMappingIn)
: nModules(nModulesIn),
nLowerModules(nLowerModulesIn),
nPixels(nPixelsIn),
modulesBuffers(std::const_pointer_cast<const modulesBuffer<Dev>>(modulesBuffersIn)),
endcapGeometry(std::const_pointer_cast<const EndcapGeometry<Dev, true>>(endcapGeometryIn)),
pixelMapping(std::const_pointer_cast<const pixelMap>(pixelMappingIn)),
moduleConnectionMap(moduleConnectionMapIn) {}
pixelMapping(std::const_pointer_cast<const pixelMap>(pixelMappingIn)) {}
};

std::unique_ptr<LSTESHostData> loadAndFillESHost();
Expand Down

0 comments on commit 4863476

Please sign in to comment.