Skip to content

Commit

Permalink
minor cleaning and commenting
Browse files Browse the repository at this point in the history
  • Loading branch information
bfontana committed Aug 28, 2020
1 parent 02cfe14 commit 5fd7b6e
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 103 deletions.
11 changes: 0 additions & 11 deletions UserCode/CodeGPU/plugins/HGCalRecHitKernelImpl.cc
View file

This file was deleted.

59 changes: 0 additions & 59 deletions UserCode/CodeGPU/plugins/HGCalRecHitKernelImpl.h
View file

This file was deleted.

10 changes: 1 addition & 9 deletions UserCode/CodeGPU/plugins/HeterogeneousHGCalEERecHitProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
HeterogeneousHGCalEERecHitProducer::HeterogeneousHGCalEERecHitProducer(const edm::ParameterSet& ps):
token_(consumes<HGCUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("HGCEEUncalibRecHitsTok")))
{
histo1_ = fs->make<TH1F>( "energy" , "E", 100, 0., 10. );
histo2_ = fs->make<TH1F>( "time" , "t", 100, 0., 10. );
histo3_ = fs->make<TH1F>( "timeError" , "time_error", 100, 0., 10. );
histo4_ = fs->make<TH1I>( "son" , "son", 100, 0., 10. );

nhitsmax_ = ps.getParameter<uint32_t>("nhitsmax");
cdata_.hgcEE_keV2DIGI_ = ps.getParameter<double>("HGCEE_keV2DIGI");
cdata_.xmin_ = ps.getParameter<double>("minValSiPar"); //float
Expand Down Expand Up @@ -65,17 +60,14 @@ void HeterogeneousHGCalEERecHitProducer::acquire(edm::Event const& event, edm::E
const auto &hits_ee = *handle_ee_;

unsigned int nhits = hits_ee.size();
std::cout << "EE hits: " << nhits << std::endl;
convert_collection_data_to_soa_(hits_ee, old_soa_, nhits);

kmdata_ = new KernelModifiableData<HGCUncalibratedRecHitSoA, HGCRecHitSoA>(nhitsmax_, stride_, old_soa_, d_oldhits_, d_newhits_, d_newhits_final_, h_newhits_);
KernelManagerHGCalRecHit kernel_manager(kmdata_);
kernel_manager.run_kernels(h_kcdata_, d_kcdata_);
new_soa_ = kernel_manager.get_output();

//print_to_histograms(kmdata_->h_out, histo1_, histo2_, histo3_, histo4_, nhits);

rechits_ = std::make_unique< HGCRecHitCollection >();
rechits_ = std::make_unique<HGCRecHitCollection>();
convert_soa_data_to_collection_(*rechits_, new_soa_, nhits);
}

Expand Down
2 changes: 1 addition & 1 deletion UserCode/CodeGPU/plugins/HeterogeneousHGCalEERecHitProducer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include "HeterogeneousHGCalProducerMemoryWrapper.h"
#include "KernelManager.h"

#include "Utils.h"

class HeterogeneousHGCalEERecHitProducer: public edm::stream::EDProducer<edm::ExternalWork>
{
Expand Down
11 changes: 1 addition & 10 deletions UserCode/CodeGPU/plugins/HeterogeneousHGCalHEBRecHitProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
HeterogeneousHGCalHEBRecHitProducer::HeterogeneousHGCalHEBRecHitProducer(const edm::ParameterSet& ps):
token_(consumes<HGCUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("HGCHEBUncalibRecHitsTok")))
{
histo1_ = fs->make<TH1F>( "energy" , "E", 100, 0., 10. );
histo2_ = fs->make<TH1F>( "time" , "t", 100, 0., 10. );
histo3_ = fs->make<TH1F>( "timeError" , "time_error", 100, 0., 10. );
histo4_ = fs->make<TH1I>( "son" , "son", 100, 0., 10. );

nhitsmax_ = ps.getParameter<uint32_t>("nhitsmax");
cdata_.hgcHEB_keV2DIGI_ = ps.getParameter<double>("HGCHEB_keV2DIGI");
cdata_.hgcHEB_noise_MIP_ = ps.getParameter<edm::ParameterSet>("HGCHEB_noise_MIP").getParameter<double>("noise_MIP");
Expand Down Expand Up @@ -48,23 +43,19 @@ HeterogeneousHGCalHEBRecHitProducer::~HeterogeneousHGCalHEBRecHitProducer()

void HeterogeneousHGCalHEBRecHitProducer::acquire(edm::Event const& event, edm::EventSetup const& setup, edm::WaitingTaskWithArenaHolder w) {
const cms::cuda::ScopedContextAcquire ctx{event.streamID(), std::move(w), ctxState_};

set_geometry_(setup);
event.getByToken(token_, handle_heb_);
const auto &hits_heb = *handle_heb_;

unsigned int nhits = hits_heb.size();
std::cout << "HEB hits: " << nhits << std::endl;
convert_collection_data_to_soa_(hits_heb, old_soa_, nhits);

kmdata_ = new KernelModifiableData<HGCUncalibratedRecHitSoA, HGCRecHitSoA>(nhitsmax_, stride_, old_soa_, d_oldhits_, d_newhits_, d_newhits_final_, h_newhits_);
KernelManagerHGCalRecHit kernel_manager(kmdata_);
kernel_manager.run_kernels(h_kcdata_, d_kcdata_);
new_soa_ = kernel_manager.get_output();

//print_to_histograms(kmdata_->h_out, histo1_, histo2_, histo3_, histo4_, nhits);

rechits_ = std::make_unique< HGCRecHitCollection >();
rechits_ = std::make_unique<HGCRecHitCollection>();
convert_soa_data_to_collection_(*rechits_, new_soa_, nhits);
}

Expand Down
2 changes: 1 addition & 1 deletion UserCode/CodeGPU/plugins/HeterogeneousHGCalHEBRecHitProducer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include "HeterogeneousHGCalProducerMemoryWrapper.h"
#include "KernelManager.h"

#include "Utils.h"

class HeterogeneousHGCalHEBRecHitProducer: public edm::stream::EDProducer<edm::ExternalWork>
{
Expand Down
13 changes: 2 additions & 11 deletions UserCode/CodeGPU/plugins/HeterogeneousHGCalHEFRecHitProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
HeterogeneousHGCalHEFRecHitProducer::HeterogeneousHGCalHEFRecHitProducer(const edm::ParameterSet& ps):
token_(consumes<HGCUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("HGCHEFUncalibRecHitsTok")))
{
//histogram drawing for debugging: to be removed at a later stage
histo1_ = fs->make<TH1F>( "energy" , "E", 100, 0., .2 );
histo2_ = fs->make<TH1F>( "time" , "t", 100, 0., 10. );
histo3_ = fs->make<TH1F>( "timeError" , "time_error", 100, 0., 10. );
histo4_ = fs->make<TH1I>( "son" , "son", 32, 0., 31. );

nhitsmax_ = ps.getParameter<uint32_t>("nhitsmax");
cdata_.hgcHEF_keV2DIGI_ = ps.getParameter<double>("HGCHEF_keV2DIGI");
cdata_.xmin_ = ps.getParameter<double>("minValSiPar"); //float
Expand Down Expand Up @@ -67,17 +61,14 @@ void HeterogeneousHGCalHEFRecHitProducer::acquire(edm::Event const& event, edm::
const auto &hits_hef = *handle_hef_;

unsigned int nhits = hits_hef.size();
std::cout << "HEF hits: " << nhits << std::endl;
convert_collection_data_to_soa_(hits_hef, old_soa_, nhits);

kmdata_ = new KernelModifiableData<HGCUncalibratedRecHitSoA, HGCRecHitSoA>(nhitsmax_, stride_, old_soa_, d_oldhits_, d_newhits_, d_newhits_final_, h_newhits_);
KernelManagerHGCalRecHit kernel_manager(kmdata_);
kernel_manager.run_kernels(h_kcdata_, d_kcdata_);
new_soa_ = kernel_manager.get_output();

//print_to_histograms(kmdata_->h_out, histo1_, histo2_, histo3_, histo4_, nhits);

rechits_ = std::make_unique< HGCRecHitCollection >();

rechits_ = std::make_unique<HGCRecHitCollection>();
convert_soa_data_to_collection_(*rechits_, new_soa_, nhits);
}

Expand Down
2 changes: 1 addition & 1 deletion UserCode/CodeGPU/plugins/HeterogeneousHGCalHEFRecHitProducer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include "HeterogeneousHGCalProducerMemoryWrapper.h"
#include "KernelManager.h"

#include "Utils.h"

class HeterogeneousHGCalHEFRecHitProducer: public edm::stream::EDProducer<edm::ExternalWork>
{
Expand Down

0 comments on commit 5fd7b6e

Please sign in to comment.