Merge branch 'fix_dbg_str_transform_for_21.1' into '21.1'

fixes to dbg_strean  TrigTrransform into  21.1

See merge request !2321

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

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")

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