ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/online_src.patch
Revision: 1.1
Committed: Tue Jun 30 21:24:18 2009 UTC (15 years, 10 months ago) by muzaffar
Branch: MAIN
Log Message:
added patch for cmssw310 sources for online build , basically cleanup of unneeded header includes and BuildFuiles fixes

File Contents

# User Rev Content
1 muzaffar 1.1 diff -Nur Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc
2     --- Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc 2009-06-30 20:19:34.000000000 +0200
3     +++ Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc 2009-06-30 17:44:35.000000000 +0200
4     @@ -78,7 +78,7 @@
5     #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
6     #include "TrackingTools/TrajectoryState/interface/CopyUsingClone.h"
7     #include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h"
8     -#include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
9     +//#include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
10    
11     #include "Geometry/DTGeometry/interface/DTGeometry.h"
12     #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
13     diff -Nur DQM/CSCMonitorModule/BuildFile DQM/CSCMonitorModule/BuildFile
14     --- DQM/CSCMonitorModule/BuildFile 2009-06-30 20:16:39.000000000 +0200
15     +++ DQM/CSCMonitorModule/BuildFile 2009-06-30 17:52:10.000000000 +0200
16     @@ -6,6 +6,7 @@
17     <use name=DQMServices/Core>
18     <use name=DQMServices/Components>
19     <use name=EventFilter/CSCRawToDigi>
20     +<use name=xerces-c>
21     <export>
22     <lib name=DQMCSCMonitorModule>
23     </export>
24     diff -Nur DQM/DTMonitorClient/BuildFile DQM/DTMonitorClient/BuildFile
25     --- DQM/DTMonitorClient/BuildFile 2009-06-30 20:16:12.000000000 +0200
26     +++ DQM/DTMonitorClient/BuildFile 2009-06-30 19:04:42.000000000 +0200
27     @@ -14,7 +14,7 @@
28     <use name=DQM/DTMonitorModule>
29     <use name=boost>
30     <use name=rootgraphics>
31     -
32     +<use name=CondFormats/RunInfo>
33     <export>
34     <lib name=DQMDTMonitorClient>
35     <use name=FWCore/Framework>
36     @@ -34,4 +34,5 @@
37     <use name=CalibMuon/DTCalibration>
38     <use name=boost>
39     <use name=rootgraphics>
40     + <use name=CondFormats/RunInfo>
41     </export>
42     diff -Nur DQM/SiPixelMonitorClient/BuildFile DQM/SiPixelMonitorClient/BuildFile
43     --- DQM/SiPixelMonitorClient/BuildFile 2009-06-30 20:16:31.000000000 +0200
44     +++ DQM/SiPixelMonitorClient/BuildFile 2009-06-30 18:54:05.000000000 +0200
45     @@ -15,6 +15,8 @@
46     <use name=DQM/SiPixelCommon>
47     <use name=DQM/TrackerCommon>
48     <use name=boost>
49     +<use name=EventFilter/Utilities>
50     +<use name=CondFormats/RunInfo>
51     <flags EDM_PLUGIN=1>
52     <export>
53     <lib name=DQMSiPixelMonitorClient>
54     @@ -33,4 +35,6 @@
55     <use name=DQM/SiPixelCommon>
56     <use name=DQM/TrackerCommon>
57     <use name=boost>
58     +<use name=EventFilter/Utilities>
59     +<use name=CondFormats/RunInfo>
60     </export>
61     diff -Nur HLTrigger/HLTanalyzers/interface/HLTEgamma.h HLTrigger/HLTanalyzers/interface/HLTEgamma.h
62     --- HLTrigger/HLTanalyzers/interface/HLTEgamma.h 2009-06-30 20:15:19.000000000 +0200
63     +++ HLTrigger/HLTanalyzers/interface/HLTEgamma.h 2009-06-30 17:08:27.000000000 +0200
64     @@ -49,7 +49,7 @@
65     #include "DataFormats/Math/interface/Point3D.h"
66     #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
67     #include "MagneticField/Engine/interface/MagneticField.h"
68     -#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
69     +//#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
70     #include "DataFormats/Common/interface/ValueMap.h"
71    
72     /** \class HLTEgamma
73     diff -Nur RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc
74     --- RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc 2009-06-30 20:19:15.000000000 +0200
75     +++ RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc 2009-06-30 17:52:42.000000000 +0200
76     @@ -282,7 +282,7 @@
77    
78    
79     #include "CondFormats/BTauObjects/interface/TrackProbabilityCalibration.h"
80     -#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
81     +//#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
82     #include "CondFormats/DataRecord/interface/BTagTrackProbability2DRcd.h"
83     #include "CondFormats/DataRecord/interface/BTagTrackProbability3DRcd.h"
84     #include "FWCore/Framework/interface/EventSetupRecord.h"
85     diff -Nur RecoBTag/SoftLepton/plugins/SoftLepton.cc RecoBTag/SoftLepton/plugins/SoftLepton.cc
86     --- RecoBTag/SoftLepton/plugins/SoftLepton.cc 2009-06-30 20:19:14.000000000 +0200
87     +++ RecoBTag/SoftLepton/plugins/SoftLepton.cc 2009-06-30 17:53:17.000000000 +0200
88     @@ -60,7 +60,8 @@
89     #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
90     #include "TrackingTools/Records/interface/TransientTrackRecord.h"
91     #include "TrackingTools/IPTools/interface/IPTools.h"
92     -#include "RecoVertex/PrimaryVertexProducer/interface/PrimaryVertexSorter.h"
93     +#include "DataFormats/VertexReco/interface/VertexFwd.h"
94     +//#include "RecoVertex/PrimaryVertexProducer/interface/PrimaryVertexSorter.h"
95     #include "SoftLepton.h"
96    
97     enum AxisType {
98     diff -Nur RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc
99     --- RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc 2009-06-30 20:16:53.000000000 +0200
100     +++ RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc 2009-06-30 17:39:31.000000000 +0200
101     @@ -1,5 +1,6 @@
102     #include "RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.h"
103     #include "TVector2.h"
104     +#include "TMath.h"
105     #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
106     #include "DataFormats/EgammaReco/interface/BasicCluster.h"
107     #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
108     @@ -13,13 +14,13 @@
109     #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
110     #include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
111     //photon conversion MC truth:
112     -#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
113     -#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
114     -#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
115     -#include "SimDataFormats/Track/interface/SimTrack.h"
116     -#include "SimDataFormats/Track/interface/SimTrackContainer.h"
117     -#include "SimDataFormats/Vertex/interface/SimVertex.h"
118     -#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
119     +//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
120     +//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
121     +//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
122     +//#include "SimDataFormats/Track/interface/SimTrack.h"
123     +//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
124     +//#include "SimDataFormats/Vertex/interface/SimVertex.h"
125     +//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
126    
127    
128     //////From DummyHepMCAnalyzer.cc:
129     diff -Nur RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc
130     --- RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc 2009-06-30 20:16:53.000000000 +0200
131     +++ RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc 2009-06-30 17:38:09.000000000 +0200
132     @@ -1,5 +1,6 @@
133     #include "RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.h"
134     #include "TVector2.h"
135     +#include "TMath.h"
136     #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
137     #include "DataFormats/EgammaReco/interface/BasicCluster.h"
138     #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
139     @@ -13,13 +14,13 @@
140     #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
141     #include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
142     //photon conversion MC truth:
143     -#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
144     -#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
145     -#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
146     -#include "SimDataFormats/Track/interface/SimTrack.h"
147     -#include "SimDataFormats/Track/interface/SimTrackContainer.h"
148     -#include "SimDataFormats/Vertex/interface/SimVertex.h"
149     -#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
150     +//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
151     +//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
152     +//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
153     +//#include "SimDataFormats/Track/interface/SimTrack.h"
154     +//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
155     +//#include "SimDataFormats/Vertex/interface/SimVertex.h"
156     +//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
157    
158    
159     //////From DummyHepMCAnalyzer.cc:
160     diff -Nur RecoHI/HiTracking/BuildFile RecoHI/HiTracking/BuildFile
161     --- RecoHI/HiTracking/BuildFile 2009-06-30 20:20:08.000000000 +0200
162     +++ RecoHI/HiTracking/BuildFile 2009-06-30 17:54:50.000000000 +0200
163     @@ -17,9 +17,9 @@
164     <use name=TrackingTools/Records>
165     <use name=RecoLocalTracker/Records>
166     <use name=MagneticField/Records>
167     -<use name=RecoPixelVertexing/PixelLowPtUtilities>
168     +#<use name=RecoPixelVertexing/PixelLowPtUtilities>
169     <export>
170     - <lib name=RecoPixelVertexingPixelLowPtUtilities>
171     +# <lib name=RecoPixelVertexingPixelLowPtUtilities>
172     <use name=FWCore/Framework>
173     <use name=FWCore/ParameterSet>
174     <use name=FWCore/PluginManager>