COMP/CMSDIST/online_src.patch

diff -Nur src/DQM/CSCMonitorModule/BuildFile src/DQM/CSCMonitorModule/BuildFile
--- src/DQM/CSCMonitorModule/BuildFile  2009-06-30 20:16:39.000000000 +0200
+++ src/DQM/CSCMonitorModule/BuildFile  2009-06-30 17:52:10.000000000 +0200
@@ -6,6 +6,7 @@
 <use name=DQMServices/Core>
 <use name=DQMServices/Components>
 <use name=EventFilter/CSCRawToDigi>
+<use name=xerces-c>
 <export>
   <lib name=DQMCSCMonitorModule>
 </export>
diff -Nur src/DQM/SiPixelMonitorClient/BuildFile src/DQM/SiPixelMonitorClient/BuildFile
--- src/DQM/SiPixelMonitorClient/BuildFile      2009-06-30 20:16:31.000000000 +0200
+++ src/DQM/SiPixelMonitorClient/BuildFile      2009-06-30 18:54:05.000000000 +0200
@@ -17,6 +17,8 @@
 <use name=DQM/SiPixelCommon>
 <use name=DQM/TrackerCommon>
 <use name=boost>
+<use name=EventFilter/Utilities>
+<use name=CondFormats/RunInfo>
 <flags EDM_PLUGIN=1>
 <export>
 <lib name=DQMSiPixelMonitorClient>
@@ -37,4 +39,6 @@
 <use name=DQM/SiPixelCommon>
 <use name=DQM/TrackerCommon>
 <use name=boost>
+<use name=EventFilter/Utilities>
+<use name=CondFormats/RunInfo>
 </export>
diff -Nur src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h
--- src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h    2009-06-30 20:15:19.000000000 +0200
+++ src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h    2009-06-30 17:08:27.000000000 +0200
@@ -49,7 +49,7 @@
 #include "DataFormats/Math/interface/Point3D.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
+//#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 
 /** \class HLTEgamma
diff -Nur src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc
--- src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc     2009-06-30 20:19:15.000000000 +0200
+++ src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc     2009-06-30 17:52:42.000000000 +0200
@@ -282,7 +282,7 @@
 
 
 #include "CondFormats/BTauObjects/interface/TrackProbabilityCalibration.h"
-#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
+//#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
 #include "CondFormats/DataRecord/interface/BTagTrackProbability2DRcd.h"
 #include "CondFormats/DataRecord/interface/BTagTrackProbability3DRcd.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
diff -Nur src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc
--- src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc  2009-06-30 20:16:53.000000000 +0200
+++ src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc  2009-06-30 17:39:31.000000000 +0200
@@ -1,5 +1,6 @@
 #include "RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.h"
 #include "TVector2.h"
+#include "TMath.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
@@ -13,13 +14,13 @@
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
 //photon conversion MC truth:
-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
-#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertex.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
+//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
+//#include "SimDataFormats/Track/interface/SimTrack.h"
+//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+//#include "SimDataFormats/Vertex/interface/SimVertex.h"
+//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 
 //////From DummyHepMCAnalyzer.cc:
diff -Nur src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc
--- src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc      2009-06-30 20:16:53.000000000 +0200
+++ src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc      2009-06-30 17:38:09.000000000 +0200
@@ -1,5 +1,6 @@
 #include "RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.h"
 #include "TVector2.h"
+#include "TMath.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
@@ -13,13 +14,13 @@
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
 //photon conversion MC truth:
-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
-#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertex.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
+//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
+//#include "SimDataFormats/Track/interface/SimTrack.h"
+//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+//#include "SimDataFormats/Vertex/interface/SimVertex.h"
+//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 
 //////From DummyHepMCAnalyzer.cc:
Revision:	1.6
Committed:	Tue Jul 21 12:40:56 2009 UTC (15 years, 9 months ago) by muzaffar
Branch:	MAIN
CVS Tags:	CMSSW_3_2_1_onlpatch6_ONLINE, sm090829a, CMSSW_3_2_1_onlpatch5_ONLINE, sm090826a, CMSSW_3_2_1_onlpatch4_ONLINE, sm090818a, sm090813c, sm090813b, sm090813a, CMSSW_3_2_1_onlpatch3_ONLINE, sm090810a, CMSSW_3_2_1_onlpatch2_ONLINE, sm090806a, CMSSW_3_2_1_onlpatch1_ONLINE, apFor321onlp1v1, apFor321onlp1v0, CMSSW_3_2_1_ONLINE, CMSSW_3_2_1, sm090721b
Changes since 1.5:	+0 -17 lines
Log Message:	remove dthe patch for src/DQM/TrigXMonitor/BuildFile which is already went in to 3.2.1
#	Content
1	diff -Nur src/DQM/CSCMonitorModule/BuildFile src/DQM/CSCMonitorModule/BuildFile
2	--- src/DQM/CSCMonitorModule/BuildFile 2009-06-30 20:16:39.000000000 +0200
3	+++ src/DQM/CSCMonitorModule/BuildFile 2009-06-30 17:52:10.000000000 +0200
4	@@ -6,6 +6,7 @@
5	<use name=DQMServices/Core>
6	<use name=DQMServices/Components>
7	<use name=EventFilter/CSCRawToDigi>
8	+<use name=xerces-c>
9	<export>
10	<lib name=DQMCSCMonitorModule>
11	</export>
12	diff -Nur src/DQM/SiPixelMonitorClient/BuildFile src/DQM/SiPixelMonitorClient/BuildFile
13	--- src/DQM/SiPixelMonitorClient/BuildFile 2009-06-30 20:16:31.000000000 +0200
14	+++ src/DQM/SiPixelMonitorClient/BuildFile 2009-06-30 18:54:05.000000000 +0200
15	@@ -17,6 +17,8 @@
16	<use name=DQM/SiPixelCommon>
17	<use name=DQM/TrackerCommon>
18	<use name=boost>
19	+<use name=EventFilter/Utilities>
20	+<use name=CondFormats/RunInfo>
21	<flags EDM_PLUGIN=1>
22	<export>
23	<lib name=DQMSiPixelMonitorClient>
24	@@ -37,4 +39,6 @@
25	<use name=DQM/SiPixelCommon>
26	<use name=DQM/TrackerCommon>
27	<use name=boost>
28	+<use name=EventFilter/Utilities>
29	+<use name=CondFormats/RunInfo>
30	</export>
31	diff -Nur src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h
32	--- src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h 2009-06-30 20:15:19.000000000 +0200
33	+++ src/HLTrigger/HLTanalyzers/interface/HLTEgamma.h 2009-06-30 17:08:27.000000000 +0200
34	@@ -49,7 +49,7 @@
35	#include "DataFormats/Math/interface/Point3D.h"
36	#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
37	#include "MagneticField/Engine/interface/MagneticField.h"
38	-#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
39	+//#include "RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h"
40	#include "DataFormats/Common/interface/ValueMap.h"
41
42	/** \class HLTEgamma
43	diff -Nur src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc
44	--- src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc 2009-06-30 20:19:15.000000000 +0200
45	+++ src/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc 2009-06-30 17:52:42.000000000 +0200
46	@@ -282,7 +282,7 @@
47
48
49	#include "CondFormats/BTauObjects/interface/TrackProbabilityCalibration.h"
50	-#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
51	+//#include "RecoBTag/XMLCalibration/interface/CalibrationInterface.h"
52	#include "CondFormats/DataRecord/interface/BTagTrackProbability2DRcd.h"
53	#include "CondFormats/DataRecord/interface/BTagTrackProbability3DRcd.h"
54	#include "FWCore/Framework/interface/EventSetupRecord.h"
55	diff -Nur src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc
56	--- src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc 2009-06-30 20:16:53.000000000 +0200
57	+++ src/RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.cc 2009-06-30 17:39:31.000000000 +0200
58	@@ -1,5 +1,6 @@
59	#include "RecoEcal/EgammaCoreTools/plugins/EcalClusterCrackCorrection.h"
60	#include "TVector2.h"
61	+#include "TMath.h"
62	#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
63	#include "DataFormats/EgammaReco/interface/BasicCluster.h"
64	#include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
65	@@ -13,13 +14,13 @@
66	#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
67	#include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
68	//photon conversion MC truth:
69	-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
70	-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
71	-#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
72	-#include "SimDataFormats/Track/interface/SimTrack.h"
73	-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
74	-#include "SimDataFormats/Vertex/interface/SimVertex.h"
75	-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
76	+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
77	+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
78	+//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
79	+//#include "SimDataFormats/Track/interface/SimTrack.h"
80	+//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
81	+//#include "SimDataFormats/Vertex/interface/SimVertex.h"
82	+//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
83
84
85	//////From DummyHepMCAnalyzer.cc:
86	diff -Nur src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc
87	--- src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc 2009-06-30 20:16:53.000000000 +0200
88	+++ src/RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.cc 2009-06-30 17:38:09.000000000 +0200
89	@@ -1,5 +1,6 @@
90	#include "RecoEcal/EgammaCoreTools/plugins/EcalClusterLocalContCorrection.h"
91	#include "TVector2.h"
92	+#include "TMath.h"
93	#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
94	#include "DataFormats/EgammaReco/interface/BasicCluster.h"
95	#include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
96	@@ -13,13 +14,13 @@
97	#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
98	#include "Geometry/CaloGeometry/interface/TruncatedPyramid.h"
99	//photon conversion MC truth:
100	-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
101	-#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
102	-#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
103	-#include "SimDataFormats/Track/interface/SimTrack.h"
104	-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
105	-#include "SimDataFormats/Vertex/interface/SimVertex.h"
106	-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
107	+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h"
108	+//#include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruth.h"
109	+//#include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
110	+//#include "SimDataFormats/Track/interface/SimTrack.h"
111	+//#include "SimDataFormats/Track/interface/SimTrackContainer.h"
112	+//#include "SimDataFormats/Vertex/interface/SimVertex.h"
113	+//#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
114
115
116	//////From DummyHepMCAnalyzer.cc: