fix major warnings (use AthAlgTool and AthService) (TrigT2CaloCommon-00-01-69)

	* fix major warning
	* tagged as TrigT2CaloCommon-00-01-69

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/IAlgToolCalo.h

@@ -24,7 +24,7 @@
 #define TRIGT2CALOCOMMON_IALGTOOLCALO_H
 
 #include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/AlgTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
 
@@ -59,11 +59,11 @@ static const InterfaceID IID_IAlgToolCalo("IAlgToolCalo",1,0);
 /** Base Class for Tools used for Egamma and Tau Feature
 	Extraction Algorithms */
 class IAlgToolCalo: public virtual IAlgTool, 
-                       public AlgTool {
+                       public AthAlgTool {
   public:
     /** Constructor */
     IAlgToolCalo(const std::string & type, const std::string & name,
-                 const IInterface* parent) : AlgTool(type,name,parent),
+                 const IInterface* parent) : AthAlgTool(type,name,parent),
 		 m_timersvc("TrigTimerSvc","IAlgToolCalo"),
 		 m_geometryTool("T2GeometryTool/T2GeometryTool", this ),
 		 m_data("TrigDataAccess/TrigDataAccess"),

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/T2CaloInitSvc.h

@@ -16,10 +16,10 @@
  */
 
 #include <string>
-#include "GaudiKernel/Service.h"
+#include "AthenaBaseComps/AthService.h"
 #include "TrigT2CaloCommon/IT2CaloInitSvc.h"
 
-class T2CaloInitSvc : public Service,
+class T2CaloInitSvc : public AthService,
                  virtual public IT2CaloInitSvc
 {
     public:

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/T2GeometryTool.h

@@ -16,7 +16,7 @@
 
 #ifndef TRIGT2CALO_T2GEOMETRY
 #define TRIGT2CALO_T2GEOMETRY
-#include "GaudiKernel/AlgTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/MsgStream.h"
 #include "TrigT2CaloCommon/T2GeometryTool.h"
 #include "TrigT2CaloCommon/IT2GeometryTool.h"
@@ -24,7 +24,7 @@
 #include <math.h>
 
 
-class T2GeometryTool : virtual public IT2GeometryTool , public AlgTool{
+class T2GeometryTool : virtual public IT2GeometryTool , public AthAlgTool{
 public :
 	/** Constructor. Loads cluster size definition tables. */
 	T2GeometryTool (const std::string & type, const std::string &name,

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccess.h

@@ -77,13 +77,13 @@ class ICaloLumiBCIDTool;
 
 /** Class that provides access to data for
     Calorimeter LVL2 Algorithms */
-class TrigDataAccess: virtual public ITrigDataAccess, public AlgTool,
+class TrigDataAccess: virtual public ITrigDataAccess, public AthAlgTool,
 		      virtual public IIncidentListener {
 public:
   /** Real Constructor */
   TrigDataAccess(const std::string & type, const std::string & name,
                  const IInterface* parent) 
-  : AlgTool(type,name,parent),
+  : AthAlgTool(type,name,parent),
     m_pRegionSelector("RegSelSvc/RegSelSvc","TrigDataAccess"),
     m_robDataProvider("ROBDataProviderSvc/ROBDataProviderSvc","TrigDataAccess"),
     m_lardecoder("LArRodDecoder/LArRodDecoder"),

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccessATLFAST.h

@@ -21,7 +21,7 @@
 #define TRIGT2CALOCOMMONATLFAST_TRIGDATAACCESS_H
 
 #include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/AlgTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/IProperty.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
@@ -68,12 +68,12 @@ class T2CaloConfig;
 
 /** Class that provides access to data for
     Calorimeter LVL2 Algorithms */
-class TrigDataAccessATLFAST: virtual public ITrigDataAccess, public AlgTool,
+class TrigDataAccessATLFAST: virtual public ITrigDataAccess, public AthAlgTool,
 	virtual public IIncidentListener {
   public:
     /** Real Constructor */
     TrigDataAccessATLFAST(const std::string & type, const std::string & name,
-                 const IInterface* parent) : AlgTool(type,name,parent),
+                 const IInterface* parent) : AthAlgTool(type,name,parent),
 		 m_pRegionSelector("RegSelSvc/RegSelSvc","TrigDataAccess"){
 	declareInterface<ITrigDataAccess>(this); 
 	declareProperty("RegSelSvc",m_pRegionSelector,"Region Selector Service access");
@@ -154,7 +154,7 @@ class TrigDataAccessATLFAST: virtual public ITrigDataAccess, public AlgTool,
     
     void RegionSelectorRobID (const int sampling, const double etamin,
 			      const double etamax, const double phimin, const double phimax,
-			      const DETID detid=TTEM, bool fetchROBs = true) { 
+			      const DETID detid=TTEM, bool /* fetchROBs*/ = true) { 
       TrigRoiDescriptor roi( 0.5*(etamin+etamax), etamin, etamax, HLT::phimean(phimin,phimax), phimin, phimax);
       RegionSelectorRobID(sampling, roi, detid);
     }

Trigger/TrigAlgorithms/TrigT2CaloCommon/cmt/requirements

@@ -8,9 +8,10 @@ author Pilar Casado <casado@ifae.es>
 public
 use AtlasPolicy         AtlasPolicy-*
 use GaudiInterface      GaudiInterface-*             External
-#use AtlasAIDA           AtlasAIDA-00-*               External
-#use AtlasCLHEP          AtlasCLHEP-*                 External
+#use AtlasAIDA          AtlasAIDA-00-*               External
+#use AtlasCLHEP         AtlasCLHEP-*                 External
 use AthenaKernel	AthenaKernel-*		     Control
+use AthenaBaseComps     AthenaBaseComps-*	     Control
 use DataCollection      DataCollection-*             External
 
 use StoreGate           StoreGate-*                  Control

Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx

@@ -20,7 +20,7 @@ using namespace std;
 //const ISvcFactory& T2CaloInitSvcFactory = s_factory; 
 
 T2CaloInitSvc::T2CaloInitSvc(const std::string& name,ISvcLocator* sl) :
-    Service(name,sl) 
+    AthService(name,sl) 
 {
 }
 
@@ -33,7 +33,7 @@ StatusCode T2CaloInitSvc::queryInterface(const InterfaceID& riid, void** ppvIF)
     } else { 
         MsgStream log(messageService(), name());
         log << MSG::DEBUG << name() << " cannot found the interface!" <<endreq;
-        return Service::queryInterface(riid, ppvIF); 
+        return AthService::queryInterface(riid, ppvIF); 
     }
     return StatusCode::SUCCESS;
 } 
@@ -45,7 +45,7 @@ StatusCode T2CaloInitSvc::initialize()
     MsgStream log(messageService(), name());
     log << MSG::DEBUG << name() << ": Start of run initialisation" << endreq;
 
-    sc = Service::initialize();
+    sc = AthService::initialize();
     if ( sc.isFailure() ) return sc;
     
     //ISvcLocator* svcLoc = Gaudi::svcLocator( );

Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2GeometryTool.cxx

@@ -8,7 +8,7 @@
 #include "TrigT2CaloCommon/T2GeometryTool.h"
 
 T2GeometryTool::T2GeometryTool(const std::string &type, const std::string & name,
-                    const IInterface* parent) : AlgTool(type,name,parent)
+                    const IInterface* parent) : AthAlgTool(type,name,parent)
 {
 
   declareInterface<IT2GeometryTool>(this);
@@ -73,7 +73,7 @@ T2GeometryTool::~T2GeometryTool()
 StatusCode T2GeometryTool::initialize()
 {
 
-  m_log = new MsgStream(AlgTool::msgSvc(), name());
+  m_log = new MsgStream(AthAlgTool::msgSvc(), name());
 #ifndef NDEBUG
     (*m_log) << MSG::INFO << "in initialize() by T2GeometryTool" << endreq;
 #endif