Commit 303f25f6 authored by Louie Dartmoor Corpe's avatar Louie Dartmoor Corpe Committed by Ewelina Maria Lobodzinska
Browse files

Updates to systematics tool in athena 21.6

parent 2bcd820c
......@@ -19,7 +19,7 @@ find_package( YODA )
# Install files from the package:
atlas_install_python_modules( local/bin/*.py )
atlas_install_scripts(share/*.sh)
atlas_install_data( data/*.yaml )
atlas_install_scripts( local/bin/*.py )
# Aliases:
......
......@@ -51,7 +51,7 @@ try:
import numpy as np
except:
print("[ERROR], looks like the YODA, YAML, LHAPDF or NUMPy packages are not installed. Please run this command and try again:")
print("setupPMGSystematicsTool.sh")
print("source setupPMGSystematicsTool.sh")
exit(1)
import cPickle as pickle
import os, sys, re
......@@ -240,7 +240,7 @@ def getXS(dsid, campaign=15, userFile=None):
campaign=14
# this triggers a search in the manual, local XS file
if campaign>16 or campaign < 15:
dataDir=os.environ["SYSTTOOLSPATH"]+"/data/"
dataDir=os.environ["SYSTTOOLSPATH"]+"/data/PMGSystematicsTools"
if userFile is None:
pmgXSFile="%s/PMGxsecDB_manual.txt" %dataDir
else:
......@@ -1458,7 +1458,7 @@ def makeSystematicsPlotsWithROOT(mergedSystDict, outdir, nominalName="Nominal",
aos_ratio[aoNameNoRef][fn]= arrayDictToTGraph(ao,False, setYErrorsToZero, nfr)
# this is the best guess as to where the reference data might be !
dataDir=os.environ["SYSTTOOLSPATH"]+"/data/"
dataDir=os.environ["SYSTTOOLSPATH"]+"/data/PMGSystematicsTools"
rivetAnalysis=aoName.split("/")[1] if len(aoName.split("/"))>1 else ""
pathInRivetEnv="%s/Rivet/%s.yoda"%(RIVET_ANALYSIS_PATH ,rivetAnalysis)
# for the first file, also get the .plot which will be needed to format
......@@ -1893,7 +1893,7 @@ def getCombinationRecipe(systWeights, combinationRecipeFile=None, combinationRe
if combinationRecipeFile is not None:
data=yaml.load(open(combinationRecipeFile,'r'))
else:
data=yaml.load(open('%s/data/Syst_Database.yaml'%dataBaseDir,'r'))
data=yaml.load(open('%s/data/PMGSystematicsTools/Syst_Database.yaml'%dataBaseDir,'r'))
for recipe, details in data.items():
if combinationRecipeName is not None:
if recipe==combinationRecipeName:
......
......@@ -15,3 +15,7 @@ if [ -e /usr/lib64/atlas/libsatlas.so ]; then
fi
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$workaroundLib"
fi
toolpath=`which systematicsTool.py`
tooldir=`dirname $toolpath`
export SYSTTOOLSPATH=`dirname ${tooldir}`
export PYTHONPATH=$PYTHONPATH:${tooldir}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment