diff --git a/DQM/TrackingMonitor/interface/TrackAnalyzer.h b/DQM/TrackingMonitor/interface/TrackAnalyzer.h index a19ec3565ae77..8dd0a00a5cea7 100644 --- a/DQM/TrackingMonitor/interface/TrackAnalyzer.h +++ b/DQM/TrackingMonitor/interface/TrackAnalyzer.h @@ -82,6 +82,8 @@ class TrackAnalyzer edm::ParameterSet const* conf_; + std::string stateName_; + bool doTrackerSpecific_; bool doAllPlots_; bool doBSPlots_; diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc index 0ff18262007e7..929df5ae849d9 100644 --- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc @@ -25,6 +25,7 @@ using namespace dqm; TrackAnalyzer::TrackAnalyzer(const edm::ParameterSet& iConfig) : conf_( nullptr ) + , stateName_ (iConfig.getParameter("MeasurementState") ) , doTrackerSpecific_ ( iConfig.getParameter("doTrackerSpecific") ) , doAllPlots_ ( iConfig.getParameter("doAllPlots") ) , doBSPlots_ ( iConfig.getParameter("doBeamSpotPlots") ) @@ -181,22 +182,21 @@ void TrackAnalyzer::initHisto(DQMStore::IBooker & ibooker, const edm::EventSetup // ---------------------------------------------------------------------------------// if (doMeasurementStatePlots_ || doAllPlots_) { - std::string StateName = iConfig.getParameter("MeasurementState"); - if (StateName == "All") { + if (stateName_ == "All") { bookHistosForState("OuterSurface", ibooker); bookHistosForState("InnerSurface", ibooker); bookHistosForState("ImpactPoint" , ibooker); } else if ( - StateName != "OuterSurface" && - StateName != "InnerSurface" && - StateName != "ImpactPoint" && - StateName != "default" + stateName_ != "OuterSurface" && + stateName_ != "InnerSurface" && + stateName_ != "ImpactPoint" && + stateName_ != "default" ) { bookHistosForState("default", ibooker); } else { - bookHistosForState(StateName, ibooker); + bookHistosForState(stateName_, ibooker); } conf_ = nullptr; } @@ -1235,21 +1235,20 @@ void TrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe } if (doMeasurementStatePlots_ || doAllPlots_){ - std::string StateName = conf_->getParameter("MeasurementState"); - if (StateName == "All") { + if (stateName_ == "All") { fillHistosForState(iSetup, track, std::string("OuterSurface")); fillHistosForState(iSetup, track, std::string("InnerSurface")); fillHistosForState(iSetup, track, std::string("ImpactPoint")); } else if ( - StateName != "OuterSurface" && - StateName != "InnerSurface" && - StateName != "ImpactPoint" && - StateName != "default" + stateName_ != "OuterSurface" && + stateName_ != "InnerSurface" && + stateName_ != "ImpactPoint" && + stateName_ != "default" ) { fillHistosForState(iSetup, track, std::string("default")); } else { - fillHistosForState(iSetup, track, StateName); + fillHistosForState(iSetup, track, stateName_); } }