ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/UHHAnalysis/SFrameTools/src/EventCalc.cxx

Comparing UserCode/UHHAnalysis/SFrameTools/src/EventCalc.cxx (file contents):
Revision 1.9 by peiffer, Wed Oct 31 09:48:57 2012 UTC vs.
Revision 1.11 by peiffer, Wed Jun 12 12:33:40 2013 UTC

#	Line 42 | Line 42 | void EventCalc::Reset()
42		// when they are accessed
43
44		// (re-)set the pointers using the ObjectHandler
45	<	ObjectHandler* objs = ObjectHandler::Instance();
46	<	m_bcc = objs->GetBaseCycleContainer();
47	<	m_lumi = objs->GetLumiHandler();
45	>
46	>	//m_bcc = ?
47	>	//m_lumi = ?
48
49		// reset booleans
50		b_HT = false;
#	Line 54 | Line 54 | void EventCalc::Reset()
54		m_TotalWeight = 1.;
55
56		m_primlep = NULL;
57	+	delete m_ttgen;
58		m_ttgen = NULL;
59
60		}
61
62	+	void EventCalc::SetBaseCycleContainer(BaseCycleContainer* bcc)
63	+	{
64	+	// set the internal pointer to the container with all objects
65	+	m_bcc = bcc;
66	+	m_logger << DEBUG << "Pointer to BaseCycleContainer set." << SLogger::endmsg;
67	+	}
68	+
69	+	void EventCalc::SetLumiHandler(LuminosityHandler* lh)
70	+	{
71	+	// set the internal pointer to the container with all objects
72	+	m_lumi = lh;
73	+	m_logger << DEBUG << "Pointer to LumiHandler set." << SLogger::endmsg;
74	+	}
75	+
76		BaseCycleContainer* EventCalc::GetBaseCycleContainer()
77		{
78		// return the pointer to the container with all objects
#	Line 160 | Line 175 | Particle* EventCalc::GetPrimaryLepton(){
175		TTbarGen* EventCalc::GetTTbarGen(){
176
177		if(!m_ttgen){
178	<	m_ttgen = new TTbarGen();
178	>	m_ttgen = new TTbarGen(m_bcc);
179		}
180
181		return m_ttgen;

Diff Legend

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