From c9d6a7056fd3e4f0f23c20e233ada8688c87731e Mon Sep 17 00:00:00 2001
From: Johannes Schumann <johannes.schumann@fau.de>
Date: Wed, 9 Dec 2020 11:46:09 +0100
Subject: [PATCH] Update uproot & awkward import style
---
km3buu/output.py | 14 +++++++-------
km3buu/propagation.py | 6 +++---
km3buu/tests/test_propagation.py | 4 ++--
requirements.txt | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/km3buu/output.py b/km3buu/output.py
index 69d07a5..64811ed 100644
--- a/km3buu/output.py
+++ b/km3buu/output.py
@@ -18,8 +18,8 @@ from io import StringIO
from os import listdir
from os.path import isfile, join, abspath
from tempfile import TemporaryDirectory
-import awkward1
-import uproot4
+import awkward as ak
+import uproot
from scipy.interpolate import UnivariateSpline
from scipy.spatial.transform import Rotation
import scipy.constants as constants
@@ -202,7 +202,7 @@ class GiBUUOutput:
Parameters
----------
- roottuple_data: awkward1.highlevel.Array
+ roottuple_data: awkward.highlevel.Array
"""
d = roottuple_data
k_in = np.vstack([
@@ -233,7 +233,7 @@ class GiBUUOutput:
Parameters
----------
- roottuple_data: awkward1.highlevel.Array
+ roottuple_data: awkward.highlevel.Array
"""
d = roottuple_data
y = 1 - np.divide(np.array(d.lepOut_E), np.array(d.lepIn_E))
@@ -257,7 +257,7 @@ class GiBUUOutput:
GiBUU output data in pandas dataframe format
"""
import pandas as pd
- df = awkward1.to_pandas(self.arrays)
+ df = ak.to_pandas(self.arrays)
sec_df = df[df.index.get_level_values(1) == 0].copy()
sec_df.loc[:, "E"] = sec_df.lepOut_E
sec_df.loc[:, "Px"] = sec_df.lepOut_Px
@@ -275,11 +275,11 @@ class GiBUUOutput:
@property
def arrays(self):
"""
- GiBUU output data in awkward1 format
+ GiBUU output data in awkward format
"""
retval = None
for ifile in self.root_pert_files:
- fobj = uproot4.open(join(self.data_path, ifile))
+ fobj = uproot.open(join(self.data_path, ifile))
if retval is None:
retval = fobj["RootTuple"].arrays()
else:
diff --git a/km3buu/propagation.py b/km3buu/propagation.py
index 8c69262..6a0564c 100644
--- a/km3buu/propagation.py
+++ b/km3buu/propagation.py
@@ -16,7 +16,7 @@ import numpy as np
import scipy.constants as const
import proposal as pp
from particle import Particle
-import awkward1 as ak
+import awkward as ak
from collections import defaultdict
from .config import Config
@@ -61,7 +61,7 @@ def propagate_lepton(lepout_data, pdgid):
Parameters
----------
- lepout_data: awkward1.highlevel.Array
+ lepout_data: awkward.highlevel.Array
Lepton data in the GiBUU output shape containing the fields
'lepOut_E, lepOut_Px, lepOut_Py, lepOut_Pz'
pdgid:
@@ -69,7 +69,7 @@ def propagate_lepton(lepout_data, pdgid):
Returns
-------
- awkward1.highlevel.Array (E, Px, Py, Pz, x, y, z)
+ awkward.highlevel.Array (E, Px, Py, Pz, x, y, z)
"""
lepton_info = Particle.from_pdgid(pdgid)
prop_range = const.c * lepton_info.lifetime * 1e11 * np.max(
diff --git a/km3buu/tests/test_propagation.py b/km3buu/tests/test_propagation.py
index 6689676..6b013f0 100644
--- a/km3buu/tests/test_propagation.py
+++ b/km3buu/tests/test_propagation.py
@@ -13,7 +13,7 @@ __status__ = "Development"
import csv
import unittest
import numpy as np
-import uproot4
+import uproot
from os.path import abspath, join, dirname
from thepipe.logger import get_logger
from km3net_testdata import data_path
@@ -34,7 +34,7 @@ class TestTauPropagation(unittest.TestCase):
log.setLevel("INFO")
self.gibuu_output = GiBUUOutput(TESTDATA_DIR)
fname = join(TESTDATA_DIR, self.gibuu_output.root_pert_files[0])
- fobj = uproot4.open(fname)
+ fobj = uproot.open(fname)
data = fobj["RootTuple"].arrays()
self.sec = propagate_lepton(data, 15)
diff --git a/requirements.txt b/requirements.txt
index 3e1e9b0..48c448b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,8 +6,8 @@ thepipe
particle
click
f90nml
-uproot4
-awkward1>=0.4.4
+uproot>=4.0.0
+awkward>=1.0.0
pandas
mendeleev
proposal
--
GitLab