Commit b91c0288 authored by Antoine Marzin's avatar Antoine Marzin Committed by Graeme Stewart
Browse files

Fix direct TIPs loading in MenuLoader.cxx (TrigConfStorage-03-01-24)

	* Fix TIPs loading in MenuLoader.cxx: isDirect is now set to true for direct input
	* TrigConfStorage-03-01-24


Former-commit-id: 9fc85c3d
parent c3de3820
...@@ -403,7 +403,7 @@ TrigConf::MenuLoader::loadThresholds(TrigConf::Menu& menu) { ...@@ -403,7 +403,7 @@ TrigConf::MenuLoader::loadThresholds(TrigConf::Menu& menu) {
if( menu.pitVector().size() == menu.tipVector().size() ) { if( menu.pitVector().size() == menu.tipVector().size() ) {
// this is the case when we // this is the case when we
// a) have either no direct inputs in the menu (unlikely, but then the next call doesn't matter), or // a) have either no direct inputs in the menu (unlikely, but then the next call doesn't matter), or
// b) the direct inputs were not filled in the TIP map (which is the case until we switch that feature on in the TriggerTool) // b) the direct inputs were not filled in the TIP map: this is not the case since TriggerTool-04-01-06
createTipFromDirectThresholds(menu); createTipFromDirectThresholds(menu);
} }
...@@ -513,7 +513,8 @@ TrigConf::MenuLoader::loadPIT(TrigConf::Menu& menu) { ...@@ -513,7 +513,8 @@ TrigConf::MenuLoader::loadPIT(TrigConf::Menu& menu) {
tip->setTriggerThresholdId(ttid); tip->setTriggerThresholdId(ttid);
tip->setThresholdActive(tt->active()); tip->setThresholdActive(tt->active());
tip->setThresholdMapping(tt->mapping()); tip->setThresholdMapping(tt->mapping());
tip->setIsDirect(false); if(slot==10) tip->setIsDirect(true);
else tip->setIsDirect(false);
menu.addTip(tip); menu.addTip(tip);
ntips++; ntips++;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment