Skip to content

Commit

Permalink
Modify ESProducer to work with CMSSW_13_3_X and fix test config
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsamudio
jsamudio committed Oct 24, 2023
1 parent 2947acf commit d0f321b
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 592 deletions.
201 changes: 101 additions & 100 deletions RecoParticleFlow/PFClusterProducerAlpaka/plugins/alpaka/PFClusterParamsESProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,106 +17,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
class PFClusterParamsESProducer : public ESProducer {
public:
PFClusterParamsESProducer(edm::ParameterSet const& iConfig) : ESProducer(iConfig), paramSet(iConfig) {
setWhatProduced(this);
}

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription psetDesc;
psetDesc.add<std::string>("appendToDataLabel", "");
{
auto const psetName = "seedFinder";
edm::ParameterSetDescription foo;
foo.add<int>("nNeighbours", 4);
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("seedingThreshold", {});
validator.add<double>("seedingThresholdPt", 0.);
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("seedingThreshold", {0.125, 0.25, 0.35, 0.35});
vDefaults[0].addParameter<double>("seedingThresholdPt", 0.);
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("seedingThreshold",
{0.1375, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275});
vDefaults[1].addParameter<double>("seedingThresholdPt", 0.);
foo.addVPSet("thresholdsByDetector", validator, vDefaults);
}
psetDesc.add(psetName, foo);
}
{
auto const psetName = "initialClusteringStep";
edm::ParameterSetDescription foo;
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("gatheringThreshold", {});
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("gatheringThreshold", {0.1, 0.2, 0.3, 0.3});
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("gatheringThreshold", {0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2});
foo.addVPSet("thresholdsByDetector", validator, vDefaults);
}
psetDesc.add(psetName, foo);
}
{
auto const psetName = "pfClusterBuilder";
edm::ParameterSetDescription foo;
foo.add<unsigned int>("maxIterations", 50);
foo.add<double>("minFracTot", 1e-20);
foo.add<double>("minFractionToKeep", 1e-7);
foo.add<bool>("excludeOtherSeeds", true);
foo.add<double>("showerSigma", 10.);
foo.add<double>("stoppingTolerance", 1e-8);
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("recHitEnergyNorm", {});
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("recHitEnergyNorm", {0.1, 0.2, 0.3, 0.3});
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("recHitEnergyNorm", {0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2});
foo.addVPSet("recHitEnergyNorms", validator, vDefaults);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("minFractionInCalc", 1e-9);
bar.add<double>("minAllowedNormalization", 1e-9);
foo.add("positionCalc", bar);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("corrTermLowE", 0.);
bar.add<double>("threshLowE", 6.);
bar.add<double>("noiseTerm", 21.86);
bar.add<double>("constantTermLowE", 4.24);
bar.add<double>("noiseTermLowE", 8.);
bar.add<double>("threshHighE", 15.);
bar.add<double>("constantTerm", 2.82);
foo.add("timeResolutionCalcBarrel", bar);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("corrTermLowE", 0.);
bar.add<double>("threshLowE", 6.);
bar.add<double>("noiseTerm", 21.86);
bar.add<double>("constantTermLowE", 4.24);
bar.add<double>("noiseTermLowE", 8.);
bar.add<double>("threshHighE", 15.);
bar.add<double>("constantTerm", 2.82);
foo.add("timeResolutionCalcEndcap", bar);
}
psetDesc.add(psetName, foo);
}

psetDesc.setAllowAnything();
descriptions.addWithDefaultLabel(psetDesc);
}

std::unique_ptr<PFClusterParamsAlpakaESDataHost> produce(PFClusterParamsAlpakaESRecord const& iRecord) {
auto product = std::make_unique<PFClusterParamsAlpakaESDataHost>(7, cms::alpakatools::host());
product = std::make_shared<PFClusterParamsAlpakaESDataHost>(7, cms::alpakatools::host());
constexpr static uint32_t kMaxDepth_barrel = 4;
constexpr static uint32_t kMaxDepth_endcap = 7;
auto view = product->view();
Expand Down Expand Up @@ -240,8 +142,107 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
view.endcapTimeResConsts_constantTerm2() = std::pow(endcapTimeResConf.getParameter<double>("constantTerm"), 2.);
view.endcapTimeResConsts_resHighE2() =
std::pow(view.endcapTimeResConsts_noiseTerm() / view.endcapTimeResConsts_threshHighE(), 2.) +
view.endcapTimeResConsts_constantTerm2();
view.endcapTimeResConsts_constantTerm2();

setWhatProduced(this);
}

std::shared_ptr<PFClusterParamsAlpakaESDataHost> product;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription psetDesc;
{
auto const psetName = "seedFinder";
edm::ParameterSetDescription foo;
foo.add<int>("nNeighbours", 4);
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("seedingThreshold", {});
validator.add<double>("seedingThresholdPt", 0.);
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("seedingThreshold", {0.125, 0.25, 0.35, 0.35});
vDefaults[0].addParameter<double>("seedingThresholdPt", 0.);
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("seedingThreshold",
{0.1375, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275});
vDefaults[1].addParameter<double>("seedingThresholdPt", 0.);
foo.addVPSet("thresholdsByDetector", validator, vDefaults);
}
psetDesc.add(psetName, foo);
}
{
auto const psetName = "initialClusteringStep";
edm::ParameterSetDescription foo;
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("gatheringThreshold", {});
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("gatheringThreshold", {0.1, 0.2, 0.3, 0.3});
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("gatheringThreshold", {0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2});
foo.addVPSet("thresholdsByDetector", validator, vDefaults);
}
psetDesc.add(psetName, foo);
}
{
auto const psetName = "pfClusterBuilder";
edm::ParameterSetDescription foo;
foo.add<unsigned int>("maxIterations", 50);
foo.add<double>("minFracTot", 1e-20);
foo.add<double>("minFractionToKeep", 1e-7);
foo.add<bool>("excludeOtherSeeds", true);
foo.add<double>("showerSigma", 10.);
foo.add<double>("stoppingTolerance", 1e-8);
{
edm::ParameterSetDescription validator;
validator.add<std::string>("detector", "");
validator.add<std::vector<double>>("recHitEnergyNorm", {});
std::vector<edm::ParameterSet> vDefaults(2);
vDefaults[0].addParameter<std::string>("detector", "HCAL_BARREL1");
vDefaults[0].addParameter<std::vector<double>>("recHitEnergyNorm", {0.1, 0.2, 0.3, 0.3});
vDefaults[1].addParameter<std::string>("detector", "HCAL_ENDCAP");
vDefaults[1].addParameter<std::vector<double>>("recHitEnergyNorm", {0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2});
foo.addVPSet("recHitEnergyNorms", validator, vDefaults);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("minFractionInCalc", 1e-9);
bar.add<double>("minAllowedNormalization", 1e-9);
foo.add("positionCalc", bar);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("corrTermLowE", 0.);
bar.add<double>("threshLowE", 6.);
bar.add<double>("noiseTerm", 21.86);
bar.add<double>("constantTermLowE", 4.24);
bar.add<double>("noiseTermLowE", 8.);
bar.add<double>("threshHighE", 15.);
bar.add<double>("constantTerm", 2.82);
foo.add("timeResolutionCalcBarrel", bar);
}
{
edm::ParameterSetDescription bar;
bar.add<double>("corrTermLowE", 0.);
bar.add<double>("threshLowE", 6.);
bar.add<double>("noiseTerm", 21.86);
bar.add<double>("constantTermLowE", 4.24);
bar.add<double>("noiseTermLowE", 8.);
bar.add<double>("threshHighE", 15.);
bar.add<double>("constantTerm", 2.82);
foo.add("timeResolutionCalcEndcap", bar);
}
psetDesc.add(psetName, foo);
}

descriptions.addWithDefaultLabel(psetDesc);
}

std::shared_ptr<PFClusterParamsAlpakaESDataHost> produce(PFClusterParamsAlpakaESRecord const& iRecord) {
return product;
}

Expand Down
20 changes: 0 additions & 20 deletions RecoParticleFlow/PFClusterProducerAlpaka/plugins/alpaka/PFClusterProducerAlpaka.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
namespace ALPAKA_ACCELERATOR_NAMESPACE {
class PFClusterProducerAlpaka : public stream::EDProducer<> {
public:
std::unique_ptr<PFCPositionCalculatorBase> _positionCalc;
std::unique_ptr<PFCPositionCalculatorBase> _allCellsPositionCalc;

PFClusterProducerAlpaka(edm::ParameterSet const& config)
: pfClusParamsToken(esConsumes(config.getParameter<edm::ESInputTag>("pfClusterParams"))),
Expand All @@ -30,30 +28,12 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
_produceSoA{config.getParameter<bool>("produceSoA")},
_produceLegacy{config.getParameter<bool>("produceLegacy")}
{
edm::ConsumesCollector cc = consumesCollector();

//setup pf cluster builder if requested
const edm::ParameterSet& pfcConf = config.getParameterSet("pfClusterBuilder");
if (!pfcConf.empty()) {
if (pfcConf.exists("positionCalc")) {
const edm::ParameterSet& acConf = pfcConf.getParameterSet("positionCalc");
const std::string& algoac = acConf.getParameter<std::string>("algoName");
_positionCalc = PFCPositionCalculatorFactory::get()->create(algoac, acConf, cc);
}

if (pfcConf.exists("allCellsPositionCalc")) {
const edm::ParameterSet& acConf = pfcConf.getParameterSet("allCellsPositionCalc");
const std::string& algoac = acConf.getParameter<std::string>("algoName");
_allCellsPositionCalc = PFCPositionCalculatorFactory::get()->create(algoac, acConf, cc);
}
}
}

void produce(device::Event& event, device::EventSetup const& setup) override {
const PFClusterParamsAlpakaESDataDevice& params = setup.getData(pfClusParamsToken);
const reco::PFRecHitHostCollection& pfRecHits = event.get(InputPFRecHitSoA_Token_);
const int nRH = pfRecHits->size();
std::cout << "nRH: " << nRH << std::endl;

tmpDeviceCollection tmp{nRH + 1, event.queue()};
tmpEdgeDeviceCollection tmpEdge{(nRH * 8) + 1, event.queue()};
Expand Down
Loading

0 comments on commit d0f321b

Please sign in to comment.