diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index a0b0dd219f8221e15d98c7c478581f8251116eac..9f0bacf0ace8c7aadf1bdbfa7e61496a57b84c01 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -38,10 +38,11 @@ KnownCollisionsProjects=["data08","data08_coll900","data09","data09_coll900","da
                          "data14_comm","data15_comm","data15_900GeV","data15_1beam","data15_13TeV"
                          ]
 
-KnownHeavyIonProjects=["data10_hi","data11_hi"]
+KnownHeavyIonProjects=["data10_hi","data11_hi","data15_hi"]
 
 KnownHeavyIonProtonProjects=["data12_hip","data13_hip"]
 
+KnownTestProjects=["data_test"]
 
 KnownProjects=[]
 AddValidItemToList(KnownCosmicsProjects,KnownProjects)
@@ -49,6 +50,7 @@ AddValidItemToList(Known1BeamProjects,KnownProjects)
 AddValidItemToList(KnownCollisionsProjects,KnownProjects)
 AddValidItemToList(KnownHeavyIonProjects,KnownProjects)
 AddValidItemToList(KnownHeavyIonProtonProjects,KnownProjects)
+AddValidItemToList(KnownTestProjects,KnownProjects)
 
 fullSolenoidCurrent=7730.0
 fullToroidCurrent=20500.0
@@ -109,7 +111,7 @@ def GetFieldFromInputFile():
             solenoidCurrent=inputFileSummary['metadata']['/EXT/DCS/MAGNETS/SENSORDATA']['CentralSol_Current']['value']
             toroidCurrent=inputFileSummary['metadata']['/EXT/DCS/MAGNETS/SENSORDATA']['Toroids_Current']['value']
         except:
-            logAutoConfiguration.warning("Unable to find solenoid & toroid currents in /EXT/DCS/MAGNETS/SENSORDATA")
+            logAutoConfiguration.warning("Unable to find solenoid and toroid currents in /EXT/DCS/MAGNETS/SENSORDATA")
 
         # consistency check of GEO and b field values in case of simulated data
         if inputFileSummary['evt_type'][0]=='IS_SIMULATION':
@@ -244,12 +246,14 @@ def ConfigureGeo():
 
     from RecExConfig.InputFilePeeker import inputFileSummary
     if inputFileSummary['file_type']=='bs':
-        geo='ATLAS-GEO-20-00-01'
+        geo="ATLAS-R2-2015-03-01-00" #geo='ATLAS-GEO-20-00-01'
         project=GetProjectName()
+        if "data12" in project:
+            geo="ATLAS-R1-2012-03-00-00"
         if "data11" in project:
-            geo='ATLAS-GEO-18-01-01'
+            geo="ATLAS-R1-2011-02-00-00"  #'ATLAS-GEO-18-01-01'
         if "data10" in project or "data09" in project or "data08" in project:
-            geo='ATLAS-GEO-16-00-01'
+            geo="ATLAS-R1-2010-02-00-00" #geo='ATLAS-GEO-16-00-01'
         if inputFileSummary['evt_type'][0]=='IS_SIMULATION':
             try: geo = inputFileSummary['geometry']
             except: logAutoConfiguration.warning("Input simulated bs file does not contain bs_metadata with geometry. Probably an old file.")
@@ -334,6 +338,7 @@ def ConfigureBeamType():
     if BeamType==None:
         project=GetProjectName()
         if ItemInList(project,KnownCosmicsProjects): BeamType='cosmics'
+        elif ItemInList(project,KnownTestProjects): BeamType='cosmics'
         elif ItemInList(project,Known1BeamProjects): BeamType='singlebeam'
         elif ItemInList(project,KnownCollisionsProjects): BeamType='collisions'
         elif ItemInList(project,KnownHeavyIonProjects): BeamType='collisions'
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index de4e7c2da3d978f37feb51d5ee9cc6acd4278b7e..722b15669fe6e6e519fcb62fb93cda9f0a9bd525 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
@@ -792,6 +792,13 @@ class doBTagging(JobProperty):
     allowedTypes=['bool']
     StoredValue=True
 
+class doFTK(JobProperty):
+    """If false switch off everything related to FTK
+    """
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=False
+
 
 class doTrigger(JobProperty):
     """ If false switch off everything related to Trigger
@@ -997,7 +1004,7 @@ doEdmMonitor, doHist, doJiveXML, doPersint,doVP1, doNameAuditor, \
 doRestrictedESD, doShowSizeStatistics, doTimeLimit, doTruth,\
 doWriteAOD, doWritexAOD, doWriteESD, doWriteBS, doWriteRDO, doWriteTAG, doWriteTAGCOM, PoolTAGCOMOutput, readAOD, readTAG, readRDO, \
 readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \
-doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doTrigger,doBTagging, Production, doPhysValMonHists, \
+doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doFTK,doTrigger,doBTagging, Production, doPhysValMonHists, \
 doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \
 AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping, doPhysicsValidationAugmentation, doESDReconstruction, doExpressProcessing ]
 for j in _list_Rec: