Commit 07983c0d authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

fixing compiler warning (MuonGeoModelTest-04-00-12)

	* fixing compiler warning
	* tagging MuonGeoModelTest-04-00-12

2015-06-10 Jochen Meyer
	* updating NSWGeoSetup.py to use CfgGetter for NSWAGDDTool
	* tagging MuonGeoModelTest-04-00-11

2015-06-06 Jochen Meyer
	* updating NSWGeoSetup.py (OBO Andrea Dell'Acqua)
	* tagging MuonGeoModelTest-04-00-10

2015-05-11 Jochen Meyer
	* addressing coverity defects 12722-3
	* tagging MuonGeoModelTest-04-00-09

2015-04-13  scott snyder  <snyder@bnl.gov>

	* Tagging MuonGeoModelTest-04-00-08.
	* AthenaBaseComps migration.
parent 1b50f27e
......@@ -2,6 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
test MuonGeoModel from digits to pos. in space
----------------------------------------------
......@@ -14,29 +15,12 @@
#ifndef MUONGEOMODEL_MUONGMCHECK_H
# define MUONGEOMODEL_MUONGMCHECK_H
//<<<<<< INCLUDES >>>>>>
//<<<<<< PUBLIC DEFINES >>>>>>
//<<<<<< PUBLIC CONSTANTS >>>>>>
//<<<<<< PUBLIC TYPES >>>>>>
//<<<<<< PUBLIC VARIABLES >>>>>>
//<<<<<< PUBLIC FUNCTIONS >>>>>>
//<<<<<< CLASS DECLARATIONS >>>>>>
#include "GaudiKernel/Algorithm.h"
//#include "MuonGeoModel/MuonDetectorManager.h"
//#include "MuonGeoModel/MuonReadoutElement.h"
//#include "MuonIdHelpers/MdtIdHelper.h"
//#include "MuonIdHelpers/CscIdHelper.h"
//#include "MuonIdHelpers/RpcIdHelper.h"
//#include "MuonIdHelpers/TgcIdHelper.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "MuonCalibITools/IIdToFixedIdTool.h"
class StoreGateSvc;
class ActiveStoreSvc;
class MdtIdHelper;
class CscIdHelper;
class RpcIdHelper;
......@@ -51,9 +35,7 @@ namespace MuonGM
class MuonDetectorManager;
}
//<<<<<< INLINE PUBLIC FUNCTIONS >>>>>>
//<<<<<< INLINE MEMBER FUNCTIONS >>>>>>
class MuonGMCheck: public Algorithm
class MuonGMCheck: public AthAlgorithm
{
public:
......@@ -106,10 +88,6 @@ private:
// Pointers to the event
StoreGateSvc* p_EventStore;
ActiveStoreSvc* p_ActiveStore;
const MuonGM::MuonDetectorManager* p_MuonMgr;
const RpcIdHelper* p_RpcIdHelper;
const TgcIdHelper* p_TgcIdHelper;
......@@ -120,8 +98,8 @@ private:
ToolHandle<MuonCalib::IIdToFixedIdTool> m_fixedIdTool;
int _mem; //<! counter for memory allocated VmSize values read from /proc/<pid>/status
int _cpu[2]; //<! counter for cpu time read from /proc/<pid>/cpu
int m_mem; //<! counter for memory allocated VmSize values read from /proc/<pid>/status
int m_cpu[2]; //<! counter for cpu time read from /proc/<pid>/cpu
void showVmemCpu(std::string message);
void getVmemCpu(int& dVmem, int& duCpu, int& dsCpu);
......
......@@ -11,15 +11,7 @@
#ifndef MUONGEOMODEL_MUONGMTESTONPRD_H
# define MUONGEOMODEL_MUONGMTESTONPRD_H
//<<<<<< INCLUDES >>>>>>
//<<<<<< PUBLIC DEFINES >>>>>>
//<<<<<< PUBLIC CONSTANTS >>>>>>
//<<<<<< PUBLIC TYPES >>>>>>
//<<<<<< PUBLIC VARIABLES >>>>>>
//<<<<<< PUBLIC FUNCTIONS >>>>>>
//<<<<<< CLASS DECLARATIONS >>>>>>
#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonIdHelpers/MdtIdHelper.h"
......@@ -35,11 +27,6 @@
#include "Identifier/IdentifierHash.h"
using namespace MuonGM;
using namespace Muon;
class StoreGateSvc;
class ActiveStoreSvc;
......@@ -47,9 +34,7 @@ class ActiveStoreSvc;
//class MuonReadoutElement;
//<<<<<< INLINE PUBLIC FUNCTIONS >>>>>>
//<<<<<< INLINE MEMBER FUNCTIONS >>>>>>
class MuonGMTestOnPrd: public Algorithm
class MuonGMTestOnPrd: public AthAlgorithm
{
public:
......@@ -62,31 +47,23 @@ public:
private:
// bool
bool m_debug, m_verbose;
// Pointers to the event
StoreGateSvc* p_EventStore;
// ActiveStoreSvc* p_ActiveStore;
const MuonDetectorManager* p_MuonMgr;
const RpcIdHelper* p_RpcIdHelper;
const TgcIdHelper* p_TgcIdHelper;
const CscIdHelper* p_CscIdHelper;
const MdtIdHelper* p_MdtIdHelper;
bool _mdt;
bool _rpc;
bool _tgc;
bool _csc;
bool _check_misal;
const MuonGM::MuonDetectorManager* m_MuonMgr;
const RpcIdHelper* m_RpcIdHelper;
const TgcIdHelper* m_TgcIdHelper;
const CscIdHelper* m_CscIdHelper;
const MdtIdHelper* m_MdtIdHelper;
bool m_mdt;
bool m_rpc;
bool m_tgc;
bool m_csc;
bool m_check_misal;
void processMdtCollection(const MdtPrepDataCollection* mdtColl,
void processMdtCollection(const Muon::MdtPrepDataCollection* mdtColl,
Identifier& collid,
IdentifierHash& collidh) const;
void processMdtCollectionOld(const MdtPrepDataCollection* mdtColl,
void processMdtCollectionOld(const Muon::MdtPrepDataCollection* mdtColl,
Identifier& collid,
IdentifierHash& collidh) const;
......
......@@ -5,7 +5,7 @@
#ifndef MUON_HIT_RELOCATION_H
#define MUON_HIT_RELOCATION_H
#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
#include "MuonSimEvent/RpcHitIdHelper.h"
#include "MuonSimEvent/TgcHitIdHelper.h"
......@@ -19,7 +19,7 @@
// Detector. Used to validate GeoModel + much more.
class MuonHitRelocation: public Algorithm {
class MuonHitRelocation: public AthAlgorithm {
public:
MuonHitRelocation(const std::string& name, ISvcLocator* pSvcLocator);
......@@ -31,22 +31,22 @@ public:
private:
bool _checkMdt;
bool _checkRpc;
bool _checkTgc;
bool _checkCsc;
bool _checksTgc;
bool _checkMM;
bool m_checkMdt;
bool m_checkRpc;
bool m_checkTgc;
bool m_checkCsc;
bool m_checksTgc;
bool m_checkMM;
class Clockwork;
Clockwork *c;
RpcHitIdHelper* rmuonHelper;
MdtHitIdHelper* mmuonHelper;
TgcHitIdHelper* tmuonHelper;
CscHitIdHelper* cmuonHelper;
sTgcHitIdHelper* stmuonHelper;
MicromegasHitIdHelper* mmmuonHelper;
Clockwork *m_c;
RpcHitIdHelper* m_rmuonHelper;
MdtHitIdHelper* m_mmuonHelper;
TgcHitIdHelper* m_tmuonHelper;
CscHitIdHelper* m_cmuonHelper;
sTgcHitIdHelper* m_stmuonHelper;
MicromegasHitIdHelper* m_mmmuonHelper;
};
......
......@@ -11,6 +11,7 @@ use MuonSimEvent MuonSimEvent-* MuonSpectromet
use MuonPrepRawData MuonPrepRawData-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
use MuonCalibITools MuonCalibITools-* MuonSpectrometer/MuonCalib
use AthenaBaseComps AthenaBaseComps-* Control
private
......@@ -26,7 +27,6 @@ use RegionSelector RegionSelector-* DetectorDescri
use EventInfo EventInfo-* Event
use MuonAlignmentData MuonAlignmentData-* MuonSpectrometer/MuonAlignment
use AtlasROOT AtlasROOT-* External
#use AthenaBaseComps AthenaBaseComps-* Control
use AtlasBoost AtlasBoost-* External
......
# Select geometry version
if not 'DetDescrVersion' in dir():
DetDescrVersion="ATLAS-GEO-21-00-01"
DetDescrVersion="ATLAS-R2-2015-03-00-00"
#DetDescrVersion="ATLAS-GEOTEST"
print 'MuonGeoModelTest/NSWGeoSetup DetDescrVersion now set to ', DetDescrVersion
else:
print 'MuonGeoModelTest/NSWGeoSetup DetDescrVersion is already ', DetDescrVersion
from AthenaCommon.JobProperties import jobproperties
jobproperties.Global.DetDescrVersion = DetDescrVersion
......@@ -21,8 +21,9 @@ GeoModelSvc = GeoModelSvc()
if DetDescrVersion=="ATLAS-GEOTEST" or DetDescrVersion=="ATLAS-GEO-21-00-01":
# do nothing
print 'NSWGeoSetup: no need to override tag on the MuonSpectrometer Node with ATLAS tag ', DetDescrVersion
print 'Be aware that the job is running with NSW TDR setup!'
else:
GeoModelSvc.MuonVersionOverride="MuonSpectrometer-R.06.03-NSW.01.64"
GeoModelSvc.MuonVersionOverride="MuonSpectrometer-R.07.00-NSW"
print GeoModelSvc
#***************************************************** HERE setup MuonDetectorManager
......@@ -38,15 +39,14 @@ MuonDetectorTool.SelectedStations += [ "CSS*" ]
MuonDetectorTool.SelectedStations += [ "CSL*" ]
MuonDetectorTool.SelectedStations += [ "T4E*" ]
MuonDetectorTool.SelectedStations += [ "T4F*" ]
from AGDD2Geo.AGDD2GeoConf import AGDD2GeoSvc
Agdd2GeoSvc = AGDD2GeoSvc()
if not hasattr(Agdd2GeoSvc, 'OverrideConfiguration') or not Agdd2GeoSvc.OverrideConfiguration :
Agdd2GeoSvc.Locked = True
Agdd2GeoSvc.PrintSections = False
# The following 4 lines were relevant only before porting the NSW description in Oracle
#Agdd2GeoSvc.XMLFiles += ["stations.v1.63.xml"]
#Agdd2GeoSvc.Sections += ["NewSmallWheel"] ##### needed for v1.63
#Agdd2GeoSvc.DisableSections = False
Agdd2GeoSvc.PrintLevel = 1
theApp.CreateSvc += ["AGDD2GeoSvc"]
from AGDD2GeoSvc.AGDD2GeoSvcConf import AGDDtoGeoSvc
Agdd2GeoSvc = AGDDtoGeoSvc()
if not "NSWAGDDTool/NewSmallWheel" in Agdd2GeoSvc.Builders:
from AthenaCommon import CfgGetter
ToolSvc += CfgGetter.getPublicTool("NewSmallWheel", checkType=True)
Agdd2GeoSvc.Builders += ["NSWAGDDTool/NewSmallWheel"]
theApp.CreateSvc += ["AGDDtoGeoSvc"]
ServiceMgr += Agdd2GeoSvc
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