ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitAna/TreeMod/src/Analysis.cc

Comparing UserCode/MitAna/TreeMod/src/Analysis.cc (file contents):
Revision 1.14 by loizides, Tue Jul 8 14:42:09 2008 UTC vs.
Revision 1.15 by loizides, Sun Sep 28 02:36:23 2008 UTC

#	Line 17 | Line 17
17		#include "MitAna/TAM/interface/TAModule.h"
18		#include "MitAna/TreeMod/interface/Selector.h"
19		#include "MitAna/TreeMod/interface/TreeLoader.h"
20	+	#include "MitAna/TreeMod/interface/HLTFwkMod.h"
21		#include "MitAna/Catalog/interface/Dataset.h"
22
23		ClassImp(mithep::Analysis)
#	Line 26 | Line 27 | using namespace mithep;
27		//--------------------------------------------------------------------------------------------------
28		Analysis::Analysis(Bool_t useproof) :
29		fUseProof(useproof),
30	+	fUseHLT(kTRUE),
31		fHierachy(kTRUE),
32		fState(kPristine),
33		fNFriends(0),
#	Line 327 | Line 329 | Bool_t Analysis::Init()
329		fLoaders->Add(bl);
330		fDeleteList->Add(bl);
331
332	+	// create our HLT framework module
333	+	HLTFwkMod *hltmod = 0;
334	+	if (fUseHLT) {
335	+	hltmod = new HLTFwkMod;
336	+	fDeleteList->Add(hltmod);
337	+	}
338	+
339		if (fUseProof) {
340
341	+	if (hltmod)
342	+	fProof->AddInput(hltmod);
343	+
344		fProof->AddInput(fSuperMod);
345		fLoaders->SetName("TAM_LOADERS");
346		fProof->AddInput(fLoaders);
#	Line 337 | Line 349 | Bool_t Analysis::Init()
349
350		// when not running Proof, we must make a selector
351		fSelector = new Selector;
352	+
353	+	if (hltmod)
354	+	fSelector->AddInput(hltmod);
355	+
356		fSelector->AddInput(fSuperMod);
357		MDB(kAnalysis, 2)
358		fSelector->SetVerbosity(1);
#	Line 492 | Line 508 | void Analysis::Terminate()
508		delete fChain;
509		delete fSet;
510		fDeleteList->Delete();
495	–
496	–	fState = kTerminate;
511		}
512
513		//--------------------------------------------------------------------------------------------------

Diff Legend

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