ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing UserCode/MitAna/TreeMod/src/HLTFwkMod.cc (file contents):
Revision 1.6 by loizides, Mon Mar 23 14:39:52 2009 UTC vs.
Revision 1.9 by loizides, Mon Jun 15 15:00:17 2009 UTC

#	Line 7 | Line 7
7		#include "MitAna/DataTree/interface/Names.h"
8		#include "MitAna/DataTree/interface/TriggerName.h"
9		#include "MitAna/DataTree/interface/TriggerObject.h"
10	+	#include "MitAna/DataTree/interface/TriggerObjectCol.h"
11
12		using namespace mithep;
13
#	Line 118 | Line 119 | void HLTFwkMod::BeginRun()
119
120		// load trigger table
121		if (runinfo->HltEntry()!=fCurEnt) {
122	<	MDB(kFramework, 1)
122	>	MDB(kAnalysis, 1)
123		Info("BeginRun", "Loading trigger table for run %ld", runinfo->RunNum());
124
125		fCurEnt = runinfo->HltEntry();
#	Line 129 | Line 130 | void HLTFwkMod::BeginRun()
130		return;
131		}
132
133	<	MDB(kFramework, 2) {
133	>	MDB(kAnalysis, 2) {
134		Info("BeginRun", "Printing tables for run %ld", runinfo->RunNum());
135		cout << " --- Trigger table ---" << endl;
136		fTriggers->Print();
#	Line 147 | Line 148 | Bool_t HLTFwkMod::LoadTriggerTable()
148		if (fCurEnt<0)
149		return kFALSE;
150
150	–	if ((fCurEnt==1) && (fHLTTree->GetEntries()==1)) {
151	–	if (1)
152	–	SendError(kWarning, "LoadTriggerTable",
153	–	"Loading trigger table omitted due to a bug fix for Mit_006.");
154	–	return kTRUE;
155	–	}
156	–
151		// delete old tables
152		fTriggers->Delete();
153		fLabels->Delete();
#	Line 163 | Line 157 | Bool_t HLTFwkMod::LoadTriggerTable()
157		fHLTLab = 0;
158		Int_t ret = fHLTTree->GetEvent(fCurEnt);
159		if (ret<0 || fHLTTab==0 || fHLTTab==0 ) {
160	<	::Error("LoadTriggerTable", "Could not get trigger data for next entry (%ld).", fCurEnt);
160	>	SendError(kAbortAnalysis, "LoadTriggerTable",
161	>	"Could not get trigger data for next entry (%ld).", fCurEnt);
162		return kFALSE;
163		}
164
#	Line 171 | Line 166 | Bool_t HLTFwkMod::LoadTriggerTable()
166		if (fHLTTab->size()>fNMaxTriggers) {
167		SendError(kAbortAnalysis, "LoadTriggerTable",
168		"Size of trigger table (%ld) larger than maximum (%ld).",
169	<	fHLTTab->Entries(), fNMaxTriggers);
169	>	fHLTTab->size(), fNMaxTriggers);
170		return kFALSE;
171		}
172

Diff Legend

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