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

attempt to fix SiStrip DQM reproducibility issue: allign members common to root and full c++ #20050

Merged
merged 1 commit into from Aug 4, 2017
Merged

attempt to fix SiStrip DQM reproducibility issue: allign members common to root and full c++ #20050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 13 additions & 24 deletions DPGAnalysis/SiStripTools/interface/Multiplicities.h
View file
Open in desktop
Expand Up @@ -43,12 +43,12 @@ class ClusterSummarySingleMultiplicity {
int mult() const;

private:
#ifndef __ROOTCLING__
edm::EDGetTokenT<ClusterSummary> m_collection;
#endif
ClusterSummary::CMSTracker m_subdetenum;
ClusterSummary::VariablePlacement m_varenum;
int m_mult;
#ifndef __ROOTCLING__
edm::EDGetTokenT<ClusterSummary> m_collection;
#endif

};

Expand All @@ -70,43 +70,40 @@ class SingleMultiplicity {

private:

#ifndef __ROOTCLING__
edm::EDGetTokenT<T> m_collection;
#endif
int m_modthr;
bool m_useQuality;
std::string m_qualityLabel;
int m_mult;
#ifndef __ROOTCLING__
edm::EDGetTokenT<T> m_collection;
#endif
};

template <class T>
SingleMultiplicity<T>::SingleMultiplicity():
// mult(0),
m_modthr(-1), m_useQuality(false), m_qualityLabel(),
m_mult(0)
#ifndef __ROOTCLING__
m_collection(),
,m_collection()
#endif
m_modthr(-1), m_useQuality(false), m_qualityLabel(),
m_mult(0)
{ }

#ifndef __ROOTCLING__
template <class T>
SingleMultiplicity<T>::SingleMultiplicity(const edm::ParameterSet& iConfig,edm::ConsumesCollector&& iC):
// mult(0),
m_collection(iC.consumes<T>(iConfig.getParameter<edm::InputTag>("collectionName"))),
m_modthr(iConfig.getUntrackedParameter<int>("moduleThreshold")),
m_useQuality(iConfig.getUntrackedParameter<bool>("useQuality",false)),
m_qualityLabel(iConfig.getUntrackedParameter<std::string>("qualityLabel","")),
m_mult(0)
m_mult(0),
m_collection(iC.consumes<T>(iConfig.getParameter<edm::InputTag>("collectionName")))
{ }
template <class T>
SingleMultiplicity<T>::SingleMultiplicity(const edm::ParameterSet& iConfig,edm::ConsumesCollector& iC):
// mult(0),
m_collection(iC.consumes<T>(iConfig.getParameter<edm::InputTag>("collectionName"))),
m_modthr(iConfig.getUntrackedParameter<int>("moduleThreshold")),
m_useQuality(iConfig.getUntrackedParameter<bool>("useQuality",false)),
m_qualityLabel(iConfig.getUntrackedParameter<std::string>("qualityLabel","")),
m_mult(0)
m_mult(0),
m_collection(iC.consumes<T>(iConfig.getParameter<edm::InputTag>("collectionName")))
{ }
#endif

Expand All @@ -116,7 +113,6 @@ void
SingleMultiplicity<T>::getEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

m_mult = 0;
// mult = 0;

edm::ESHandle<SiStripQuality> qualityHandle;
if( m_useQuality) {
Expand Down Expand Up @@ -156,8 +152,6 @@ template <class T1, class T2>
void getEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup);
int mult1() const;
int mult2() const;
// int mult1;
// int mult2;

private:

Expand All @@ -168,20 +162,17 @@ template <class T1, class T2>

template <class T1, class T2>
MultiplicityPair<T1,T2>::MultiplicityPair():
// mult1(0),mult2(0),
m_multiplicity1(), m_multiplicity2()
{ }

#ifndef __ROOTCLING__
template <class T1, class T2>
MultiplicityPair<T1,T2>::MultiplicityPair(const edm::ParameterSet& iConfig,edm::ConsumesCollector&& iC):
// mult1(0),mult2(0),
m_multiplicity1(iConfig.getParameter<edm::ParameterSet>("firstMultiplicityConfig"),iC),
m_multiplicity2(iConfig.getParameter<edm::ParameterSet>("secondMultiplicityConfig"),iC)
{ }
template <class T1, class T2>
MultiplicityPair<T1,T2>::MultiplicityPair(const edm::ParameterSet& iConfig,edm::ConsumesCollector& iC):
// mult1(0),mult2(0),
m_multiplicity1(iConfig.getParameter<edm::ParameterSet>("firstMultiplicityConfig"),iC),
m_multiplicity2(iConfig.getParameter<edm::ParameterSet>("secondMultiplicityConfig"),iC)
{ }
Expand All @@ -194,8 +185,6 @@ template <class T1, class T2>
m_multiplicity1.getEvent(iEvent,iSetup);
m_multiplicity2.getEvent(iEvent,iSetup);

// mult1=m_multiplicity1.mult;
// mult2=m_multiplicity2.mult;

}

Expand Down
10 changes: 5 additions & 5 deletions DPGAnalysis/SiStripTools/src/Multiplicities.cc
View file
Open in desktop
@@ -1,18 +1,18 @@
#include "DPGAnalysis/SiStripTools/interface/Multiplicities.h"

ClusterSummarySingleMultiplicity::ClusterSummarySingleMultiplicity():
m_collection(),m_subdetenum(ClusterSummary::STRIP),m_varenum(ClusterSummary::NCLUSTERS),m_mult(0) { }
m_subdetenum(ClusterSummary::STRIP),m_varenum(ClusterSummary::NCLUSTERS),m_mult(0),m_collection() { }

ClusterSummarySingleMultiplicity::ClusterSummarySingleMultiplicity(const edm::ParameterSet& iConfig,edm::ConsumesCollector&& iC):
m_collection(iC.consumes<ClusterSummary>(iConfig.getParameter<edm::InputTag>("clusterSummaryCollection"))),
m_subdetenum((ClusterSummary::CMSTracker)iConfig.getParameter<int>("subDetEnum")),m_varenum((ClusterSummary::VariablePlacement)iConfig.getParameter<int>("varEnum")),
m_mult(0)
m_mult(0),
m_collection(iC.consumes<ClusterSummary>(iConfig.getParameter<edm::InputTag>("clusterSummaryCollection")))
{}

ClusterSummarySingleMultiplicity::ClusterSummarySingleMultiplicity(const edm::ParameterSet& iConfig,edm::ConsumesCollector& iC):
m_collection(iC.consumes<ClusterSummary>(iConfig.getParameter<edm::InputTag>("clusterSummaryCollection"))),
m_subdetenum((ClusterSummary::CMSTracker)iConfig.getParameter<int>("subDetEnum")),m_varenum((ClusterSummary::VariablePlacement)iConfig.getParameter<int>("varEnum")),
m_mult(0)
m_mult(0),
m_collection(iC.consumes<ClusterSummary>(iConfig.getParameter<edm::InputTag>("clusterSummaryCollection")))
{}

void ClusterSummarySingleMultiplicity::getEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
Expand Down