Merge branch 'sgtools.CaloSysD3PDMaker-20181220' into 'master'

CaloSysD3PDMaker: Remove unneeded dependency on SGTools.

See merge request atlas/athena!20058

PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/CMakeLists.txt

@@ -20,7 +20,6 @@ atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           Control/AthenaKernel
                           Control/Navigation
-                          Control/SGTools
                           Control/StoreGate
                           DetectorDescription/Identifier
                           Event/xAOD/xAODCaloEvent
@@ -48,7 +47,7 @@ atlas_add_component( CaloSysD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel Navigation SGTools StoreGateLib SGtests Identifier xAODCaloEvent GaudiKernel LArIdentifier LArRawEvent LArRecEvent LArSimEvent LArCablingLib D3PDMakerUtils PrimaryDPDMakerLib JetEvent TileConditionsLib TileEvent TileIdentifier TileSimEvent )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel Navigation StoreGateLib SGtests Identifier xAODCaloEvent GaudiKernel LArIdentifier LArRawEvent LArRecEvent LArSimEvent LArCablingLib D3PDMakerUtils PrimaryDPDMakerLib JetEvent TileConditionsLib TileEvent TileIdentifier TileSimEvent )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArHitFillerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -20,15 +20,7 @@ class LArFCAL_ID;
 class TileID; 
 class LArOnlineID;
 
-// Scott:  
-//There needs to be a declaration that that's possible, using
-//SG_BASE or DATAVECTOR_BASE.  It looks like that's not the case
-//for CaloCell.
-//That can be added.  In the meantime, try putting this in your package:
-
 #include "LArSimEvent/LArHit.h"
-// # #include "SGTools/BaseInfo.h"
-// #SG_ADD_BASE (CaloCell, INavigable4Momentum);
 
 
 namespace D3PD {