Merge branch 'xAODCnv-change2' into 'master'

Change InDetTrigParticleCreatorTool used for FTK to be the same as for FTF

See merge request !476

Former-commit-id: 6079dd39

InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py

@@ -268,7 +268,7 @@ class InDetTrigTrackingxAODCnv_EF( InDet__TrigTrackingxAODCnv ):
 
       creatorTool = InDetTrigParticleCreatorToolWithSummary
 
-      if "_FTF" or "_FTK" in name:
+      if "_FTF" in name or "_FTK" in name:
         creatorTool = InDetTrigParticleCreatorToolFTF
       elif "_IDTrig" in name and type=="electron":
         creatorTool = InDetTrigParticleCreatorToolWithSummaryTRTPid