Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PCC Event Producer 11_1_X target #29069

Merged
merged 7 commits into from Mar 9, 2020
Merged

PCC Event Producer 11_1_X target #29069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55e0daf
updated fill description and changed classes xml in dataformats to match
samhiggie Feb 17, 2020
fc982ce
Added dependencies and checked fill description
samhiggie Feb 17, 2020
ecf867c
Change producer names
samhiggie Feb 17, 2020
a46a4fb
Added the new named producer
samhiggie Feb 17, 2020
5dbe317
updated to new cmssw release and fixed PSet inception
samhiggie Feb 18, 2020
9791753
Thanks cmsbuild Robot for the formatting suggestions
samhiggie Mar 2, 2020
1136d16
Fixed PSet for AlcaPCCProducer in fractional config files
samhiggie Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 21 additions & 15 deletions ...Producers/plugins/AlcaPCCProducerEvent.cc → ...Producers/plugins/AlcaPCCEventProducer.cc
View file
Open in desktop
@@ -1,5 +1,5 @@
/**_________________________________________________________________
class: AlcaPCCProducerEvent.cc
class: AlcaPCCEventProducer.cc



Expand All @@ -14,7 +14,6 @@ ________________________________________________________________**/
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"

#include "DataFormats/Luminosity/interface/PixelClusterCountsInEvent.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
Expand All @@ -27,13 +26,15 @@ ________________________________________________________________**/
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "TMath.h"
//The class
class AlcaPCCProducerEvent : public edm::stream::EDProducer<> {
class AlcaPCCEventProducer : public edm::stream::EDProducer<> {
public:
explicit AlcaPCCProducerEvent(const edm::ParameterSet&);
~AlcaPCCProducerEvent() override;
explicit AlcaPCCEventProducer(const edm::ParameterSet&);
~AlcaPCCEventProducer() override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
Expand All @@ -49,21 +50,18 @@ class AlcaPCCProducerEvent : public edm::stream::EDProducer<> {
};

//--------------------------------------------------------------------------------------------------
AlcaPCCProducerEvent::AlcaPCCProducerEvent(const edm::ParameterSet& iConfig) {
fPixelClusterLabel = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerEventParameters")
.getParameter<edm::InputTag>("pixelClusterLabel");
trigstring_ = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerEventParameters")
.getUntrackedParameter<std::string>("trigstring", "alcaPCCEvent");

AlcaPCCEventProducer::AlcaPCCEventProducer(const edm::ParameterSet& iConfig) {
fPixelClusterLabel = iConfig.getParameter<edm::InputTag>("pixelClusterLabel");
trigstring_ = iConfig.getUntrackedParameter<std::string>("trigstring", "alcaPCCEvent");
produces<reco::PixelClusterCountsInEvent, edm::Transition::Event>(trigstring_);
pixelToken = consumes<edmNew::DetSetVector<SiPixelCluster> >(fPixelClusterLabel);
}

//--------------------------------------------------------------------------------------------------
AlcaPCCProducerEvent::~AlcaPCCProducerEvent() {}
AlcaPCCEventProducer::~AlcaPCCEventProducer() {}

//--------------------------------------------------------------------------------------------------
void AlcaPCCProducerEvent::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
void AlcaPCCEventProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
countEvt_++;
thePCCob = std::make_unique<reco::PixelClusterCountsInEvent>();

Expand Down Expand Up @@ -98,4 +96,12 @@ void AlcaPCCProducerEvent::produce(edm::Event& iEvent, const edm::EventSetup& iS
iEvent.put(std::move(thePCCob), std::string(trigstring_));
}

DEFINE_FWK_MODULE(AlcaPCCProducerEvent);
//--------------------------------------------------------------------------------------------------
void AlcaPCCEventProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription evtParamDesc;
evtParamDesc.add<edm::InputTag>("pixelClusterLabel", edm::InputTag("siPixelClustersForLumi"));
evtParamDesc.addUntracked<std::string>("trigstring", "alcaPCCEvent");
descriptions.add("alcaPCCEventProducer", evtParamDesc);
}

DEFINE_FWK_MODULE(AlcaPCCEventProducer);
9 changes: 4 additions & 5 deletions Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
View file
Open in desktop
Expand Up @@ -26,7 +26,8 @@ ________________________________________________________________**/
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "TMath.h"
//The class
class AlcaPCCProducer : public edm::one::EDProducer<edm::EndLuminosityBlockProducer, edm::one::WatchLuminosityBlocks> {
Expand All @@ -52,10 +53,8 @@ class AlcaPCCProducer : public edm::one::EDProducer<edm::EndLuminosityBlockProdu

//--------------------------------------------------------------------------------------------------
AlcaPCCProducer::AlcaPCCProducer(const edm::ParameterSet& iConfig) {
fPixelClusterLabel = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters")
.getParameter<edm::InputTag>("pixelClusterLabel");
trigstring_ = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters")
.getUntrackedParameter<std::string>("trigstring", "alcaPCC");
fPixelClusterLabel = iConfig.getParameter<edm::InputTag>("pixelClusterLabel");
trigstring_ = iConfig.getUntrackedParameter<std::string>("trigstring", "alcaPCC");

countLumi_ = 0;

Expand Down
2 changes: 1 addition & 1 deletion Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -27,6 +27,6 @@
<library file="CorrPCCProducer.cc" name="CorrPCCProducer">
<flags EDM_PLUGIN="1"/>
</library>
<library file="AlcaPCCProducerEvent.cc" name="AlcaPCCProducerEvent">
<library file="AlcaPCCEventProducer.cc" name="AlcaPCCEventProducer">
<flags EDM_PLUGIN="1"/>
</library>
4 changes: 2 additions & 2 deletions Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandomFromRECO_cff.py
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@

from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
alcaPCCProducerRandomFromRECO = alcaPCCProducer.clone()
alcaPCCProducerRandomFromRECO.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClusters")
alcaPCCProducerRandomFromRECO.AlcaPCCProducerParameters.trigstring = cms.untracked.string("alcaPCCRandomFromRECO")
alcaPCCProducerRandomFromRECO.pixelClusterLabel = cms.InputTag("siPixelClusters")
alcaPCCProducerRandomFromRECO.trigstring = cms.untracked.string("alcaPCCRandomFromRECO")


# Sequence #
Expand Down
4 changes: 2 additions & 2 deletions Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py
View file
Open in desktop
Expand Up @@ -19,8 +19,8 @@

from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
alcaPCCProducerRandom = alcaPCCProducer.clone()
alcaPCCProducerRandom.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiR")
alcaPCCProducerRandom.AlcaPCCProducerParameters.trigstring = cms.untracked.string("alcaPCCRandom")
alcaPCCProducerRandom.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiR")
alcaPCCProducerRandom.trigstring = cms.untracked.string("alcaPCCRandom")

# Sequence #
seqALCARECOAlCaPCCRandom = cms.Sequence(ALCARECORandomHLT + siPixelDigisForLumiR + siPixelClustersForLumiR + alcaPCCProducerRandom)
4 changes: 2 additions & 2 deletions Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBiasFromRECO_cff.py
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@

from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
alcaPCCProducerZBFromRECO = alcaPCCProducer.clone()
alcaPCCProducerZBFromRECO.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClusters")
alcaPCCProducerZBFromRECO.AlcaPCCProducerParameters.trigstring = cms.untracked.string("alcaPCCZeroBiasFromRECO")
alcaPCCProducerZBFromRECO.pixelClusterLabel = cms.InputTag("siPixelClusters")
alcaPCCProducerZBFromRECO.trigstring = cms.untracked.string("alcaPCCZeroBiasFromRECO")


# Sequence #
Expand Down
4 changes: 2 additions & 2 deletions Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py
View file
Open in desktop
Expand Up @@ -19,8 +19,8 @@

from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
alcaPCCProducerZeroBias = alcaPCCProducer.clone()
alcaPCCProducerZeroBias.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiZB")
alcaPCCProducerZeroBias.AlcaPCCProducerParameters.trigstring = cms.untracked.string("alcaPCCZeroBias")
alcaPCCProducerZeroBias.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiZB")
alcaPCCProducerZeroBias.trigstring = cms.untracked.string("alcaPCCZeroBias")

# Sequence #
seqALCARECOAlCaPCCZeroBias = cms.Sequence(ALCARECOZeroBiasHLT + siPixelDigisForLumiZB + siPixelClustersForLumiZB + alcaPCCProducerZeroBias)
6 changes: 2 additions & 4 deletions Calibration/LumiAlCaRecoProducers/python/alcaPCCProducer_cfi.py
View file
Open in desktop
@@ -1,8 +1,6 @@
import FWCore.ParameterSet.Config as cms

alcaPCCProducer = cms.EDProducer("AlcaPCCProducer",
AlcaPCCProducerParameters = cms.PSet(
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
trigstring = cms.untracked.string("alcaPCC")
),
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
trigstring = cms.untracked.string("alcaPCC")
)
17 changes: 7 additions & 10 deletions Calibration/LumiAlCaRecoProducers/test/PCC_Random_Event_cfg.py
View file
Open in desktop
@@ -1,6 +1,6 @@
#########################
#Author: Attila Radl (attila.radl@cern.ch)
#Purpose: To investigate the AlCaPCCProducerEvent input and output.
#Purpose: To investigate the AlCaPCCEventProducer input and output.
#########################
import FWCore.ParameterSet.Config as cms

Expand All @@ -20,13 +20,10 @@
'keep *_MEtoEDMConvertSiStrip_*_*')
)
#Make sure that variables match in producer.cc and .h
process.alcaPCCProducerEvent = cms.EDProducer("AlcaPCCProducerEvent",
AlcaPCCProducerEventParameters = cms.PSet(
WriteToDB = cms.bool(False),
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
#Mod factor to count lumi and the string to specify output
trigstring = cms.untracked.string("alcaPCCRandom")
),
process.alcaPCCEventProducer = cms.EDProducer("AlcaPCCEventProducer",
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
#Mod factor to count lumi and the string to specify output
trigstring = cms.untracked.string("alcaPCCRandom")
)

process.OutALCARECOLumiPixels = cms.PSet(
Expand Down Expand Up @@ -97,12 +94,12 @@
eventAutoFlushCompressedSize = cms.untracked.int32(5242880),
fileName = cms.untracked.string('ProdPCC_Random_Event_100.root'),
outputCommands = cms.untracked.vstring('drop *',
'keep *_alcaPCCProducerEvent_*_*',
'keep *_alcaPCCEventProducer_*_*',
'keep *_MEtoEDMConvertSiStrip_*_*')
)

#This is the key sequence that we are adding first...
process.seqALCARECOPromptCalibProdPCC = cms.Sequence(process.ALCARECOHltFilterForPCC+process.alcaPCCProducerEvent)
process.seqALCARECOPromptCalibProdPCC = cms.Sequence(process.ALCARECOHltFilterForPCC+process.alcaPCCEventProducer)

process.pathALCARECOPromptCalibProdPCC = cms.Path(process.seqALCARECOPromptCalibProdPCC)

Expand Down
9 changes: 3 additions & 6 deletions Calibration/LumiAlCaRecoProducers/test/PCC_Random_cfg.py
View file
Open in desktop
Expand Up @@ -21,12 +21,9 @@
)
#Make sure that variables match in producer.cc and .h
process.alcaPCCProducer = cms.EDProducer("AlcaPCCProducer",
AlcaPCCProducerParameters = cms.PSet(
WriteToDB = cms.bool(False),
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
#Mod factor to count lumi and the string to specify output
trigstring = cms.untracked.string("alcaPCCRand")
),
pixelClusterLabel = cms.InputTag("siPixelClustersForLumi"),
#Mod factor to count lumi and the string to specify output
trigstring = cms.untracked.string("alcaPCCRand")
)

process.OutALCARECOLumiPixels = cms.PSet(
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Luminosity/interface/PixelClusterCounts.h
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
*
* Reconstructed PixelClusterCounts object that will contain the moduleID, BX, and counts.
*
* \authors: Sam Higginbotham shiggib@cern.ch and Chris Palmer capalmer@cern.ch
* \authors: Sam Higginbotham shigginb@cern.ch and Chris Palmer capalmer@cern.ch
*
*
*/
Expand Down