Merge branch '21.0-movingPathExtractLibrary' into 21.0-hotSpotInHIST-nameFix

Former-commit-id: 3e094675df5d9354aee3614d1c2ecdfcc7329cf8

DataQuality/DataQualityUtils/scripts/pathExtract.py → DataQuality/DataQualityUtils/python/pathExtract.py

@@ -24,30 +24,6 @@ def returnEosHistPath(run,stream,amiTag,tag="data16_13TeV"):
 
    return "FILE NOT FOUND"
 
-# OBSOLETE - See below
-# Return the path of the output of tier0 monitoring for the single LB (available only a couple of days after processing)
-#def returnEosHistPathLB(run,lb,stream,amiTag,tag="data16_13TeV"):
-#   prefix = {'express':'express_','Egamma':'physics_','CosmicCalo':'physics_','JetTauEtmiss':'physics_','Main':'physics_','ZeroBias':'physics_'}
-#   path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'
-#   P = sp.Popen(['/afs/cern.ch/project/eos/installation/0.3.84-aquamarine/bin/eos.select','ls',path],stdout=sp.PIPE,stderr=sp.PIPE)
-#   p = P.communicate()
-#   listOfFiles = p[0].split('\n')
-#
-#   for iFile in listOfFiles:
-#      if ("recon.HIST.%s"%(amiTag) in iFile and "LOG" not in iFile):
-#         path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'+iFile
-#         P = sp.Popen(['/afs/cern.ch/project/eos/installation/0.3.84-aquamarine/bin/eos.select','ls',path],stdout=sp.PIPE,stderr=sp.PIPE)
-#         p = P.communicate()
-#         listOfFiles2 = p[0].split('\n')
-#         for iFile2 in listOfFiles2:            
-#            print iFile2
-#            ilb = int((iFile2.split("_lb")[1]).split("._SFO")[0])
-#            if (lb == ilb):
-#               path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'+iFile+'/'+iFile2
-#               return path
-#
-#   return "FILE NOT FOUND"
-
 # Return the path of the output of tier0 monitoring for a range of single LB (available only a couple of days after processing)
 def returnEosHistPathLB(run,lb0,lb1,stream,amiTag,tag="data16_13TeV"):
    prefix = {'express':'express_','Egamma':'physics_','CosmicCalo':'physics_','JetTauEtmiss':'physics_','Main':'physics_','ZeroBias':'physics_'}

DataQuality/DataQualityUtils/scripts/checkCorrelInHIST.py

@@ -39,7 +39,7 @@ import string
 import argparse
 import xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 
 from ROOT import TFile,TCanvas,TBox,TPaveText,TColor
 from ROOT import TH1,TH2,TH1I,TH1D,TH2D

DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py

@@ -36,7 +36,7 @@ import os, sys
 import string
 import argparse,xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 
 from ROOT import TFile,TCanvas,TBox,TColor,TLegend
 from ROOT import TH1,TH2,TH1I

DataQuality/DataQualityUtils/scripts/hotSpotInTAG.py

@@ -23,7 +23,7 @@ import os, sys
 import string,math
 from math import fabs
 import argparse
-import pathExtract
+from DataQualityUtils import pathExtract
 
 import ROOT
 from ROOT import *

DataQuality/DataQualityUtils/scripts/readTier0HIST.py

@@ -18,7 +18,7 @@ import os, sys
 import argparse
 import xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract
 
 from ROOT import TFile,TBrowser
 from ROOT import gStyle

DataQuality/DataQualityUtils/scripts/readTier0LARNOISE.py

@@ -14,10 +14,10 @@
 import os, sys  
 import argparse
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 import xmlrpclib
 
-from ROOT import TFile,TBrowser
+from ROOT import TFile,TBrowser,TChain
 from ROOT import gStyle
 
 gStyle.SetPalette(1)

DataQuality/DataQualityUtils/scripts/readTier0TAGs.py

@@ -14,13 +14,12 @@
 import os, sys  
 import argparse
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 import xmlrpclib
 
 from ROOT import TFile,TChain
 from ROOT import gStyle
 
-#gROOT.Reset()
 gStyle.SetPalette(1)
 gStyle.SetOptStat("em")