Merge branch '21.2-STArt-27.07.2018' into '21.2'

SUSYTools: Update to ART monitoring to support running over DAODs

See merge request atlas/athena!13074

Former-commit-id: 1ab87b4a38eac10a89242a0b5252c7aa6c88934c

PhysicsAnalysis/SUSYPhys/SUSYTools/scripts/TestSUSYToolsAlg.py

@@ -13,6 +13,9 @@ parser.add_option( '-s', '--submission-dir', dest = 'submission_dir',
 parser.add_option('-t', '--type', dest = 'type',
                   action = 'store', type = 'string', default = 'MC',
                   help = 'Job type. (MC, AFII, DATA)' )
+parser.add_option('-d', '--daod', dest = 'daod',
+                  action = 'store', type = 'int', default = '0',
+                  help = 'input DAOD type. Do not specify for xAOD input' )
 parser.add_option('-m', '--maxEvts', dest = 'maxEvts',
                   action = 'store', type = 'int', default = '500',
                   help = 'Max events (-1 is all)' )
@@ -28,15 +31,19 @@ import os
 sh = ROOT.SH.SampleHandler()
 sh.setMetaString( 'nc_tree', 'CollectionTree' )
 
+cvmfsInputArea = '/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/SUSYTools/ART/ARTInput'
 inputFile = ''
 
-if options.type == "AFII":
-    inputFile = os.getenv( 'ASG_TEST_FILE_MC_AFII' )
-elif options.type == "DATA":
-    inputFile = os.getenv( 'ASG_TEST_FILE_DATA' )
+if options.daod == 0:
+    if options.type == "AFII":
+        inputFile = os.getenv( 'ASG_TEST_FILE_MC_AFII' )
+    elif options.type == "DATA":
+        inputFile = os.getenv( 'ASG_TEST_FILE_DATA' )
+    else:
+        inputFile = os.getenv( 'ASG_TEST_FILE_MC' )
 else:
-    inputFile = os.getenv( 'ASG_TEST_FILE_MC' )
-
+    inputFile = '%s/DAOD_data18SUSY%s.art.merge.root' % (cvmfsInputArea, options.daod)
+    
 basePath = os.path.basename(inputFile)
 sample_dir = os.path.dirname(os.path.abspath(inputFile))
 mother_dir = os.path.dirname(sample_dir)       

PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data-SUSY1-AnaBase-grid.sh

+#!/bin/sh
+
+# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
+# art-type: grid
+# art-include: 21.2/AnalysisBase
+# art-output: hist-DATA_DAOD_SUSY1.root
+# art-output: dcube
+
+# Create empty pool file
+art.py createpoolfile
+
+echo "Running SUSYTools test: \'TestSUSYToolsAlg.py -t DATA -m -1 -d 1\'"
+TestSUSYToolsAlg.py -t DATA -m -1 -d 1
+echo  "art-result: $? TEST"
+
+mv submitDir/hist-ARTInput.root ./hist-DATA_DAOD_SUSY1.root
+
+echo "Running DCube post-processing"
+
+tName="DATA-SUSY1"
+dcubeRef=/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/SUSYTools/ART/References/hist-DATA_DAOD_SUSY1.root
+dcubeXml=/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/SUSYTools/ART/xml/dcube_config_master.xml
+
+/cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube ${tName} hist-DATA_DAOD_SUSY1.root ${dcubeXml} ${dcubeRef}
+
+echo "art-result: $? DCUBE"
+
+echo "Done."