ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing UserCode/MitAna/TreeMod/src/HLTMod.cc (file contents):
Revision 1.19 by bendavid, Tue Sep 14 22:51:28 2010 UTC vs.
Revision 1.21 by bendavid, Sun May 15 20:40:30 2011 UTC

#	Line 28 | Line 28 | HLTMod::HLTMod(const char *name, const c
28		fTriggers(0),
29		fTrigObjs(0),
30		fNEvents(0),
31	<	fNAcceped(0),
31	>	fNAccepted(0),
32		fNFailed(0)
33		{
34		// Constructor.
#	Line 58 | Line 58 | void HLTMod::AddTrigObjs(UInt_t tid)
58		{
59		// Add trigger objects corresponding to trigger id.
60
61	<	const BitMask256 &ba = fTrigBitsAnd.at(tid);
62	<	const BitMask256 &bm = fTrigBitsCmp.at(tid);
61	>	const BitMask1024 &ba = fTrigBitsAnd.at(tid);
62	>	const BitMask1024 &bm = fTrigBitsCmp.at(tid);
63		for (UInt_t i=0; i<bm.Size(); ++i) {
64		if (ba.TestBit(i)==0 && !fIgnoreBits)
65		continue; // not an active trigger bit
#	Line 102 | Line 102 | void HLTMod::BeginRun()
102		for (UInt_t i=0; i<fTrigNames.size(); ++i) {
103
104		UInt_t firstRun = fTrigNames.at(i).second.first;
105	<	UInt_t lastRun = fTrigNames.at(i).second.second;
105	>	UInt_t lastRun  = fTrigNames.at(i).second.second;
106
107	<	if ( (!(firstRun==0 && lastRun==0)) && ( runNumber<firstRun || runNumber>lastRun ) ) continue;
107	>	// implement run dependence of the triggers
108	>	if ( (!(firstRun==0 && lastRun==0)) &&
109	>	( runNumber<firstRun || runNumber>lastRun ) )
110	>	continue;
111
112	<	BitMask256 tmask; //trigger mask
113	<	BitMask256 amask; //bitand mask
112	>	BitMask1024 tmask; //trigger mask
113	>	BitMask1024 amask; //bitand mask
114		TString names(fTrigNames.at(i).first.c_str());
115
116		TObjArray *arr = names.Tokenize("&");
#	Line 167 | Line 170 | void HLTMod::Process()
170		fBitsDone.Clear();
171		Bool_t accept = kFALSE;
172		for (UInt_t i = 0; i<fTrigBitsAnd.size(); ++i) {
173	<	BitMask256 bitmask(fBits->Get());
173	>	BitMask1024 bitmask(fBits->Get());
174		bitmask &= fTrigBitsAnd.at(i);
175		if (bitmask==fTrigBitsCmp.at(i)) {
176		accept = kTRUE;
#	Line 187 | Line 190 | void HLTMod::Process()
190		}
191
192		// take action if accepted
193	<	++fNAcceped;
193	>	++fNAccepted;
194		IncNEventsProcessed();
195		OnAccepted();
196		if (!AddObjThisEvt(fMyTrgObjs)) {
#	Line 223 | Line 226 | void HLTMod::SlaveTerminate()
226		{
227		// Save number of accepted events.
228
229	+	printf(" %s - Accepted events: %d (/%d)\n",GetName(),fNAccepted,fNEvents);
230		SaveNEventsProcessed("hDHLTEvents");
231		}

Diff Legend

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