Adjusted name of tracks (FTK_RecExample-00-00-14)

	* share/FTKRec_jobOptions.py: Adjusted name of tracks
	* tag as FTK_RecExample-00-00-14

2016-11-01  John Baines  <john.baines@stfc.ac.uk>

	* python: change to just have one instance of FTK_DataProviderSvc shared by trigger and offline.
	* tag as FTK_RecExample-00-00-13


Former-commit-id: b142b4f8d541e9dcb911fb0fc501619a470c919b

Trigger/TrigFTK/FTK_RecExample/CMakeLists.txt

@@ -5,6 +5,10 @@
 # Declare the package name:
 atlas_subdir( FTK_RecExample )
 
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          AtlasPolicy )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/**.py )

Trigger/TrigFTK/FTK_RecExample/share/FTKRec_jobOptions.py

 include.block('FTK_RecExample/FTKRec_jobOptions.py')
 
+
 from RecExConfig.RecFlags import rec
 
 if rec.doFTK():
-  from FTK_RecExample.FTK_DataProviderSvc_Config import ConfiguredFTK_DataProviderSvc
-  FTK_DataProviderSvc = ConfiguredFTK_DataProviderSvc("ConfiguredFTK_DataProviderSvc")
-  ServiceMgr += FTK_DataProviderSvc
-  ServiceMgr.ConfiguredFTK_DataProviderSvc.TrainingBeamspotX= 0.
-  ServiceMgr.ConfiguredFTK_DataProviderSvc.TrainingBeamspotY=0.
-
-  from TrigFTK_RawDataAlgs.TrigFTK_RawDataAlgsConf import FTK_RDO_ReaderAlgo
-
-  FTK_RDO_Reader = FTK_RDO_ReaderAlgo( "FTK_RDO_ReaderAlgo")
-  FTK_RDO_Reader.FTK_DataProvider=FTK_DataProviderSvc
-  FTK_RDO_Reader.RDO_CollectionName="FTK_RDO_Tracks"
-  FTK_RDO_Reader.fillHists=False
-  
-  FTK_RDO_Reader.GetTracks=True
-  FTK_RDO_Reader.GetTrackParticles=True
-  FTK_RDO_Reader.GetVertex=True
-  FTK_RDO_Reader.GetRefitTracks=True
-  FTK_RDO_Reader.GetRefitTrackParticles=True
-  FTK_RDO_Reader.GetRefitVertex=True
-
-  from AthenaCommon.AlgSequence import AlgSequence
-
-  alg = AlgSequence()  
-  alg += FTK_RDO_Reader  
-
-
-  if rec.doTruth():
-    include ('FTK_RecExample/ConfiguredFTK_TrackTruth.py')
-    FTK_TracksTruth = ConfiguredFTK_TrackTruth(Tracks="FTK_TrackCollection",
-                                               TracksTruth = "FTK_Tracks_TruthCollection",
-                                               DetailedTruth = "FTK_Tracks_DetailedTruthCollection")
-    FTK_RefitTracksTruth = ConfiguredFTK_TrackTruth(Tracks="FTK_TrackCollectionRefit",
-                                                    TracksTruth = "FTK_RefitTracks_TruthCollection",
-                                                    DetailedTruth = "FTK_RefitTracks_DetailedTruthCollection")
-
-
-
+ from TrigFTK_RecExample.TrigFTK_DataProviderSvc_Config import TrigFTK_DataProviderSvc
+ theFTK_DataProviderSvc = TrigFTK_DataProviderSvc("TrigFTK_DataProviderSvc")
+ ServiceMgr += theFTK_DataProviderSvc
+
+ from TrigFTK_RawDataAlgs.TrigFTK_RawDataAlgsConf import FTK_RDO_ReaderAlgo
+
+ FTK_RDO_Reader = FTK_RDO_ReaderAlgo( "FTK_RDO_ReaderAlgo")
+ FTK_RDO_Reader.FTK_DataProvider=theFTK_DataProviderSvc
+ FTK_RDO_Reader.RDO_CollectionName="FTK_RDO_Tracks"
+ FTK_RDO_Reader.fillHists=False
+
+ FTK_RDO_Reader.GetTracks=True
+ FTK_RDO_Reader.GetTrackParticles=True
+ FTK_RDO_Reader.GetVertex=True
+ FTK_RDO_Reader.GetRefitTracks=True
+ FTK_RDO_Reader.GetRefitTrackParticles=True
+ FTK_RDO_Reader.GetRefitVertex=True
+
+ from AthenaCommon.AlgSequence import AlgSequence
+
+ alg = AlgSequence() 
+ alg += FTK_RDO_Reader 
+
+
+ if rec.doTruth():
+     include ('FTK_RecExample/ConfiguredFTK_TrackTruth.py')
+     FTK_TracksTruth = ConfiguredFTK_TrackTruth(Tracks="TrigFTK_TrackCollection",
+                                                TracksTruth = "FTK_Tracks_TruthCollection",
+                                                DetailedTruth = "FTK_Tracks_DetailedTruthCollection")
+     FTK_RefitTracksTruth = ConfiguredFTK_TrackTruth(Tracks="TrigFTK_TrackCollectionRefit", 
+                                                     TracksTruth = "FTK_RefitTracks_TruthCollection",
+                                                     DetailedTruth = "FTK_RefitTracks_DetailedTruthCollection")