removing all instances of from ROOT import larcv

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:
 

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:
 

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:
 

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]
 

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:
 

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

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

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)

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

mac/dump_bb.py

@@ -1,4 +1,4 @@
-from ROOT import larcv
+from larcv import larcv
 larcv.IOManager
 from ROOT import TChain
 import sys

mac/dump_chstatus.py

@@ -1,4 +1,4 @@
-from ROOT import larcv
+from larcv import larcv
 larcv.IOManager
 from ROOT import TChain
 import sys

mac/dump_pixels.py

@@ -1,4 +1,4 @@
-from ROOT import larcv
+from larcv import larcv
 larcv.IOManager
 from ROOT import TChain
 import sys

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"

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