diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py
new file mode 100644
index 0000000000000000000000000000000000000000..0538b88bf44f35fd2a4361cbcf1c47eeaf858340
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py
@@ -0,0 +1,36 @@
+#job options to activate the dump of the NSWPRDVal nTuple
+#This file can be used with Digi_tf by specifying --postinclude MuonPRDTest/NSWPRDValAlg.digi.py
+#It dumps Truth, MuEntry and Hits, Digits, SDOs and RDOs for MM and sTGC
+
+
+#-----------------------------------------------------------------------------
+# Algorithms
+#-----------------------------------------------------------------------------
+from AthenaCommon.AlgSequence import AlgSequence
+job = AlgSequence()
+from MuonPRDTest.MuonPRDTestConf import *
+
+job+=NSWPRDValAlg('NSWPRDValAlg', OutputLevel = WARNING)
+NSWPRDValAlg.OutputLevel = INFO
+NSWPRDValAlg.doTruth = True
+
+NSWPRDValAlg.doMuEntry = True
+
+NSWPRDValAlg.doMMHit = True
+NSWPRDValAlg.doMMDigit = True
+NSWPRDValAlg.doMMRDO = True
+NSWPRDValAlg.doMMPRD = False
+NSWPRDValAlg.doMMFastDigit = False
+
+NSWPRDValAlg.doSTGCHit = True
+NSWPRDValAlg.doSTGCDigit = True
+NSWPRDValAlg.doSTGCRDO = True
+NSWPRDValAlg.doSTGCPRD = False
+NSWPRDValAlg.doSTGCFastDigit = False
+
+#-----------------------------------------------------------------------------
+# save ROOT histograms and Tuple
+#-----------------------------------------------------------------------------
+from GaudiSvc.GaudiSvcConf import THistSvc
+ServiceMgr += THistSvc()
+ServiceMgr.THistSvc.Output = [ "NSWPRDValAlg DATAFILE='NSWPRDValAlg.digi.ntuple.root' OPT='RECREATE'" ]
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py
new file mode 100644
index 0000000000000000000000000000000000000000..91eada721c3cd21635020df9e16a340f2dee02e6
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py
@@ -0,0 +1,37 @@
+#job options to activate the dump of the NSWPRDVal nTuple
+#This file can be used with Reco_tf by specifying --postinclude MuonPRDTest/NSWPRDValAlg.reco.py
+#It dumps Truth, MuEntry and Hits, Digits, SDOs, RDOs and PRDs for MM and sTGC
+#It should only be used with Reco since the alg crashes in the absence of PRDs
+
+
+#-----------------------------------------------------------------------------
+# Algorithms
+#-----------------------------------------------------------------------------
+from AthenaCommon.AlgSequence import AlgSequence
+job = AlgSequence()
+from MuonPRDTest.MuonPRDTestConf import *
+
+job+=NSWPRDValAlg('NSWPRDValAlg', OutputLevel = DEBUG)
+NSWPRDValAlg.OutputLevel = INFO
+NSWPRDValAlg.doTruth = True
+
+NSWPRDValAlg.doMuEntry = True
+
+NSWPRDValAlg.doMMHit = True
+NSWPRDValAlg.doMMDigit = True
+NSWPRDValAlg.doMMRDO = True
+NSWPRDValAlg.doMMPRD = True
+NSWPRDValAlg.doMMFastDigit = False
+
+NSWPRDValAlg.doSTGCHit = True
+NSWPRDValAlg.doSTGCDigit = True
+NSWPRDValAlg.doSTGCRDO = True
+NSWPRDValAlg.doSTGCPRD = True
+NSWPRDValAlg.doSTGCFastDigit = False
+
+#-----------------------------------------------------------------------------
+# save ROOT histograms and Tuple
+#-----------------------------------------------------------------------------
+from GaudiSvc.GaudiSvcConf import THistSvc
+ServiceMgr += THistSvc()
+ServiceMgr.THistSvc.Output = [ "NSWPRDValAlg DATAFILE='NSWPRDValAlg.reco.ntuple.root' OPT='RECREATE'" ]
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg_topOptions.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg_topOptions.py
deleted file mode 100644
index 788f5c5f9f4d653caa522d7c14b82361f552a52c..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg_topOptions.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#-----------------------------------------------------------------------------
-# Athena imports
-#-----------------------------------------------------------------------------
-from AthenaCommon.Constants import *
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ServiceMgr
-import AthenaPoolCnvSvc.ReadAthenaPool
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-
-#--------------------------------------------------------------
-# Global flags. Like eg the DD version:
-#--------------------------------------------------------------
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetDescrVersion = 'ATLAS-GEO-20-00-01'
-# USE same version as jobOptions.NSW_Sim.py
-globalflags.ConditionsTag = 'OFLCOND-SDR-BS7T-05-14'
-
-#--------------------------------------------------------------------
-# DetFlags. Use to turn on/off individual subdetector or LVL1 trigger
-#--------------------------------------------------------------------
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.ID_setOff()
-DetFlags.Calo_setOff()
-
-DetFlags.Muon_setOn()
-DetFlags.MDT_setOn()
-DetFlags.CSC_setOn()
-DetFlags.TGC_setOn()
-DetFlags.RPC_setOn()
-DetFlags.sTGC_setOn()
-DetFlags.Micromegas_setOn()
-
-
-DetFlags.digitize.MDT_setOn()
-DetFlags.digitize.TGC_setOn()
-DetFlags.digitize.RPC_setOn()
-DetFlags.digitize.CSC_setOn()
-DetFlags.digitize.Micromegas_setOff()
-DetFlags.digitize.sTGC_setOff()
-
-#DetFlags.Lucid_setOff()
-DetFlags.Truth_setOn()
-#DetFlags.LVL1_setOff()
-
-include('MuonGeoModelTest/NSWGeoSetup.py')
-
-
-#-----------------------------------------------------------------------------
-# Message Service
-#-----------------------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 9999999
-
-#-----------------------------------------------------------------------------
-# Input Datasets
-#-----------------------------------------------------------------------------
-ServiceMgr.EventSelector.InputCollections = [
-     'atlasG4.hits.pool.root'
-    ]
-theApp.EvtMax = -1 # -1 means all events
-
-#-----------------------------------------------------------------------------
-# Algorithms
-#-----------------------------------------------------------------------------
-   #if DetFlags.Micromegas_on() and DetFlags.digitize.Micromegas_on():    
-from MuonFastDigitization.MuonFastDigitizationConf import MM_FastDigitizer
-job += MM_FastDigitizer("MM_FastDigitizer")
-
-   #if DetFlags.sTGC_on() and DetFlags.digitize.sTGC_on():    
-from MuonFastDigitization.MuonFastDigitizationConf import sTgcFastDigitizer
-job += sTgcFastDigitizer("sTgcFastDigitizer")
-
-
-from MuonPRDTest.MuonPRDTestConf import *
-
-job += NSWPRDValAlg('NSWPRDValAlg', OutputLevel = WARNING)
-NSWPRDValAlg.OutputLevel = DEBUG
-NSWPRDValAlg.doTruth = True
-NSWPRDValAlg.doMMDigit = False
-#NSWPRDValAlg.doMM = False
-
-#-----------------------------------------------------------------------------
-# save ROOT histograms and Tuple
-#-----------------------------------------------------------------------------
-from GaudiSvc.GaudiSvcConf import THistSvc
-ServiceMgr += THistSvc()
-ServiceMgr.THistSvc.Output = [ "NSWPRDValAlg DATAFILE='NSWPRDValAlg_allDet.root' OPT='RECREATE'" ]