Skip to content

Commit 85356ec

Browse files
mmusichmmusich
committed
clean-up include files
1 parent 29d368b commit 85356ec

File tree

3 files changed

+32
-66
lines changed

3 files changed

+32
-66
lines changed

‎CalibTracker/SiStripHitResolution/interface/HitResol.h‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,33 @@
1+
#ifndef CalibTracker_SiStripHitResolution_HitResol_H
2+
#define CalibTracker_SiStripHitResolution_HitResol_H
3+
4+
// system includes
5+
#include <vector>
6+
7+
// user includes
18
#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
29
#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
3-
#include "CommonTools/UtilAlgos/interface/TFileService.h"
410
#include "DataFormats/Common/interface/Handle.h"
5-
#include "DataFormats/DetId/interface/DetIdCollection.h"
6-
#include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h"
7-
#include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
8-
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
911
#include "DataFormats/Scalers/interface/LumiScalers.h"
10-
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
11-
#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
12-
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
1312
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
14-
#include "FWCore/Framework/interface/ESHandle.h"
1513
#include "FWCore/Framework/interface/Event.h"
1614
#include "FWCore/Framework/interface/EventSetup.h"
1715
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
1816
#include "FWCore/ParameterSet/interface/ParameterSet.h"
19-
#include "FWCore/ServiceRegistry/interface/Service.h"
20-
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
2117
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
2218
#include "MagneticField/Engine/interface/MagneticField.h"
2319
#include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h"
2420
#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
25-
#include "RecoTracker/SingleTrackPattern/interface/CosmicTrajectoryBuilder.h"
26-
#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
27-
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
28-
#include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
21+
#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
2922
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
30-
#include "TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h"
31-
#include "TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h"
32-
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
3323
#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
3424

35-
#include "TRandom2.h"
25+
// ROOT includes
3626
#include "TTree.h"
3727
#include "TROOT.h"
38-
#include "TFile.h"
3928
#include "TH1F.h"
4029
#include "TH2F.h"
4130

42-
#include <vector>
43-
#include <iostream>
44-
#include <cstdlib>
45-
#include <cstdio>
46-
4731
class TrackerTopology;
4832

4933
class HitResol : public edm::one::EDAnalyzer<edm::one::SharedResources> {
@@ -176,4 +160,4 @@ class HitResol : public edm::one::EDAnalyzer<edm::one::SharedResources> {
176160
int Nstrips_2;
177161
};
178162

179-
//#endif
163+
#endif

‎CalibTracker/SiStripHitResolution/plugins/SiStripHitResolFromCalibTree.cc‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
11
//Original Author: Christopher Edelmaier
22
// Created: Feb. 11, 2010
3-
#include <memory>
4-
#include <string>
5-
#include <iostream>
3+
4+
// system include files
65
#include <fstream>
6+
#include <iostream>
7+
#include <memory>
78
#include <sstream>
9+
#include <string>
810

11+
// user includes
912
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
1013
#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
1114
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
1215
#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
1316
#include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
14-
//#include "CalibTracker/SiStripHitEfficiency/interface/TrajectoryAtInvalidHit.h"
1517
#include "CalibTracker/SiStripHitEfficiency/interface/SiStripHitEfficiencyHelpers.h"
1618
#include "CalibTracker/SiStripHitResolution/interface/HitResol.h"
1719
#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
1820
#include "CommonTools/TrackerMap/interface/TrackerMap.h"
1921
#include "CommonTools/UtilAlgos/interface/TFileService.h"
20-
#include "DataFormats/Common/interface/DetSetVector.h"
21-
#include "DataFormats/Common/interface/DetSetVectorNew.h"
2222
#include "DataFormats/Common/interface/Handle.h"
23-
#include "DataFormats/DetId/interface/DetIdCollection.h"
2423
#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
2524
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
2625
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
2726
#include "DataFormats/GeometryVector/interface/LocalVector.h"
28-
#include "DataFormats/MuonReco/interface/Muon.h"
29-
#include "DataFormats/MuonReco/interface/MuonFwd.h"
30-
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
3127
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
32-
#include "DataFormats/TrackReco/interface/DeDxData.h"
33-
#include "DataFormats/TrackReco/interface/Track.h"
34-
#include "DataFormats/TrackReco/interface/TrackExtra.h"
35-
#include "DataFormats/TrackReco/interface/TrackFwd.h"
3628
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
37-
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
3829
#include "FWCore/Framework/interface/ESHandle.h"
3930
#include "FWCore/Framework/interface/Event.h"
4031
#include "FWCore/Framework/interface/EventSetup.h"
@@ -48,30 +39,25 @@
4839
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
4940
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
5041
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
51-
#include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h"
52-
#include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
53-
#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
54-
#include "TrackingTools/DetLayers/interface/DetLayer.h"
55-
#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
56-
#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
5742

58-
#include "TFile.h"
43+
// ROOT includes
5944
#include "TCanvas.h"
60-
#include "TObjString.h"
61-
#include "TString.h"
62-
#include "TH1F.h"
63-
#include "TH2F.h"
64-
#include "TProfile.h"
45+
#include "TEfficiency.h"
6546
#include "TF1.h"
66-
#include "TROOT.h"
67-
#include "TTree.h"
68-
#include "TStyle.h"
69-
#include "TLeaf.h"
47+
#include "TFile.h"
7048
#include "TGaxis.h"
7149
#include "TGraphAsymmErrors.h"
50+
#include "TH1F.h"
51+
#include "TH2F.h"
7252
#include "TLatex.h"
53+
#include "TLeaf.h"
7354
#include "TLegend.h"
74-
#include "TEfficiency.h"
55+
#include "TObjString.h"
56+
#include "TProfile.h"
57+
#include "TROOT.h"
58+
#include "TString.h"
59+
#include "TStyle.h"
60+
#include "TTree.h"
7561

7662
using namespace edm;
7763
using namespace reco;

‎CalibTracker/SiStripHitResolution/src/HitResol.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@
1212
#include <string>
1313
#include <iostream>
1414

15+
// user includes
1516
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
1617
#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
1718
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
1819
#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
1920
#include "CalibTracker/SiStripHitEfficiency/interface/SiStripHitEfficiencyHelpers.h"
2021
#include "CalibTracker/SiStripHitResolution/interface/HitResol.h"
2122
#include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
22-
#include "DataFormats/Common/interface/DetSetVector.h"
23-
#include "DataFormats/Common/interface/DetSetVectorNew.h"
23+
#include "CommonTools/UtilAlgos/interface/TFileService.h"
2424
#include "DataFormats/Common/interface/Handle.h"
2525
#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
2626
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
2727
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
2828
#include "DataFormats/GeometryVector/interface/LocalVector.h"
29-
#include "DataFormats/MuonReco/interface/Muon.h"
30-
#include "DataFormats/MuonReco/interface/MuonFwd.h"
3129
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
3230
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
3331
#include "DataFormats/TrackReco/interface/Track.h"
@@ -45,6 +43,7 @@
4543
#include "FWCore/Framework/interface/Frameworkfwd.h"
4644
#include "FWCore/Framework/interface/MakerMacros.h"
4745
#include "FWCore/ParameterSet/interface/ParameterSet.h"
46+
#include "FWCore/ServiceRegistry/interface/Service.h"
4847
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
4948
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
5049
#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
@@ -58,16 +57,13 @@
5857
#include "TrackingTools/AnalyticalJacobians/interface/AnalyticalCurvilinearJacobian.h"
5958
#include "TrackingTools/AnalyticalJacobians/interface/JacobianCurvilinearToLocal.h"
6059
#include "TrackingTools/AnalyticalJacobians/interface/JacobianLocalToCurvilinear.h"
61-
#include "TrackingTools/DetLayers/interface/DetLayer.h"
62-
#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
6360
#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
6461
#include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
6562

63+
// ROOT includes
6664
#include "TMath.h"
6765
#include "TH1F.h"
6866

69-
#include "vdt/vdtMath.h"
70-
7167
//
7268
// constructors and destructor
7369
//

0 commit comments

Comments
 (0)