ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/grimes/L1Menu/src/TriggerMenu.cpp

Comparing UserCode/grimes/L1Menu/src/TriggerMenu.cpp (file contents):
Revision 1.5 by grimes, Tue Jun 18 10:18:23 2013 UTC vs.
Revision 1.7 by grimes, Mon Jun 24 14:47:38 2013 UTC

#	Line 5 | Line 5
5		#include <sstream>
6		#include <iostream>
7		#include "l1menu/ITrigger.h"
8	+	#include "l1menu/tools/tools.h"
9
10		namespace // Use the unnamed namespace for things only used in this file
11		{
#	Line 49 | Line 50 | namespace // Use the unnamed namespace f
50		return returnValue;
51		}
52
52	–	/** @brief Converts a value in absolute eta to the calorimeter region. */
53	–	float convertEtaCutToRegionCut( float etaCut )
54	–	{
55	–	return 0;
56	–	}
57	–
58	–	/** @brief Converts a value in calorimeter region to absolute eta. */
59	–	float convertRegionCutToEtaCut( float regionCut )
60	–	{
61	–	return 0;
62	–	}
53		} // end of the unnamed namespace
54
55
#	Line 247 | Line 237 | void l1menu::TriggerMenu::loadMenuInOldF
237		// value to be the regionCut, except for L1_SingleMu_CJet which expects it as the etaCut.
238		if( triggerName=="L1_SingleMu_CJet" )
239		{
240	<	newTrigger.parameter("etaCut")=etaOrRegionCut;
241	<	newTrigger.parameter("regionCut")=convertEtaCutToRegionCut( etaOrRegionCut );
240	>	newTrigger.parameter("leg1etaCut")=etaOrRegionCut;
241	>	newTrigger.parameter("leg2regionCut")=l1menu::tools::convertEtaCutToRegionCut( etaOrRegionCut );
242		}
243		else if( triggerName=="L1_SingleIsoEG_CJet" )
244		{
245	<	newTrigger.parameter("etaCut")=etaOrRegionCut;
246	<	newTrigger.parameter("regionCut")=convertEtaCutToRegionCut( etaOrRegionCut );
245	>	newTrigger.parameter("leg1regionCut")=etaOrRegionCut;
246	>	newTrigger.parameter("leg2regionCut")=etaOrRegionCut;
247		}
248		else
249		{

Diff Legend

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