diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgAnalysis.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgAnalysis.py index 93b7fab31293110c696cb1dd75268a39439e724b..2657baa2bd28f23835d88beae541e6b29e8dc145 100644 --- a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgAnalysis.py +++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgAnalysis.py @@ -28,7 +28,7 @@ def dbgPreRun(inputFileList,outputFileList): total = 0 #open root output file out_file = outputFileList[0] - hfile = TFile( out_file , 'UPDATE' ) + hfile = TFile( out_file , 'RECREATE' ) #inicialize dbgEventInfo, this is the main event analysis class eventInfo = dbgEventInfo("_Pre",inputFileList.value[0]) data = [] @@ -264,13 +264,13 @@ def getAsetupString(release): #If TestArea is for tzero (tzero/software/patches/AtlasP1HLT-RELEASE), then returns tzero/software/patches/AtlasP1HLT-release where release is the parameter given to this function getAsetupString(release) if eVarDic.get('TestArea') : TestArea = eVarDic['TestArea'] - if TestArea.find("tzero/software/patches/AtlasP1HLT-") > 0 : + if TestArea.find("tzero/software/patches/AthenaP1-") > 0 : testarea = TestArea.split('-') TestArea = testarea[0]+'-'+release - asetupString = AtlasProject + ',' + release + ',gcc49,cvmfs --testarea '+ TestArea + asetupString = AtlasProject + ',' + release + ',gcc62 --testarea '+ TestArea return asetupString #else, there is no TestArea, then use the local directory else : - asetupString = AtlasProject + ',' + release + ',gcc49,here' + asetupString = AtlasProject + ',' + release + ',gcc62,here' return asetupString diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py index e9ce500f4f44fc85fe52fa7c134384b1804966ae..579683da3b1b3b9bd1be426d5af3707535525c9e 100644 --- a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py +++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py @@ -405,7 +405,6 @@ class dbgEventInfo: def root_definitions(self,dbgStep,inputFile): - gROOT.Reset() gStyle.SetCanvasColor(0) gStyle.SetOptStat(000000) gROOT.SetStyle("Plain") diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py index 5e5b57a923670f870ed7f964ca722800595da339..8726c20d3edd14120f200da041ed11359594acaa 100644 --- a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py +++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py @@ -16,7 +16,7 @@ import re from PyJobTransforms.trfExe import athenaExecutor #imports for preExecute -from PyJobTransforms.trfUtils import asetupReport +from PyJobTransforms.trfUtils import asetupReport, cvmfsDBReleaseCheck import PyJobTransforms.trfEnv as trfEnv import PyJobTransforms.trfExceptions as trfExceptions from PyJobTransforms.trfExitCodes import trfExit as trfExit