From f4bb20152370652d1ea74abd66003d7ebd420540 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 8 Jan 2014 12:37:25 +0100 Subject: [PATCH 1/2] DQM/TrackingMonitorClient: add missing std:: The following is required for ROOT6. Signed-off-by: David Abdurachmanov --- DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc | 2 +- DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc b/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc index a117d8eeda472..06c99cab85f89 100644 --- a/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc +++ b/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc @@ -49,7 +49,7 @@ TrackingAnalyser::TrackingAnalyser(edm::ParameterSet const& ps) { tkMapPSet_ = ps.getParameter("TkmapParameters"); std::string localPath = std::string("DQM/TrackingMonitorClient/test/loader.html"); - ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in); + std::ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in); char buf[BUF_SIZE]; if (!fin) { diff --git a/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc b/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc index 181966b142c00..3ec1834f132a7 100644 --- a/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc +++ b/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc @@ -76,7 +76,7 @@ void TrackingActionExecutor::fillStatusAtLumi(DQMStore* dqm_store) { // void TrackingActionExecutor::createDummyShiftReport(){ // std::cout << "[TrackingActionExecutor::createDummyShiftReport]" << std::endl; - ofstream report_file; + std::ofstream report_file; report_file.open("tracking_shift_report.txt", std::ios::out); report_file << " Nothing to report!!" << std::endl; report_file.close(); @@ -111,7 +111,7 @@ void TrackingActionExecutor::createShiftReport(DQMStore * dqm_store){ shift_summary << std::endl; printShiftHistoParameters(dqm_store, layout_map, shift_summary); - ofstream report_file; + std::ofstream report_file; report_file.open("tracking_shift_report.txt", std::ios::out); report_file << shift_summary.str() << std::endl; report_file.close(); From 3227adc7bfe2082ae65c109ea569452db0a3e8e4 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 8 Jan 2014 12:19:52 +0100 Subject: [PATCH 2/2] CommonTools/TrackerMap: add missing std:: in print_TrackerMap.cc The following is required for ROOT6. Signed-off-by: David Abdurachmanov --- CommonTools/TrackerMap/bin/print_TrackerMap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonTools/TrackerMap/bin/print_TrackerMap.cc b/CommonTools/TrackerMap/bin/print_TrackerMap.cc index a56b1cb57a588..5a587682c2db2 100644 --- a/CommonTools/TrackerMap/bin/print_TrackerMap.cc +++ b/CommonTools/TrackerMap/bin/print_TrackerMap.cc @@ -57,7 +57,7 @@ void printTrackerMap(const std::string filename, const std::string title, const if(withpixel=="Only") {themap.addPixel(false); themap.onlyPixel(true); ratio=16./9.;} if(withpixel=="False") {themap.addPixel(false); themap.onlyPixel(false); ratio=8./15.;} - ifstream input(filename); + std::ifstream input(filename); unsigned int detid; float val;