diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles.ref
old mode 100755
new mode 100644
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref
old mode 100644
new mode 100755
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref
old mode 100644
new mode 100755
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref
old mode 100644
new mode 100755
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100644
new mode 100755
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/fcsTrfArgs.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/fcsTrfArgs.py
index 2dfd9fa23929a90b816051283af76b6eb7a0debd..00ba325b59f8e8485047afd0ee3ae39cd9f5bc02 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/fcsTrfArgs.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/fcsTrfArgs.py
@@ -20,3 +20,6 @@ def addFCS_NtupArgs(parser):
     parser.add_argument('--outputGeoFileName',
                         type=argFactory(argString),
                         help='Optional geometry file', group='FCS_Ntup_tf')
+    parser.add_argument('--doG4Hits',
+                        type=argFactory(argBool),
+                        help='Flag to turn on the writing of G4 hits', group='FCS_Ntup_tf')
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple.py
index 0abd7f6f7c9c50da89fbe409ac468ea4c2515ce8..d0cc31fc96f86e2a8b9d7b18e1615a71bb8d7c2f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple.py
@@ -13,6 +13,8 @@ from AthenaCommon.AthenaCommonFlags  import athenaCommonFlags
 #specify input file here
 athenaCommonFlags.FilesInput = ["/afs/cern.ch/work/a/ahasib/public/photon.50GeV.ESD.pool.root"]
 
+doG4Hits = False
+
 include("ISF_FastCaloSimParametrization/ISF_ntuple_core.py")
 
 theApp.EvtMax = 100 # Set to -1 for all events
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple_core.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple_core.py
index f72c563bb64ae7a4703a359ef488c45de8bec68e..d45ef590fe9a726a82d3d393dde04a038b72d575 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple_core.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_ntuple_core.py
@@ -44,7 +44,7 @@ ISF_HitAnalysis.SaveAllBranches = False
 ISF_HitAnalysis.DoAllCells = False
 ISF_HitAnalysis.DoLayers = True
 ISF_HitAnalysis.DoLayerSums = True
-ISF_HitAnalysis.DoG4Hits = False
+ISF_HitAnalysis.DoG4Hits = doG4Hits
 ISF_HitAnalysis.TimingCut = 999999
 ISF_HitAnalysis.OutputLevel = ERROR
 
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
index 9ad54491241ce016cecfde39af06695280d16f14..f5621ff36cdb2a899c2d6871a16bdd0aeb326965 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
@@ -47,6 +47,11 @@ else:
 if hasattr(runArgs,"outputGeoFileName"):
     ServiceMgr.THistSvc.Output +=["ISF_Geometry DATAFILE='"+runArgs.outputGeoFileName+"' OPT='RECREATE'"] # FIXME top level directory name
 
+## Flag for doG4Hits
+if hasattr(runArgs,"doG4Hits"):
+    doG4Hits = runArgs.doG4Hits
+else:
+    doG4Hits = False
 
 #==============================================================
 # Job Configuration parameters:
@@ -66,6 +71,7 @@ if hasattr(runArgs,"preInclude"):
 
 include("ISF_FastCaloSimParametrization/ISF_ntuple_core.py") # Main job options
 
+
 ## Post-include
 if hasattr(runArgs,"postInclude"):
     for fragment in runArgs.postInclude: