fixing trip reader

PhysicsAnalysis/TileID/TileTripReader/CMakeLists.txt

@@ -5,33 +5,47 @@
 # Declare the package name:
 atlas_subdir( TileTripReader )
 
+# Extra dependencies, based on the environment:
+set( extra_deps )
+if( XAOD_STANDALONE )
+   set( extra_deps Control/xAODRootAccess )
+else()
+   set( extra_deps Event/EventKernel Control/AthenaKernel Control/AthenaBaseComps GaudiKernel )
+endif()
+
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
                           PhysicsAnalysis/AnalysisCommon/PATCore
                           PRIVATE
-                          Control/AthenaKernel
-                          Event/EventKernel
                           Event/xAOD/xAODEventInfo
-                          GaudiKernel
                           Tools/PathResolver )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 PyROOT )
 
 # Component(s) in the package:
-atlas_add_library( TileTripReaderLib
+if( XAOD_STANDALONE )
+        atlas_add_library( TileTripReaderLib
+                   Root/*.cxx
+                   PUBLIC_HEADERS TileTripReader
+                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   LINK_LIBRARIES PATCoreLib
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEventInfo PathResolver )
+
+else()
+        atlas_add_library( TileTripReaderLib
                    Root/*.cxx
                    PUBLIC_HEADERS TileTripReader
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    LINK_LIBRARIES AthenaBaseComps PATCoreLib
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel EventKernel xAODEventInfo GaudiKernel PathResolver )
 
-atlas_add_component( TileTripReader
+        atlas_add_component( TileTripReader
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps PATCoreLib AthenaKernel EventKernel xAODEventInfo GaudiKernel PathResolver TileTripReaderLib )
+endif()
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

PhysicsAnalysis/TileID/TileTripReader/Root/TTileTripReader.cxx

@@ -25,9 +25,12 @@ const double width=2.*pi/64.;
 
 namespace Root{
 
-TTileTripReader::TTileTripReader(const char* name)
+TTileTripReader::TTileTripReader(const char*
 #ifndef ROOTCORE
+      name)
     : TSelectorToolBase(name),TCalculatorToolBase(name)
+#else
+      )
 #endif /*ROOTCORE*/
 {
     m_trips=new TChain("TripList");