Merge pull request #1205 from fwyzard/fix_include_directive

Misc cleanups -- Fix #include directives
cms-sw · Oct 28, 2013 · 5eae842 · 5eae842
2 parents 39328ce + 7c31395
commit 5eae842
Show file tree

Hide file tree

Showing 60 changed files with 68 additions and 68 deletions.
diff --git a/Alignment/CocoaAnalysis/interface/FittedEntriesSet.h b/Alignment/CocoaAnalysis/interface/FittedEntriesSet.h
@@ -11,7 +11,7 @@
 #define _FittedEntriesSet_HH
 
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
-#include "time.h"
+#include <ctime>
 #include <vector>
 #include "Alignment/CocoaAnalysis/interface/FittedEntry.h"
 //#ifdef MAT_MESCHACH

diff --git a/Alignment/CocoaFit/interface/FittedEntriesSet.h b/Alignment/CocoaFit/interface/FittedEntriesSet.h
@@ -11,7 +11,7 @@
 #define _FittedEntriesSet_HH
 
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
-#include "time.h"
+#include <ctime>
 #include <vector>
 #include "Alignment/CocoaFit/interface/FittedEntry.h"
 //#ifdef MAT_MESCHACH

diff --git a/Alignment/CocoaModel/interface/OpticalObject.h b/Alignment/CocoaModel/interface/OpticalObject.h
@@ -11,7 +11,7 @@
 #define _OPTICALOBJECT_HH
 
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
-#include "stdint.h"
+#include <cstdint>
 
 class LightRay;
 class Measurement;

diff --git a/Alignment/MuonAlignmentAlgorithms/interface/DTMuonMillepede.h b/Alignment/MuonAlignmentAlgorithms/interface/DTMuonMillepede.h
@@ -14,7 +14,7 @@
 #include "TTree.h"
 #include <string>
 #include "TChain.h"
-#include "math.h"
+#include <cmath>
 
 
 class DTMuonMillepede : public DTMuonLocalAlignment {

diff --git a/Alignment/MuonAlignmentAlgorithms/interface/DTMuonSLToSL.h b/Alignment/MuonAlignmentAlgorithms/interface/DTMuonSLToSL.h
@@ -13,7 +13,7 @@
 #include "TTree.h"
 #include <string>
 #include "TChain.h"
-#include "math.h"
+#include <cmath>
 
 class DTMuonSLToSL : public DTMuonLocalAlignment {
 

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/TFParams.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/TFParams.h
@@ -9,7 +9,7 @@
 #include "TDirectory.h"
 #include "TPaveLabel.h"
 #include "TF1.h"
-#include "time.h"
+#include <ctime>
 #include "TGraph.h"
 #include <stdio.h>
 #include <math.h>

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/src/TMarkov.cc b/CalibCalorimetry/EcalLaserAnalyzer/src/TMarkov.cc
@@ -7,7 +7,7 @@
 #include <CalibCalorimetry/EcalLaserAnalyzer/interface/TMarkov.h>
 
 #include <iostream>
-#include "math.h"
+#include <cmath>
 
 //ClassImp(TMarkov)
 

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/src/TPNCor.cc b/CalibCalorimetry/EcalLaserAnalyzer/src/TPNCor.cc
@@ -11,7 +11,7 @@
 #include <iomanip>
 #include <fstream>
 
-#include "math.h"
+#include <cmath>
 
 using namespace std;
 //using namespace edm;

diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelDQMRocLevelAnalyzer.h b/CalibTracker/SiPixelTools/plugins/SiPixelDQMRocLevelAnalyzer.h
@@ -38,7 +38,7 @@
 #include <string>
 #include "TH1D.h"
 #include "TFile.h"
-#include "math.h"
+#include <cmath>
 //
 // class decleration
 //

diff --git a/CaloOnlineTools/HcalOnlineDb/src/ConnectionManager.cc b/CaloOnlineTools/HcalOnlineDb/src/ConnectionManager.cc
@@ -4,7 +4,7 @@
 
 #include "OnlineDB/Oracle/interface/Oracle.h"
 #include "CaloOnlineTools/HcalOnlineDb/interface/ConnectionManager.h"
-#include "ctype.h"
+#include <cctype>
 
 ConnectionManager::ConnectionManager() : env(0), conn(0) {
 }

diff --git a/CondCore/HcalPlugins/plugins/HcalGainWidthsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalGainWidthsPyWrapper.cc
@@ -19,7 +19,7 @@
 #include "TColor.h"
 #include "TLine.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalGainsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalGainsPyWrapper.cc
@@ -18,7 +18,7 @@
 #include "TColor.h"
 #include "TLine.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalLUTCorrsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalLUTCorrsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalLutMetadataPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalLutMetadataPyWrapper.cc
@@ -19,7 +19,7 @@
 #include "TColor.h"
 #include "TLine.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalPFCorrsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalPFCorrsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalPedestalsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalPedestalsPyWrapper.cc
@@ -19,7 +19,7 @@
 #include "TColor.h"
 #include "TLine.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalQIEDataPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalQIEDataPyWrapper.cc
@@ -19,7 +19,7 @@
 #include "TColor.h"
 #include "TLine.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalRespCorrsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalRespCorrsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalTimeCorrsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalTimeCorrsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalValidationCorrsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalValidationCorrsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondCore/HcalPlugins/plugins/HcalZSThresholdsPyWrapper.cc b/CondCore/HcalPlugins/plugins/HcalZSThresholdsPyWrapper.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include "math.h"
+#include <cmath>
 //functions for correct representation of data in summary and plot:
 #include "CondCore/HcalPlugins/interface/HcalObjRepresent.h"
 using namespace HcalObjRepresent;

diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformanceWorkingPoint.h b/CondFormats/PhysicsToolsObjects/interface/PerformanceWorkingPoint.h
@@ -2,7 +2,7 @@
 #define PerformanceWorkingPoint_h
 
 
-#include "string"
+#include <string>
 
 class PerformanceWorkingPoint {
  public:

diff --git a/CondTools/Hcal/bin/HcalRawIdToReadable.cpp b/CondTools/Hcal/bin/HcalRawIdToReadable.cpp
@@ -1,5 +1,5 @@
 #include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
-#include "stdlib.h"
+#include <cstdlib>
 #include <iostream>
 
 int main(int argc, char* argv[]) {

diff --git a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc
@@ -1,7 +1,7 @@
 #include "CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
-#include "sstream"
+#include <sstream>
 
 SiStripCablingTrackerMap::SiStripCablingTrackerMap(edm::ParameterSet const& conf): 
   conf_(conf)

diff --git a/DPGAnalysis/Skims/src/RPCRecHitFilter.cc b/DPGAnalysis/Skims/src/RPCRecHitFilter.cc
@@ -58,7 +58,7 @@ typedef std::vector<L1MuRegionalCand> L1MuRegionalCandCollection;
 #include <algorithm>
 #include <memory>
 #include <cmath>
-#include "math.h"
+#include <cmath>
 #include "TFile.h"
 #include "TMath.h"
 #include "TTree.h"
@@ -68,7 +68,7 @@ typedef std::vector<L1MuRegionalCand> L1MuRegionalCandCollection;
 #include "TTree.h"
 #include <cstdlib>
 #include <stdio.h>
-#include "stdlib.h"
+#include <cstdlib>
 #include <string>
 #include <memory>
 #include<cmath>

diff --git a/DQM/HLTEvF/plugins/HLTJetMETDQMSource.cc b/DQM/HLTEvF/plugins/HLTJetMETDQMSource.cc
@@ -20,7 +20,7 @@
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "math.h"
+#include <cmath>
 #include "TH1F.h"
 #include "TProfile.h"
 #include "TH2F.h"

diff --git a/DQM/HcalMonitorClient/interface/HcalDQMDbInterface.h b/DQM/HcalMonitorClient/interface/HcalDQMDbInterface.h
@@ -10,7 +10,7 @@
 #include "DQM/HcalMonitorClient/interface/HcalHLXMask.h"
 //#include "CondTools/Hcal/include/HcalDbXml.h"
 
-#include "time.h"
+#include <ctime>
 #include <fstream>
 #include <sstream>
 #include <iostream>

diff --git a/DQM/SiStripCommon/src/TkHistoMap.cc b/DQM/SiStripCommon/src/TkHistoMap.cc
@@ -117,7 +117,7 @@ std::string TkHistoMap::folderDefinition(std::string& path, std::string& MapName
   return folder;
 }
 
-#include "iostream"
+#include <iostream>
 void TkHistoMap::fillFromAscii(std::string filename){
   std::ifstream file;
   file.open(filename.c_str());

diff --git a/DQM/SiStripCommon/test/TkHistoMapDisplay.C b/DQM/SiStripCommon/test/TkHistoMapDisplay.C
@@ -24,7 +24,7 @@ TkHistoMapDisplay("filaname","dirpat","mapName","filename of the reference file"
 #include "TFile.h"
 #include "TProfile2D.h"
 #include "TString.h"
-#include "iostream"
+#include <iostream>
 
 TFile *_file,*_reffile, *_afile;
 TCanvas *CTIB, *CTOB, *CTEC, *CTID;

diff --git a/DQM/SiStripHistoricInfoClient/test/TrendsWithIOVIterator/template_twoD_lastRuns.cc b/DQM/SiStripHistoricInfoClient/test/TrendsWithIOVIterator/template_twoD_lastRuns.cc
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "vector"
+#include <vector>
 
 
 //---------------------------------------------------------------------------------------------------

diff --git a/DQM/SiStripMonitorDigi/src/SiStripBaselineValidator.cc b/DQM/SiStripMonitorDigi/src/SiStripBaselineValidator.cc
@@ -32,7 +32,7 @@
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TString.h"
-#include "assert.h"
+#include <cassert>
 #include <fstream>
 
 class TFile;

diff --git a/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc b/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
@@ -31,7 +31,7 @@
 #include "TMath.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 
-#include "iostream"
+#include <iostream>
 
 #include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"

diff --git a/DQMOffline/Muon/src/DiMuonHistograms.cc b/DQMOffline/Muon/src/DiMuonHistograms.cc
@@ -20,7 +20,7 @@
 #include "TLorentzVector.h"
 #include "TFile.h"
 #include <vector>
-#include "math.h"
+#include <cmath>
 
 /* C++ Headers */
 #include <iostream>

diff --git a/DQMOffline/Muon/src/EfficiencyAnalyzer.cc b/DQMOffline/Muon/src/EfficiencyAnalyzer.cc
@@ -16,7 +16,7 @@
 #include "TLorentzVector.h"
 #include "TFile.h"
 #include <vector>
-#include "math.h"
+#include <cmath>
 #include <algorithm>
 
 /* C++ Headers */

diff --git a/DQMOffline/Trigger/src/BTagHLTOfflineSource.cc b/DQMOffline/Trigger/src/BTagHLTOfflineSource.cc
@@ -24,7 +24,7 @@
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "math.h"
+#include <cmath>
 #include "TH1F.h"
 #include "TProfile.h"
 #include "TH2F.h"

diff --git a/DQMOffline/Trigger/src/HLTInclusiveVBFSource.cc b/DQMOffline/Trigger/src/HLTInclusiveVBFSource.cc
@@ -31,7 +31,7 @@
 
 #include "JetMETCorrections/Objects/interface/JetCorrector.h"
 
-#include "math.h"
+#include <cmath>
 #include "TH1F.h"
 #include "TProfile.h"
 #include "TH2F.h"

diff --git a/DQMOffline/Trigger/src/JetMETHLTOfflineSource.cc b/DQMOffline/Trigger/src/JetMETHLTOfflineSource.cc
@@ -35,7 +35,7 @@
 #include "TProfile.h"
 #include "TPRegexp.h"
 
-#include "math.h"
+#include <cmath>
 
 using namespace edm;
 using namespace reco;

diff --git a/DQMServices/Diagnostic/interface/HDQMInspector.h b/DQMServices/Diagnostic/interface/HDQMInspector.h
@@ -14,11 +14,11 @@
 //
 //---------------------------------------------------------//
 
-#include "vector"
-#include "string"
-#include "iostream"
+#include <vector>
+#include <string>
+#include <iostream>
 #include <fstream>
-#include "cmath"
+#include <cmath>
 #include "CondCore/Utilities/interface/CondCachedIter.h"
 #include "CondFormats/DQMObjects/interface/HDQMSummary.h"
 #include "DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h"

diff --git a/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc b/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc
@@ -5,7 +5,7 @@
 */
 
 #include <iostream>
-#include "time.h"
+#include <ctime>
 
 #include "GeneratorInterface/PyquenInterface/interface/PyquenHadronizer.h"
 #include "GeneratorInterface/PyquenInterface/interface/PyquenWrapper.h"

diff --git a/HeavyIonsAnalysis/Configuration/macros/fwliteExample.C b/HeavyIonsAnalysis/Configuration/macros/fwliteExample.C
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include "math.h"
+#include <cmath>
 
 #include <TH1D.h>
 #include <TH2D.h>

diff --git a/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc b/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc
@@ -5,7 +5,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include "L1Trigger/CSCTrackFinder/test/src/TFTrack.h"
-#include "iostream"
+#include <iostream>
 namespace csctf_analysis
 {
   TFTrack::TFTrack():Track() {}

diff --git a/L1Trigger/GlobalMuonTrigger/src/L1MuGMTLUT.h b/L1Trigger/GlobalMuonTrigger/src/L1MuGMTLUT.h
@@ -52,7 +52,7 @@
 //#include <sstream>
 #include <string>
 #include <stdlib.h>
-#include "stdio.h"
+#include <cstdio>
 
 //----------------------
 // Base Class Headers --

diff --git a/OnlineDB/CSCCondDB/src/CSCChamberTimeCorrectionsReadTest.cc b/OnlineDB/CSCCondDB/src/CSCChamberTimeCorrectionsReadTest.cc
@@ -1,5 +1,5 @@
 #include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h"
-#include "string"
+#include <string>
 
 CSCChamberTimeCorrectionsReadTest::CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet&){}
 CSCChamberTimeCorrectionsReadTest::~CSCChamberTimeCorrectionsReadTest(){}