diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h index e40c06f9da7af23d6a20a14a95aab76f6faf5680..4e33591c1a1720b879fd2918c65409a338853174 100644 --- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h +++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h @@ -5,7 +5,6 @@ #ifndef GEOMODELSVC_GEOMODELSVC_H #define GEOMODELSVC_GEOMODELSVC_H -#include "GeoModelKernel/GeoPVConstLink.h" #include "GeoModelInterfaces/IGeoModelSvc.h" #include "GeoModelInterfaces/IGeoDbTagSvc.h" #include "GeoModelInterfaces/IGeoModelTool.h" diff --git a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VP1GeometrySystem.h b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VP1GeometrySystem.h index 224e2d5f015f9f6b3ebaa454d9bc9330a48fc7e6..79a8286a365797d1fd4cf03ef88bfdb539ac82bf 100644 --- a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VP1GeometrySystem.h +++ b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VP1GeometrySystem.h @@ -17,8 +17,12 @@ // // ///////////////////////////////////////////////////////////////////////// +// GeoModel +#include "GeoPrimitives/GeoPrimitives.h" +// +#include "GeoModelKernel/GeoVPhysVol.h" + #include "VP1Base/IVP13DSystemSimple.h" -#include "GeoModelKernel/GeoPVConstLink.h"//It would be good to get rid of this. #include "VTI12GeometrySystems/VP1GeoFlags.h" #include "VTI12GeometrySystems/VolumeHandle.h"//fixme #include <set> diff --git a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandle.h b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandle.h index 5642fdfca940f4f97c362e4d784b251ff28814fb..722b62dc7955baa8be5a9f61ae3432ab729150eb 100644 --- a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandle.h +++ b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandle.h @@ -8,7 +8,6 @@ #include <vector> #include "VTI12GeometrySystems/VP1GeoFlags.h" -#include "GeoModelKernel/GeoPVConstLink.h" #include <QString> //Only initialises child classes on demand. And even then their SoNodes are not initialised until they must be shown. diff --git a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandleSharedData.h b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandleSharedData.h index dbc9b1d35d5e66ec2984581dc9bf5d399513beb9..12d931f3d138cda78ea71804631e8772c96974fa 100644 --- a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandleSharedData.h +++ b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/VTI12GeometrySystems/VolumeHandleSharedData.h @@ -8,7 +8,6 @@ //This reference counted class keeps data (and related methods) which are common //for all volume handle nodes under a given top-level handle. -#include "GeoModelKernel/GeoPVConstLink.h" #include "VTI12GeometrySystems/VP1GeoFlags.h" #include <map> class SoNode; diff --git a/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/PRDHandleBase.h b/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/PRDHandleBase.h index c91208db1851db786955f52347e5479703482b4d..0947ed2302a0c82c2f4412679a792511e7aa2b7e 100644 --- a/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/PRDHandleBase.h +++ b/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/PRDHandleBase.h @@ -9,10 +9,10 @@ #include "VTI12PRDSystems/PRDSysCommonData.h" -#include "GeoModelKernel/GeoPVConstLink.h" - -//#include "CLHEP/Geometry/Transform3D.h" +// GeoModel #include "GeoPrimitives/GeoPrimitives.h" +// +#include "GeoModelKernel/GeoVPhysVol.h" #include <QFlags> #include <QStringList> diff --git a/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/VP1PrepRawDataSystem.h b/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/VP1PrepRawDataSystem.h index b4957860c7fd71b769a6285148ed08570dc62471..d9127c6ee5ce421fe340d99070e471ca6e12ecbf 100644 --- a/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/VP1PrepRawDataSystem.h +++ b/graphics/VTI12/VTI12Systems/VTI12PRDSystems/VTI12PRDSystems/VP1PrepRawDataSystem.h @@ -5,8 +5,12 @@ #ifndef VP1PREPRAWDATASYSTEM_H #define VP1PREPRAWDATASYSTEM_H +// GeoModel +#include "GeoPrimitives/GeoPrimitives.h" +// +#include "GeoModelKernel/GeoVPhysVol.h" + #include "VP1Base/IVP13DSystemSimple.h" -#include "GeoModelKernel/GeoPVConstLink.h"//It would be good to get rid of this. // #include "VTI12Utils/InDetProjFlags.h" #include <vector> #include <QList> diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/TrackHandleBase.h b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/TrackHandleBase.h index 0dcde264b470b19dc82f306d4eacb3b5542f98af..9293f530b9dd1f694e4c72fb7ec1afa4cd75c326 100644 --- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/TrackHandleBase.h +++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/TrackHandleBase.h @@ -20,10 +20,11 @@ #include "VTI12TrackSystems/TrackCommonFlags.h" #include "TrkEventPrimitives/ParticleHypothesis.h" -#include "GeoModelKernel/GeoPVConstLink.h" -//#include "CLHEP/Geometry/Point3D.h" +// GeoModel #include "GeoPrimitives/GeoPrimitives.h" +// +#include "GeoModelKernel/GeoVPhysVol.h" #include <QStringList> #include <QTreeWidgetItem> diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/VP1TrackSystem.h b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/VP1TrackSystem.h index d34a0e902535b563ef51ba16b4c7532c3b405ffc..1fc248473c041d61419863131935044a4d645047 100644 --- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/VP1TrackSystem.h +++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/VTI12TrackSystems/VP1TrackSystem.h @@ -19,7 +19,6 @@ #include "VP1Base/IVP13DSystemSimple.h" // #include "VTI12Utils/InDetProjFlags.h" -#include "GeoModelKernel/GeoPVConstLink.h" #include <QList> #include <vector> #include <map> diff --git a/graphics/VTI12/VTI12Utils/VTI12Utils/VP1JobConfigInfo.h b/graphics/VTI12/VTI12Utils/VTI12Utils/VP1JobConfigInfo.h index 96c80ac470dedb37562dc2b6d7e1c38ff5bec9c3..9fe0e4f23514a377692917a8b9c22a3e233c160a 100644 --- a/graphics/VTI12/VTI12Utils/VTI12Utils/VP1JobConfigInfo.h +++ b/graphics/VTI12/VTI12Utils/VTI12Utils/VP1JobConfigInfo.h @@ -18,10 +18,12 @@ #ifndef VTI12UTILS_VP1JOBCONFIGINFO_H #define VTI12UTILS_VP1JOBCONFIGINFO_H +// GeoModel +#include "GeoPrimitives/GeoPrimitives.h" +// +#include "GeoModelKernel/GeoVPhysVol.h" class IVP1System; class StoreGateSvc; -class GeoPhysVol; -class GeoPVConstLink; class VP1JobConfigInfo { public: diff --git a/graphics/VTI12/VTI12Utils/src/VP1DetInfo.cxx b/graphics/VTI12/VTI12Utils/src/VP1DetInfo.cxx index b92e7cf2c2f1f066c2177de36448b49f8bf78fcb..92970658fd02b1ca9efa7beb1fc6c7673e4fb36b 100644 --- a/graphics/VTI12/VTI12Utils/src/VP1DetInfo.cxx +++ b/graphics/VTI12/VTI12Utils/src/VP1DetInfo.cxx @@ -20,8 +20,6 @@ #include "VP1Base/IVP1System.h" #include "VP1Base/VP1AthenaPtrs.h" -#include "GeoModelKernel/GeoPVConstLink.h" - #include "NeutrinoReadoutGeometry/EmulsionDetectorManager.h" #include "ScintReadoutGeometry/VetoDetectorManager.h" diff --git a/graphics/VTI12/VTI12Utils/src/VP1JobConfigInfo.cxx b/graphics/VTI12/VTI12Utils/src/VP1JobConfigInfo.cxx index bd325e0d306fb4c93cdc23b82683cf6ac5244e7a..12312d001379cb1fc8ad156072b06365b3baad8b 100644 --- a/graphics/VTI12/VTI12Utils/src/VP1JobConfigInfo.cxx +++ b/graphics/VTI12/VTI12Utils/src/VP1JobConfigInfo.cxx @@ -157,7 +157,6 @@ bool VP1JobConfigInfo::Imp::actualInit( StoreGateSvc* detStore ) hasGeoModelExperiment = true; PVConstLink world(worldPhysVol); VP1Msg::messageDebug("VTI12JobConfigInfo: called world(worldPhysVol)"); - std::cout << "world :" << world << std::endl; GeoVolumeCursor av(world);