FTF config fixes

Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py

@@ -410,6 +410,9 @@ class TrigFastTrackFinder_Cosmic_Monitoring(TrigFastTrackFinder_CommonMonitoring
                                              xbins = 100, xmin=-0.5, xmax=99.5)]
 
 remap  = {
+    "FTKRefit" : "FTKRefit",
+    "FTKMon"   : "FTKMon",
+    "FTK"      : "FTK",
     "Muon"     : "muon",
     "MuonFS"   : "muon",
     "MuonCore" : "muonCore",

Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py

@@ -34,21 +34,15 @@ if TriggerFlags.doID:
 
   from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
   
-  (viewAlgs, eventAlgs) = makeInDetAlgs()
-
-  from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
-
-  theTrigFastTrackFinder_eGamma = TrigFastTrackFinder_eGamma()
-  theTrigFastTrackFinder_eGamma.isRoI_Seeded = True
-  theTrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs"
-  viewAlgs.append(theTrigFastTrackFinder_eGamma)
+  (viewAlgs, eventAlgs) = makeInDetAlgs("FS")
 
   for eventAlg in eventAlgs:
     viewSeq += eventAlg
 
   for viewAlg in viewAlgs:
     allViewAlgorithms += viewAlg
-
+    if "RoIs" in viewAlg.properties():
+        viewAlg.RoIs = "EMViewRoIs"
 
    #
    # --- Ambiguity solver algorithm
@@ -81,7 +75,7 @@ if TriggerFlags.doID:
 
   from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguitySolver
   InDetTrigMTAmbiguitySolver = Trk__TrkAmbiguitySolver(name         = 'InDetTrigMTAmbiguitySolver',
-                                                 TrackInput         =['TrigFastTrackFinder_Tracks'], #FTF default
+                                                 TrackInput         =['TrigFastTrackFinder_Tracks_FS'], #FTF default
                                                  TrackOutput        = 'AmbiSolver_Tracks' , #Change
                                                  AmbiguityProcessor = InDetTrigMTAmbiguityProcessor)