Fix for TrigInDetValidation ART tests - use correct files from grid

	modified:   Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
	modified:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
	modified:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
	modified:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py
	modified:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py

@@ -35,6 +35,15 @@ exclude       = False
 postproc      = False
 lowpt_local   = []
 
+
+try: GridFiles
+except NameError: GridFiles=False
+
+if GridFiles==True :
+    use_gridfiles = True
+else:
+    use_gridfiles = False
+
 for opt,arg in opts:
     if opt in ("-l", "--local"):
         local=True
@@ -80,12 +89,13 @@ rdo2aod.perfmon = False
 rdo2aod.timeout = 18*3600
 rdo2aod.input   = Input    # defined in TrigValTools/share/TrigValInputs.json  
 
-if local:
+if use_gridfiles: 
+    if local:
 #   rdo2aod.input = 'Single_el_larged0'    # defined in TrigValTools/share/TrigValInputs.json  
-    rdo2aod.input = Input   # should match definition in TrigValTools/share/TrigValInputs.json  
-else:
-    rdo2aod.input = ''
-    rdo2aod.args += ' --inputRDOFile=$ArtInFile '
+       rdo2aod.input = Input   # should match definition in TrigValTools/share/TrigValInputs.json  
+    else:
+       rdo2aod.input = ''
+       rdo2aod.args += ' --inputRDOFile=$ArtInFile '
 
 
 

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py

@@ -3,7 +3,6 @@
 # art-description: art job for fsjet_ml_pu40
 # art-type: grid
 # art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
 # art-input-nfiles: 3
 # art-athena-mt: 4
 # art-memory: 4096

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py

@@ -3,7 +3,6 @@
 # art-description: art job for fsjet_pu40
 # art-type: grid
 # art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
 # art-input-nfiles: 3
 # art-athena-mt: 4
 # art-memory: 4096

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py

@@ -3,7 +3,6 @@
 # art-description: art job for fsjet_pu40_mt
 # art-type: grid
 # art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
 # art-input-nfiles: 3
 # art-athena-mt: 4
 # art-memory: 4096

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py

@@ -33,8 +33,9 @@ Events  = 8000
 Threads = 4 
 Slots   = 4 # what about the mt: 4 art directive ? nfiles: 3 ?
 Input   = 'Zmumu_pu40'    # defined in TrigValTools/share/TrigValInputs.json
-Args    = " -p 13 "
+GridFiles=True
 
+Args = " -p 13 "
 TrackReference = [ 'Truth', 'Offline' ]
 Lowpt          = [ False, True ]