ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/Morgan/interface/PhotonAssociator.h

Comparing UserCode/Morgan/interface/PhotonAssociator.h (file contents):
Revision 1.3 by mlethuil, Wed May 28 16:33:59 2008 UTC vs.
Revision 1.6 by mlethuil, Wed Sep 3 15:02:32 2008 UTC

#	Line 8 | Line 8
8
9		#include "FWCore/Framework/interface/Event.h"
10		#include "FWCore/Framework/interface/ESHandle.h"
11	+	#include "FWCore/ParameterSet/interface/FileInPath.h"
12	+
13	+	#include "DataFormats/GeometryVector/interface/GlobalVector.h"
14	+	#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
15	+
16	+	#include "DataFormats/TrackReco/interface/HitPattern.h"
17
18		#include "DataFormats/EgammaCandidates/interface/ConvertedPhoton.h"
19	+	#include "RecoEgamma/EgammaTools/interface/ConversionLikelihoodCalculator.h"
20
21		#include "UserCode/Morgan/interface/TRootPhoton.h"
22		#include "UserCode/Morgan/interface/TRootSuperCluster.h"
23	+	#include "UserCode/Morgan/interface/TRootTrack.h"
24
25		#include "TClonesArray.h"
26
#	Line 24 | Line 32 | public:
32		~PhotonAssociator();
33		void SetVerbosity(int idebug) {verbosity = idebug; };
34		void AssociateSuperCluster(TClonesArray* photons, TClonesArray* superClusters);
35	<	void AssociateConversion(const edm::Event& iEvent, TClonesArray* photons, TClonesArray* superClusters, TClonesArray* conversionTracks);
35	>	void AssociateConversion(const edm::Event& iEvent, TClonesArray* photons, TClonesArray* superClusters, TClonesArray* conversionTracks, ConversionLikelihoodCalculator* convLikelihoodCalculator);
36		void PrintPhotons(TClonesArray* photons, TClonesArray* superClusters,  Int_t type);
37		void FullPrintPhotons(TClonesArray* photons, TClonesArray* superClusters, TClonesArray* basicClusters,  Int_t type);
38
39		private:
40		int verbosity;
41		int iconvtrack;
42	<
42	>
43		};
44
45		#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines