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.18 by loizides, Tue Dec 1 15:14:11 2009 UTC vs.
Revision 1.19 by bendavid, Tue Sep 14 22:51:28 2010 UTC

#	Line 41 | Line 41 | HLTMod::~HLTMod()
41		}
42
43		//--------------------------------------------------------------------------------------------------
44	<	void HLTMod::AddTrigger(const char *expr)
44	>	void HLTMod::AddTrigger(const char *expr, UInt_t firstRun, UInt_t lastRun)
45		{
46		// Add trigger search pattern to the list of patters. Each element of the list is logically
47		// "ored". The given expression can contain several trigger names logically "anded" (using "&").
#	Line 49 | Line 49 | void HLTMod::AddTrigger(const char *expr
49		// "A", "!A", "A&B", "A&!B" or "A&B&C"
50
51		string tname(expr);
52	<	fTrigNames.push_back(tname);
52	>	std::pair<std::string,std::pair<UInt_t,UInt_t> > element(tname,std::pair<UInt_t,UInt_t>(firstRun,lastRun));
53	>	fTrigNames.push_back(element);
54		}
55
56		//--------------------------------------------------------------------------------------------------
#	Line 95 | Line 96 | void HLTMod::BeginRun()
96		Info("BeginRun", "Get trigger table for run %d", GetEventHeader()->RunNum());
97		fTriggers->Print();
98		}
99	+
100	+	UInt_t runNumber = GetEventHeader()->RunNum();
101
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;
106	+
107	+	if ( (!(firstRun==0 && lastRun==0)) && ( runNumber<firstRun || runNumber>lastRun ) ) continue;
108	+
109		BitMask256 tmask; //trigger mask
110		BitMask256 amask; //bitand mask
111	<	TString names(fTrigNames.at(i).c_str());
111	>	TString names(fTrigNames.at(i).first.c_str());
112
113		TObjArray *arr = names.Tokenize("&");
114		if (arr) {

Diff Legend

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