diff --git a/app/CalibADC/run.py b/app/CalibADC/run.py index a115cde7..6c2ebfa0 100755 --- a/app/CalibADC/run.py +++ b/app/CalibADC/run.py @@ -3,7 +3,8 @@ for l in [x for x in os.listdir(os.environ['LARCV_LIBDIR']) if x.endswith('.so')]: ROOT.gSystem.Load('%s/%s' % (os.environ['LARCV_LIBDIR'],l)) -from ROOT import larcv, std +from ROOT import std +from larcv import larcv if len(sys.argv) < 2: diff --git a/app/ImageAna/run.py b/app/ImageAna/run.py index 33c2d5ee..69acd1ab 100755 --- a/app/ImageAna/run.py +++ b/app/ImageAna/run.py @@ -3,7 +3,8 @@ for l in [x for x in os.listdir(os.environ['LARCV_LIBDIR']) if x.endswith('.so')]: ROOT.gSystem.Load('%s/%s' % (os.environ['LARCV_LIBDIR'],l)) -from ROOT import larcv, std +from ROOT import std +from larcv import larcv if len(sys.argv) < 2: diff --git a/app/PMTWeights/foo.py b/app/PMTWeights/foo.py index 928119a0..fc268a55 100755 --- a/app/PMTWeights/foo.py +++ b/app/PMTWeights/foo.py @@ -1,9 +1,11 @@ #!/usr/bin/env python -import ROOT, sys, os +import ROOT +import sys, os for l in [x for x in os.listdir(os.environ['LARCV_LIBDIR']) if x.endswith('.so')]: ROOT.gSystem.Load('%s/%s' % (os.environ['LARCV_LIBDIR'],l)) -from ROOT import larcv, std +from ROOT import std +from larcv import larcv if len(sys.argv) < 2: diff --git a/app/PMTWeights/test_pmtweights.py b/app/PMTWeights/test_pmtweights.py index 6d36af8e..cfc588f1 100644 --- a/app/PMTWeights/test_pmtweights.py +++ b/app/PMTWeights/test_pmtweights.py @@ -1,5 +1,6 @@ import os,sys -from ROOT import larcv, std +from ROOT import std +from larcv import larcv fname = sys.argv[1] diff --git a/app/SmallSampleMaker/run.py b/app/SmallSampleMaker/run.py index 8e1980a5..767dca94 100755 --- a/app/SmallSampleMaker/run.py +++ b/app/SmallSampleMaker/run.py @@ -3,7 +3,8 @@ for l in [x for x in os.listdir(os.environ['LARCV_LIBDIR']) if x.endswith('.so')]: ROOT.gSystem.Load('%s/%s' % (os.environ['LARCV_LIBDIR'],l)) -from ROOT import larcv, std +from ROOT import std +from larcv import larcv if len(sys.argv) < 2: diff --git a/app/tests/test_eltwisemult.py b/app/tests/test_eltwisemult.py index 09ca08e1..d23ac7ce 100644 --- a/app/tests/test_eltwisemult.py +++ b/app/tests/test_eltwisemult.py @@ -1,7 +1,7 @@ import os,sys import ROOT import numpy as np -from ROOT import larcv +from larcv import larcv print larcv.Image2D # TESTS MATRIX MULTIPLICATION FEATURE diff --git a/app/tests/test_matrixmult.py b/app/tests/test_matrixmult.py index a068edbd..63a26af9 100644 --- a/app/tests/test_matrixmult.py +++ b/app/tests/test_matrixmult.py @@ -1,7 +1,7 @@ import os,sys import ROOT import numpy as np -from ROOT import larcv +from larcv import larcv print larcv.Image2D # TESTS MATRIX MULTIPLICATION FEATURE diff --git a/core/DataFormat/test/test_both.py b/core/DataFormat/test/test_both.py index bfd040f6..759ab1af 100644 --- a/core/DataFormat/test/test_both.py +++ b/core/DataFormat/test/test_both.py @@ -1,7 +1,7 @@ import ROOT #ROOT.gSystem.Load("libLArCV") #ROOT.gSystem.Load("libLArCVData") -from ROOT import larcv +from larcv import larcv o=larcv.IOManager(larcv.IOManager.kBOTH) o.reset() o.set_verbosity(0) diff --git a/mac/dump_all_bb.py b/mac/dump_all_bb.py index d5bb95d7..b8d5740c 100644 --- a/mac/dump_all_bb.py +++ b/mac/dump_all_bb.py @@ -1,4 +1,4 @@ -from ROOT import larcv +from larcv import larcv larcv.IOManager from ROOT import TChain import sys diff --git a/mac/dump_bb.py b/mac/dump_bb.py index 84239ca7..954ea979 100644 --- a/mac/dump_bb.py +++ b/mac/dump_bb.py @@ -1,4 +1,4 @@ -from ROOT import larcv +from larcv import larcv larcv.IOManager from ROOT import TChain import sys diff --git a/mac/dump_chstatus.py b/mac/dump_chstatus.py index b3d67056..47e6e6ff 100644 --- a/mac/dump_chstatus.py +++ b/mac/dump_chstatus.py @@ -1,4 +1,4 @@ -from ROOT import larcv +from larcv import larcv larcv.IOManager from ROOT import TChain import sys diff --git a/mac/dump_pixels.py b/mac/dump_pixels.py index 1bafbb3c..ed2d37e0 100644 --- a/mac/dump_pixels.py +++ b/mac/dump_pixels.py @@ -1,4 +1,4 @@ -from ROOT import larcv +from larcv import larcv larcv.IOManager from ROOT import TChain import sys diff --git a/mac/mac/concat_roi.py b/mac/mac/concat_roi.py index 840de97c..5fca374b 100644 --- a/mac/mac/concat_roi.py +++ b/mac/mac/concat_roi.py @@ -1,4 +1,4 @@ -from ROOT import larcv +from larcv import larcv import numpy as np #TWO different files from two ``scans" diff --git a/python/larcv/__init__.py b/python/larcv/__init__.py index 66ecb4cd..35df7a8c 100644 --- a/python/larcv/__init__.py +++ b/python/larcv/__init__.py @@ -8,7 +8,7 @@ larcv_dir = os.environ['LARCV_LIBDIR'] for l in [x for x in os.listdir(larcv_dir) if x.endswith('.so')]: ROOT.gSystem.Load(l) -from ROOT import larcv +from larcv import larcv k=larcv.logger # this line to load C++ functions if 'LARCV_NUMPY' in os.environ and os.environ['LARCV_NUMPY'] == '1': larcv.load_pyutil