Merge branch 'master-TIDV-art67' into 'master'

TrigInDetValidation: add options to change MALLOC setting

See merge request atlas/athena!42203

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py

@@ -38,6 +38,7 @@ dry_run       = False
 
 if "Art_type"  not in locals(): Art_type = 'grid'
 if "GridFiles" not in locals(): GridFiles=False
+if "Malloc" not in locals(): Malloc=False
 
 for opt,arg in opts:
     if opt in ("-l", "--local"):
@@ -100,7 +101,10 @@ if GridFiles:
        rdo2aod.input = ''
        rdo2aod.args += ' --inputRDOFile=$ArtInFile '
 
-
+if (Malloc):
+    import os
+    os.environ["MALLOC_CHECK_"] = "3"
+    rdo2aod.malloc = True
 
 # Run athena analysis to produce TrkNtuple
 

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_malloc.py

+#!/usr/bin/env python
+
+# art-description: art job for mu_singlemu_larged0
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728
+# art-input-nfiles: 10
+# art-athena-mt: 8
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat 
+
+
+Slices  = ['muon']
+Events  = 20000 
+Threads = 8 
+Slots   = 8
+Input   = 'Single_mu_larged0'    # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+Malloc=True
+
+Jobs = [ ( "Truth",       " TIDAdata-run3-larged0.dat                    -o data-hists.root -p 13",   "Test_bin_larged0.dat" ),
+         ( "Offline",     " TIDAdata-run3-offline-larged0.dat -r Offline -o data-hists-offline.root", "Test_bin_larged0.dat" ) ]
+
+Comp = [ ( "L2muon",              "L2muon",      "data-hists.root",         " -c TIDAhisto-panel.dat  -d HLTL2-plots " ),
+         ( "L2muon-lowpt",        "L2muonLowpt", "data-hists.root",         " -c TIDAhisto-panel.dat  -d HLTL2-plots-lowpt " ),
+         ( "L2muonoffline",       "L2muon",      "data-hists-offline.root", " -c TIDAhisto-panel.dat  -d HLTL2-plots-offline " ),
+         ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat  -d HLTL2-plots-lowpt-offline " ),
+         ( "EFmuon",              "EFmuon",      "data-hists.root",         " -c TIDAhisto-panel.dat  -d HLTEF-plots " ),
+         ( "EFmuon-lowpt",        "EFmuonLowpt", "data-hists.root",         " -c TIDAhisto-panel.dat  -d HLTEF-plots-lowpt " ),
+         ( "EFmuonoffline",       "EFmuon",      "data-hists-offline.root", " -c TIDAhisto-panel.dat  -d HLTEF-plots-offline " ),
+         ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat  -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include 
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
+
+
+ 

Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py

@@ -34,6 +34,7 @@ class ExecStep(Step):
         self.imf = True
         self.perfmon = True
         self.costmon = False
+        self.malloc = False
         self.prmon = True
         self.config_only = False
         self.auto_report_result = True
@@ -169,6 +170,8 @@ class ExecStep(Step):
                 athenaopts += ' --imf'
             if self.perfmon:
                 athenaopts += ' --perfmon'
+            if self.malloc:
+                athenaopts += " --stdcmalloc "
             if self.costmon:
                 athenaopts += " -c 'forceCostMonitoring=True ' "