diff --git a/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt b/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
index eb7966bf0615ee5054a9b38a7e4c575beb5f6fc8..4182fe111b801430bae9843756d2d78de5b6e5b2 100644
--- a/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
+++ b/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Package: TrigFTKSim
-################################################################################
+################################################################################ 
 
 # Declare the package name:
 atlas_subdir( TrigFTKSim )
diff --git a/Trigger/TrigFTK/TrigFTKSim/cmt/requirements b/Trigger/TrigFTK/TrigFTKSim/cmt/requirements
index 3ba4ba894ea0ec13006c7e8951caa55bd672a311..0fa583984b5ec3eacb01ac08590d1bf71ff9c9ad 100644
--- a/Trigger/TrigFTK/TrigFTKSim/cmt/requirements
+++ b/Trigger/TrigFTK/TrigFTKSim/cmt/requirements
@@ -71,7 +71,7 @@ apply_pattern cmake_add_command command="add_definitions(-DHAVE_BOOST_IOSTREAMS)
 
 apply_pattern declare_joboptions files="-k=.*job[Oo]ptions.py *.py"
 apply_pattern generic_declare_for_link kind=ftkmapfiles prefix=share/ftk_configuration/map_files files="../config/map_file/raw_7L.pmap ../config/map_file/raw_7L_unused.pmap ../config/map_file/raw_8Lc.pmap ../config/map_file/raw_8Lc_unused.pmap ../config/map_file/raw_11L.pmap ../config/map_file/raw_7L.rmap ../config/map_file/raw_11L.rmap   ../config/map_file/raw_11L.tmap  ../config/map_file/raw_8LcIbl123.pmap ../config/map_file/raw_8LcIbl3D123.pmap ../config/map_file/raw_12Libl.pmap ../config/map_file/raw_8LcIbl123_unused.pmap ../config/map_file/raw_12Libl.tmap ../config/map_file/raw_12LiblHW.pmap ../config/map_file/raw_8LcIbl123.moduleidmap ../config/map_file/raw_12LiblHW.moduleidmap ../config/map_file/raw_12Libl.moduleidmap ../config/map_file/raw_12Libl3D.pmap ../config/map_file//raw_12Libl3D.tmap ../config/map_file/raw_12Libl3DTempv0.tmap ../config/map_file/raw_12Libl3D_WA.tmap ../config/map_file/raw_12Libl64TmodB_3D_t1.tmap ../config/map_file/raw_12LiblHW3D.pmap ../config/map_file/raw_12Libl32TmodB.tmap ../config/map_file/raw_12Libl64TmodB.tmap ../config/map_file/raw_12Libl32TmodB_3D_t13.tmap ../config/map_file/raw_12Libl64TmodB_3D_t13.tmap ../config/map_file/raw_12LiblHW_32.moduleidmap ../config/map_file/raw_8LcIbl123_32.moduleidmap ../config/map_file/raw_ITkExample.tmap ../config/map_file/raw_ITkExample.pmap ../config/map_file/raw_8LcIbl3D123.moduleidmap ../config/map_file/raw_12Libl3D.moduleidmap"
-apply_pattern generic_declare_for_link kind=ftkssdefs prefix=share/ftk_configuration/ss_files files="../config/ss_file/raw_24x20x36.ss ../config/ss_file/raw_30x32x72Ibl-p567x64.ss ../config/ss_file/raw_48x40x36.ss ../config/ss_file/raw_unused.ss ../config/ss_file/raw_15x16x36.ss ../config/ss_file/raw_15x16x36unused.ss  ../config/ss_file/raw_30x32x36.ss ../config/ss_file/raw_30x32x72.ss ../config/ss_file/raw_50x64x14412LIblunused.ss ../config/ss_file/raw_50x64x14412LIbl.ss ../config/ss_file/raw_15x16x36Ibl.ss ../config/ss_file/raw_15x16x38Ibl.ss ../config/ss_file/raw_30x32x72Ibl.ss ../config/ss_file/raw_15x16x36Iblunused.ss ../config/ss_file/raw_8LcIBL123_unusedmedium.ss ../config/ss_file/raw_8LcIBL123_unusedsmall.ss ../config/ss_file/raw_8LcIBL123_i8s4_unused.ss ../config/ss_file/raw_60x32a64p2x72Ibl.ss ../config/ss_file/raw_60x64x72Ibl.ss ../config/ss_file/raw_30x64x72Ibl.ss ../config/ss_file/raw_ITkExample.ss"
+apply_pattern generic_declare_for_link kind=ftkssdefs prefix=share/ftk_configuration/ss_files files="../config/ss_file/raw_24x20x36.ss ../config/ss_file/raw_30x32x72Ibl-p567x64.ss ../config/ss_file/raw_48x40x36.ss ../config/ss_file/raw_unused.ss ../config/ss_file/raw_15x16x36.ss ../config/ss_file/raw_15x16x36unused.ss  ../config/ss_file/raw_30x32x36.ss ../config/ss_file/raw_30x32x72.ss ../config/ss_file/raw_50x64x14412LIblunused.ss ../config/ss_file/raw_50x64x14412LIbl.ss ../config/ss_file/raw_15x16x36Ibl.ss ../config/ss_file/raw_15x16x38Ibl.ss ../config/ss_file/raw_30x32x72Ibl.ss ../config/ss_file/raw_15x16x36Iblunused.ss ../config/ss_file/raw_8LcIBL123_unusedmedium.ss ../config/ss_file/raw_8LcIBL123_unusedsmall.ss ../config/ss_file/raw_8LcIBL123_i8s4_unused.ss ../config/ss_file/raw_60x32a64p2x72Ibl.ss ../config/ss_file/raw_60x64x72Ibl.ss ../config/ss_file/raw_30x64x72Ibl.ss ../config/ss_file/raw_ITkExample.ss ../config/ss_file/raw_30x128x72Ibl.ss"
 apply_pattern generic_declare_for_link kind=ftkhwdef prefix=share/ftk_configuration/hwsdev_file files="../config/hwsdev_file/raw_7L.hw ../config/hwsdev_file/raw_11L.hw ../config/hwsdev_file/raw_8Lc.hw ../config/hwsdev_file/raw_8LcIbl123.hw ../config/hwsdev_file/raw_12L.hw ../config/hwsdev_file/raw_ITkExample.hw"
 apply_pattern generic_declare_for_link kind=ftkbadmod prefix=share/ftk_configuration/bad_modules files="../config/bad_modules/empty.bmap"
 
diff --git a/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_30x128x72Ibl.ss b/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_30x128x72Ibl.ss
new file mode 100644
index 0000000000000000000000000000000000000000..2e57e13cc80fdffad986aa4145efc1298906014b
--- /dev/null
+++ b/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_30x128x72Ibl.ss
@@ -0,0 +1,60 @@
+Version 9
+! PIX: 3mm SS, so we use 328/(20mm/3mm)=328/6.6=50
+! SCT: 5mm SS, so we use 768/(60mm/5mm)=768/12=64
+! description of the columns
+! pix=1, sct=0
+! barrel=0 endcap=1
+! layer number
+! SS size along r-phi
+! number of r-phi pixels/strips in a module (constant)
+! SS size along eta (pixel only)
+! number of eta pixels in a module (constant)
+1 0 0 128 336 80 160
+1 0 1 30 328 72 144
+1 0 2 30 328 72 144
+1 0 3 30 328 72 144
+0 0 0 128 768
+0 0 1 128 768
+0 0 2 128 768
+0 0 3 128 768
+0 0 4 128 768
+0 0 5 128 768
+0 0 6 128 768
+0 0 7 128 768
+1 1 0 30 328 72 144
+1 1 1 30 328 72 144
+1 1 2 30 328 72 144
+0 1 0 128 768
+0 1 1 128 768
+0 1 2 128 768
+0 1 3 128 768
+0 1 4 128 768
+0 1 5 128 768
+0 1 6 128 768
+0 1 7 128 768
+0 1 8 128 768
+0 1 9 128 768
+0 1 10 128 768
+0 1 11 128 768
+0 1 12 128 768
+0 1 13 128 768
+0 1 14 128 768
+0 1 15 128 768
+0 1 16 128 768
+0 1 17 128 768
+0 1 18 128 768
+0 1 19 128 768
+0 1 20 128 768
+0 1 21 128 768
+0 1 22 128 768
+0 1 23 128 768
+0 1 24 128 768
+0 1 25 128 768
+0 1 26 128 768
+0 1 27 128 768
+0 1 28 128 768
+0 1 29 128 768
+0 1 30 128 768
+0 1 31 128 768
+0 1 32 128 768
+0 1 33 128 768
\ No newline at end of file
diff --git a/Trigger/TrigFTK/TrigFTKSim/scripts/rtt_compare.py b/Trigger/TrigFTK/TrigFTKSim/scripts/rtt_compare.py
index 21009009c6ddfb2cb497fe316f590a16625023ea..f1fd04d29da0ddc6644b03ea0a4ff79c6e541876 100755
--- a/Trigger/TrigFTK/TrigFTKSim/scripts/rtt_compare.py
+++ b/Trigger/TrigFTK/TrigFTKSim/scripts/rtt_compare.py
@@ -92,12 +92,12 @@ def plot(fileref, filechk, outfile, name, varname, dispname, bins, binlow, binhi
         histo_ref.Draw()
         histo_chk.Draw("sames")
     canvas.Update()
-    stats = histo_chk.GetFunction("stats")
-    stats.SetTextColor(ROOT.kRed)
-    stats.SetLineColor(ROOT.kRed)
-    height = stats.GetY2NDC()-stats.GetY1NDC()
-    stats.SetY1NDC(.6)
-    stats.SetY2NDC(.6+height)
+    #stats = histo_chk.GetFunction("stats")
+    #stats.SetTextColor(ROOT.kRed)
+    #stats.SetLineColor(ROOT.kRed)
+    #height = stats.GetY2NDC()-stats.GetY1NDC()
+    #stats.SetY1NDC(.6)
+    #stats.SetY2NDC(.6+height)
     canvas.Write()
     outfile.Write()
 
diff --git a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py
index f738d2aec08a37a72c428ab81e46cd570d40d536..94407dc69c4e8b97add95ff152ed33eff4a39088 100644
--- a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py
+++ b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py
@@ -114,6 +114,12 @@ FTKTagOptions["HWMode2Test32Tower"] = \
 FTKTagOptions["HWMode2Test64Tower"] = \
    {'NBanks': 64, 'NSubRegions': 1, 'pmap_path': 'raw_12LiblHW3D.pmap', \
          'loadHWConf_path': 'raw_8LcIbl123.hw'}
+FTKTagOptions["64Tower2017.v1"] = \
+   {'NBanks': 64, 'NSubRegions': 1, 'pmap_path': 'raw_12LiblHW3D.pmap', \
+         'loadHWConf_path': 'raw_8LcIbl123.hw'}
+FTKTagOptions["64Tower2017.v2"] = \
+   {'NBanks': 64, 'NSubRegions': 1, 'pmap_path': 'raw_12LiblHW3D.pmap', \
+         'loadHWConf_path': 'raw_8LcIbl123.hw'}
 FTKTagOptions['SectorsAsPatterns'] = \
     {'NBanks': 64, 'NSubRegions': 1, 'pmap_path': 'raw_8LcIbl123.pmap',
      'loadHWConf_path': 'raw_8Lc.hw', 'MergeRoads': False}
diff --git a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneSim.py b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneSim.py
index b6558e0d82c4e60a20d21d536e2a93e91b60ae85..d17244a71539ca79e3769489b2852df5e06ed8df 100644
--- a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneSim.py
+++ b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneSim.py
@@ -1,5 +1,5 @@
 # FTK Simulation Transform Skeleton Job Options
-# $Id: skeleton.FTKStandaloneSim.py 773494 2016-09-15 16:20:40Z jwebster $
+# $Id: skeleton.FTKStandaloneSim.py 786937 2016-11-28 16:58:14Z jahreda $
 
 from AthenaCommon.AthenaCommonFlags import jobproperties as jp
 from AthenaCommon.Logging import logging
@@ -364,6 +364,61 @@ FTKTagOptions["HWMode2Test64Tower"] = {
     'GangedPatternReco': 0, 'DuplicateGanged': 1
     }
 
+### for use with  --FitConstantsVersion Run2_x00_y00_Reb64_UseNominalOrigin_v1/ and 
+### --PatternsVersion ftk.64tower.simulation.2017.000.nb9.ne6/
+FTKTagOptions["64Tower2017.v1"] = {
+    'NBanks': 64, 'NSubRegions': 1,
+    'pmap_path': 'raw_8LcIbl3D123.pmap', 'rmap_path': 'raw_12Libl64TmodB_3D_t13.tmap',
+    'ssmap_path': 'raw_30x128x72Ibl.ss',
+    'ssmapunused_path': 'raw_8LcIBL123_unusedmedium.ss',
+    'pmapunused_path': 'raw_8LcIbl123_unused.pmap',
+    'bankpatterns': [8388608]*NumberOfSubregions,
+    'ssmaptsp_path': 'raw_15x16x36Ibl.ss', 
+    'UseTSPBank': False,
+    'UseCompressedBank': True,
+    'ModuleLUTPath': 'raw_8LcIbl3D123.moduleidmap',
+    'ModuleLUTPath2nd': 'raw_12Libl3D.moduleidmap',
+    'DBBankLevel': 1, 'TSPSimulationLevel': 2,
+    'loadHWConf_path': 'raw_12L.hw', 'pmapcomplete_path': 'raw_12LiblHW3D.pmap',
+    'SetAMSize': 2, 'TRACKFITTER_MODE': 3,
+    'SecondStageFit': True,
+    'SSFMultiConnection': True, 'SSFNConnections': 4,
+    'SSFAllowExtraMiss': 1, 'SSFTRDefn': 1, 'SSFTRMaxEta': 1.4,
+    'SSFTRMinEta': 1.0,
+    'MaxNcomb': 1024,
+    'MaxNhitsPerPlane': 8,
+    'HWModeSS': 2,
+    'FixEndCapL0': False, 'IBLMode': 2, 'PixelClusteringMode': 101,
+    'GangedPatternReco': 0, 'DuplicateGanged': 1
+    }
+
+### for use with  --FitConstantsVersion Run2_x00_y00_Reb64_UseNominalOrigin_v1/ and 
+### --PatternsVersion ftk.64tower.simulation.2017.000.nb10.ne6/
+FTKTagOptions["64Tower2017.v2"] = {
+    'NBanks': 64, 'NSubRegions': 1,
+    'pmap_path': 'raw_8LcIbl3D123.pmap', 'rmap_path': 'raw_12Libl64TmodB_3D_t13.tmap',
+    'ssmap_path': 'raw_30x64x72Ibl.ss',
+    'ssmapunused_path': 'raw_8LcIBL123_unusedmedium.ss',
+    'pmapunused_path': 'raw_8LcIbl123_unused.pmap',
+    'bankpatterns': [8388608]*NumberOfSubregions,
+    'ssmaptsp_path': 'raw_15x16x36Ibl.ss', 
+    'UseTSPBank': False,
+    'UseCompressedBank': True,
+    'ModuleLUTPath': 'raw_8LcIbl3D123.moduleidmap',
+    'ModuleLUTPath2nd': 'raw_12Libl3D.moduleidmap',
+    'DBBankLevel': 1, 'TSPSimulationLevel': 2,
+    'loadHWConf_path': 'raw_12L.hw', 'pmapcomplete_path': 'raw_12LiblHW3D.pmap',
+    'SetAMSize': 2, 'TRACKFITTER_MODE': 3,
+    'SecondStageFit': True,
+    'SSFMultiConnection': True, 'SSFNConnections': 4,
+    'SSFAllowExtraMiss': 1, 'SSFTRDefn': 1, 'SSFTRMaxEta': 1.4,
+    'SSFTRMinEta': 1.0,
+    'MaxNcomb': 1024,
+    'MaxNhitsPerPlane': 8,
+    'HWModeSS': 2,
+    'FixEndCapL0': False, 'IBLMode': 2, 'PixelClusteringMode': 101,
+    'GangedPatternReco': 0, 'DuplicateGanged': 1
+    }
 
 
 FTKTagOptions["TDRv0"] = {
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx
index 90af4aef9e085f7a9300428f681a0b5bd9341462..34e1566e6bad32bb7abb0a84d2717b5f9b2a844d 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx
@@ -3381,7 +3381,7 @@ void FTK_CompressedAMBank::sort_hits
 #endif
    }
    if(error) {
-      Error("sort_hits")<<"failed to calculate SSID for "<<error<<"/"
+      Warning("sort_hits")<<"failed to calculate SSID for "<<error<<"/"
                         <<expectedNHit<<" FTKHits\n";
    }
    for (int ipl=0;ipl<getNPlanes();++ipl) {