diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
index 1799887d009f9120d180380d7d08e51a877a9278..c405eab7dc6d28c479b4fd2d2b5d7d8bc71f8ddc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
@@ -16,10 +16,8 @@
 # art-output: *.json
 # art-output: *.root
 # art-output: *.check*
-# art-output: HLTEF-plots
-# art-output: HLTL2-plots
-# art-output: times
-# art-output: times-FTF
+# art-output: HLT*
+# art-output: times*
 # art-output: cost-perCall
 # art-output: cost-perEvent
 # art-output: cost-perCall-chain
@@ -34,17 +32,24 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, T
 import sys,getopt
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:],"l",["local"])
+    opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
 except getopt.GetoptError:
-    print("Usage: -l(--local)")
+    print("Usage:  ")
+    print("-l(--local)    run locally with input file from art eos grid-input")
+    print("-x             don't run athena or post post-processing, only plotting")
+    print("-p             run post-processing, even if -x is set")
 
 
 local=False
+exclude=False
+postproc=False
 for opt,arg in opts:
     if opt in ("-l", "--local"):
         local=True
-
-
+    if opt=="-x":
+        exclude=True
+    if opt=="-p":
+        postproc=True
 
 
 rdo2aod = TrigInDetReco()
@@ -59,14 +64,17 @@ rdo2aod.input = 'ttbar_pu80'   # defined in TrigValTools/share/TrigValInputs.jso
 
 test = Test.Test()
 test.art_type = 'grid'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+    test.exec_steps = [rdo2aod]
+    test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+    test.check_steps = CheckSteps.default_check_steps(test)
 
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
- 
 # Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+    rdict = TrigInDetdictStep()
+    rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+    test.check_steps.append(rdict)
+
  
 # Now the comparitor steps
 comp=TrigInDetCompStep('Comp_L2muon')
@@ -111,7 +119,6 @@ comp8.flag='EFele'
 comp8.test='ttbar'
 test.check_steps.append(comp8)
 
-
 # CPU cost steps
 cpucost=TrigInDetCpuCostStep('CpuCostStep1')
 test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py
index 298f1d250f0614b8f41f87aae180fa9a6c440ffc..284d2f4d37406dba3d485a6dfb2c2ac25b6c772d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py
@@ -16,10 +16,8 @@
 # art-output: *.json
 # art-output: *.root
 # art-output: *.check*
-# art-output: HLTEF-plots
-# art-output: HLTL2-plots
-# art-output: times
-# art-output: times-FTF
+# art-output: HLT*
+# art-output: times*
 # art-output: cost-perCall
 # art-output: cost-perEvent
 # art-output: cost-perCall-chain
@@ -34,17 +32,24 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, T
 import sys,getopt
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:],"l",["local"])
+    opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
 except getopt.GetoptError:
-    print("Usage: -l(--local)")
+    print("Usage:  ")
+    print("-l(--local)    run locally with input file from art eos grid-input")
+    print("-x             don't run athena or post post-processing, only plotting")
+    print("-p             run post-processing, even if -x is set")
 
 
 local=False
+exclude=False
+postproc=False
 for opt,arg in opts:
     if opt in ("-l", "--local"):
         local=True
-
-
+    if opt=="-x":
+        exclude=True
+    if opt=="-p":
+        postproc=True
 
 
 rdo2aod = TrigInDetReco()
@@ -59,14 +64,17 @@ rdo2aod.input = 'ttbar_pu80'   # defined in TrigValTools/share/TrigValInputs.jso
 
 test = Test.Test()
 test.art_type = 'grid'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+    test.exec_steps = [rdo2aod]
+    test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+    test.check_steps = CheckSteps.default_check_steps(test)
 
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
- 
 # Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+    rdict = TrigInDetdictStep()
+    rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+    test.check_steps.append(rdict)
+
  
 # Now the comparitor steps
 comp=TrigInDetCompStep('Comp_L2muon')
@@ -111,7 +119,6 @@ comp8.flag='EFele'
 comp8.test='ttbar'
 test.check_steps.append(comp8)
 
-
 # CPU cost steps
 cpucost=TrigInDetCpuCostStep('CpuCostStep1')
 test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
index 6c7fbf7612f2fcf9bcc75cd467fb75a814418158..8319488e7ac440ba44287f878c70b023506d1b4c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO increase to 20k
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
index f776615fc755f515edc35608d815ae246f6b8a0a..e7c65c39cb1ee04c06bf304294e63fa3f63d418b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO change to 20k 
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
index 8df478225d8b315a673ca2feaa6651d2b03ec152..034098a929eeed4023dd2e6000294d2126d9c20e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO increase to 20k  
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
index 85b8d982d9a33e01dda646459ee4fbc1f70bd677..8d3959ddb7055558239bea1ad1191251ab489d05 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO increase to 20k  
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
index 4ec84558e5762a8fe465eeac7d6b1a6278bc59e1..f63ba3a27c7ef0c28766feb7ab378cfb2fd89752 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['electron']
-rdo2aod.max_events = 16000 
+rdo2aod.max_events = 5000 # TODO increase to 16k 
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
index 7300d2abd12e108b9879bfc0a60ec624b1d7d412..a3b851ef0d6a32b8747ba98dfcd8b0db271245e2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['muon']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO increase to 20k 
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
index ac265c0fa2d42878d875a50aceaf1f6ac52c7d73..51f920136e34b10e0d87510a2e36a4595b42e628 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
@@ -54,7 +54,7 @@ for opt,arg in opts:
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['muon']
-rdo2aod.max_events = 20000 
+rdo2aod.max_events = 5000 # TODO increase to 20k 
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
index 8c0308f2fec2629cf770d3e15e8242b7358a1dce..1c706c4fcfafc3170e5c802fae5a2ce967a5c23d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
@@ -28,7 +28,7 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, T
 
 rdo2aod = TrigInDetReco()
 rdo2aod.slices = ['muon']
-rdo2aod.max_events = 2000 # TODO: 2000 events
+rdo2aod.max_events = 100 # TODO: 2000 events
 rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False