From 5852e3e649abeee36b21fae1f0677652f99214d6 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Mon, 11 Mar 2019 14:41:46 -0400 Subject: [PATCH 1/4] Protons --- Producer/cfg/mc.py | 2 +- Producer/interface/ProtonsFiller.h | 22 ++++++++++++++++ Producer/python/panda_cfi.py | 5 ++++ Producer/python/prod.py | 3 ++- Producer/src/ProtonsFiller.cc | 42 ++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 Producer/interface/ProtonsFiller.h create mode 100644 Producer/src/ProtonsFiller.cc diff --git a/Producer/cfg/mc.py b/Producer/cfg/mc.py index 7ee77fbb..f0bcc121 100644 --- a/Producer/cfg/mc.py +++ b/Producer/cfg/mc.py @@ -1,4 +1,4 @@ import PandaProd.Producer.opts -PandaProd.Producer.opts.options.config = 'Autumn18' +PandaProd.Producer.opts.options.config = 'Fall17' from PandaProd.Producer.prod import process diff --git a/Producer/interface/ProtonsFiller.h b/Producer/interface/ProtonsFiller.h new file mode 100644 index 00000000..2172334f --- /dev/null +++ b/Producer/interface/ProtonsFiller.h @@ -0,0 +1,22 @@ +#ifndef PandaProd_Producer_ProtonsFiller_h +#define PandaProd_Producer_ProtonsFiller_h + +#include "FillerBase.h" + +#include "DataFormats/Common/interface/View.h" +#include "DataFormats/CTPPSReco/interface/CTPPSLocalTrackLite.h" + +class ProtonsFiller : public FillerBase { + public: + ProtonsFiller(std::string const&, edm::ParameterSet const&, edm::ConsumesCollector&); + ~ProtonsFiller() {} + + void branchNames(panda::utils::BranchList& eventBranches, panda::utils::BranchList&) const override; + void fill(panda::Event&, edm::Event const&, edm::EventSetup const&) override; + + protected: + typedef edm::View ProtonView; + NamedToken protonsToken_; +}; + +#endif diff --git a/Producer/python/panda_cfi.py b/Producer/python/panda_cfi.py index 77d9688f..2b03632a 100644 --- a/Producer/python/panda_cfi.py +++ b/Producer/python/panda_cfi.py @@ -204,6 +204,11 @@ puppiInput = cms.untracked.string('packedPFCandidates'), useExistingWeights = cms.untracked.bool(True) ), + protons = cms.untracked.PSet( + enabled = cms.untracked.bool(True), + filler = cms.untracked.string('Protons'), + protons = cms.untracked.string('ctppsLocalTrackLiteProducer') + ), partons = cms.untracked.PSet( enabled = cms.untracked.bool(True), filler = cms.untracked.string('Partons') diff --git a/Producer/python/prod.py b/Producer/python/prod.py index 8a1bdb87..b36b4463 100644 --- a/Producer/python/prod.py +++ b/Producer/python/prod.py @@ -1,4 +1,5 @@ -from .opts import options + +from opts import options # Global tags # https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFrontierConditions diff --git a/Producer/src/ProtonsFiller.cc b/Producer/src/ProtonsFiller.cc new file mode 100644 index 00000000..e571f5e1 --- /dev/null +++ b/Producer/src/ProtonsFiller.cc @@ -0,0 +1,42 @@ +#include "../interface/ProtonsFiller.h" + +#include "DataFormats/Common/interface/RefToPtr.h" + +ProtonsFiller::ProtonsFiller(std::string const& _name, edm::ParameterSet const& _cfg, edm::ConsumesCollector& _coll) : + FillerBase(_name, _cfg) +{ + //if (isRealData_) + getToken_(protonsToken_, _cfg, _coll, "protons"); +} + +void +ProtonsFiller::branchNames(panda::utils::BranchList& _eventBranches, panda::utils::BranchList&) const +{ + //if (isRealData_) + _eventBranches.emplace_back("protons"); +} + +void +ProtonsFiller::fill(panda::Event& _outEvent, edm::Event const& _inEvent, edm::EventSetup const& _setup) +{ + //if (!isRealData_) + //return; + + auto& inProtons(getProduct_(_inEvent, protonsToken_)); + + auto& outProtons(_outEvent.protons); + + for (auto& inProton : inProtons) { + + auto& outProton(outProtons.create_back()); + + outProton.x = inProton.getX(); + outProton.xUnc = inProton.getXUnc(); + outProton.y = inProton.getY(); + outProton.yUnc = inProton.getYUnc(); + outProton.rpId = inProton.getRPId(); + + } +} + +DEFINE_TREEFILLER(ProtonsFiller); From 9f1d901737282169bdaa6162b87977365a597f28 Mon Sep 17 00:00:00 2001 From: dr-stringfellow Date: Mon, 11 Mar 2019 15:28:32 -0400 Subject: [PATCH 2/4] Update prod.py --- Producer/python/prod.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Producer/python/prod.py b/Producer/python/prod.py index b36b4463..3e7e7fd8 100644 --- a/Producer/python/prod.py +++ b/Producer/python/prod.py @@ -1,5 +1,5 @@ -from opts import options +from .opts import options # Global tags # https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFrontierConditions From 92c86fa7d5230545acd07f58aaf6d74a5a8f3830 Mon Sep 17 00:00:00 2001 From: dr-stringfellow Date: Mon, 11 Mar 2019 15:28:44 -0400 Subject: [PATCH 3/4] Update prod.py --- Producer/python/prod.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Producer/python/prod.py b/Producer/python/prod.py index 3e7e7fd8..8a1bdb87 100644 --- a/Producer/python/prod.py +++ b/Producer/python/prod.py @@ -1,4 +1,3 @@ - from .opts import options # Global tags From de7d2546821e2e5598eff1bd20d9d7a5f458c9ea Mon Sep 17 00:00:00 2001 From: dr-stringfellow Date: Mon, 11 Mar 2019 15:28:58 -0400 Subject: [PATCH 4/4] Update mc.py --- Producer/cfg/mc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Producer/cfg/mc.py b/Producer/cfg/mc.py index f0bcc121..7ee77fbb 100644 --- a/Producer/cfg/mc.py +++ b/Producer/cfg/mc.py @@ -1,4 +1,4 @@ import PandaProd.Producer.opts -PandaProd.Producer.opts.options.config = 'Fall17' +PandaProd.Producer.opts.options.config = 'Autumn18' from PandaProd.Producer.prod import process