Migrating to xAOD::EventInfo (EventTagAlgs-00-04-30)

	* Migrating to xAOD::EventInfo

2014-08-04 Gabriele Sabato <gabriele.sabato@cern.cn>
	* Modified src/ParticleJetTagBuilder.h and src/MissingETTagBuilder.h ToolHandle<>
	* Tagging EventTagAlgs-00-04-29

PhysicsAnalysis/EventTag/EventTagAlgs/cmt/requirements

@@ -17,7 +17,7 @@ use AtlasPOOL                	AtlasPOOL-*                	External
 use StoreGate                	StoreGate-*                	Control
 use AthenaBaseComps       	AthenaBaseComps-*		Control
 
-use EventInfo                	EventInfo-*                	Event
+use xAODEventInfo               xAODEventInfo-*                	Event/xAOD
 use EventTagUtils	     	EventTagUtils-*			PhysicsAnalysis/EventTag
 use AnalysisTriggerEvent     	AnalysisTriggerEvent-*		PhysicsAnalysis/AnalysisTrigger
 

PhysicsAnalysis/EventTag/EventTagAlgs/src/EventSplitter.cxx

@@ -9,8 +9,7 @@
 #include "AthenaPoolUtilities/AthenaAttributeListSpecification.h"
 #include "AthenaPoolUtilities/TagAthenaAttributeList.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/TriggerInfo.h"
+#include "xAODEventInfo/EventInfo.h"
 
 #include "StoreGate/StoreGateSvc.h"
 
@@ -101,8 +100,8 @@ StatusCode EventSplitter::execute()
 
   // get Trigger Type Word for EventInfo
 
-  const DataHandle<EventInfo> eventInfo;
-  const DataHandle<EventInfo> eventInfoEnd;
+  const DataHandle<xAOD::EventInfo> eventInfo;
+  const DataHandle<xAOD::EventInfo> eventInfoEnd;
   StatusCode sc = m_StoreGate->retrieve(eventInfo, eventInfoEnd);
   if (sc.isFailure())
     {
@@ -115,10 +114,7 @@ StatusCode EventSplitter::execute()
       return sc;
     }
 
-  uint32_t triggerTypeWord = 0;
-  const TriggerInfo *tInfo = eventInfo->trigger_info();
-  if (tInfo!=0)
-    triggerTypeWord = tInfo->level1TriggerType();
+  uint32_t triggerTypeWord = eventInfo->level1TriggerType();
 
   // get CTP_Decision
   const CTP_Decision * ctpDecision = 0;

PhysicsAnalysis/EventTag/EventTagAlgs/src/MissingETTagBuilder.h

@@ -40,7 +40,7 @@ private:
   StoreGateSvc* m_storeGateSvc;
 
   //! Jet and Missing Tag Tool
-  ToolHandle<JetMissingEtTagTool> m_jetMissingEtTagTool;
+  ToolHandle<JetMetTagTool> m_jetMissingEtTagTool;
 
 };
 

PhysicsAnalysis/EventTag/EventTagAlgs/src/ParticleJetTagBuilder.h

@@ -43,7 +43,7 @@ private:
   StoreGateSvc* m_storeGateSvc;
 
   //! Jet and Missing Tag Tool
-  ToolHandle<JetMissingEtTagTool> m_jetMissingEtTagTool;
+  ToolHandle<JetMetTagTool> m_jetMissingEtTagTool;
 
 };