Rename chroma.fileio to chroma.io

7 files changed, 6 insertions, 6 deletions

diff --git a/.rootlogon.C b/.rootlogon.C
index 17915c5..ce0159c 100644
--- a/.rootlogon.C
+++ b/.rootlogon.C
@@ -1,3 +1,3 @@
 {
-  gROOT->ProcessLine(".L fileio/root.C+g");
+  //gROOT->ProcessLine(".L fileio/root.C+g");
 }
diff --git a/chroma/__init__.py b/chroma/__init__.py
index 3359bbc..bc6d5cc 100644
--- a/chroma/__init__.py
+++ b/chroma/__init__.py
@@ -1,7 +1,7 @@
 from camera import Camera, EventViewer, view, build
 import geometry
 import event
-from fileio import root
+from io import root
 import generator
 import gpu
 import itertoolset
diff --git a/chroma/camera.py b/chroma/camera.py
index 470a1b9..575d13d 100644
--- a/chroma/camera.py
+++ b/chroma/camera.py
@@ -18,7 +18,7 @@ from chroma.transform import rotate, make_rotation_matrix
 from chroma.sample import uniform_sphere
 from chroma.optics import vacuum
 from chroma.project import from_film
-from chroma.fileio.root import RootReader
+from chroma.io.root import RootReader
 from chroma import make
 from chroma import gpu
 
diff --git a/chroma/fileio/__init__.py b/chroma/io/__init__.py
index e69de29..e69de29 100644
--- a/chroma/fileio/__init__.py
+++ b/chroma/io/__init__.py
diff --git a/src/root.C b/chroma/io/root.C
index 2b39b1b..2b39b1b 100644
--- a/src/root.C
+++ b/chroma/io/root.C
diff --git a/chroma/fileio/root.py b/chroma/io/root.py
index af86deb..bb4b39a 100644
--- a/chroma/fileio/root.py
+++ b/chroma/io/root.py
@@ -2,7 +2,7 @@ import ROOT
 import os.path
 import numpy as np
 
-ROOT.gROOT.ProcessLine('.L '+os.path.join(os.path.dirname(__file__), 'root.C+g'))
+ROOT.gROOT.ProcessLine('.L '+os.path.join(os.path.dirname(__file__), 'root.C'))
 
 import ROOT
 import chroma.event as event
diff --git a/test/test_fileio.py b/test/test_io.py
index 3869a9f..3553058 100644
--- a/test/test_fileio.py
+++ b/test/test_io.py
@@ -1,9 +1,9 @@
 import unittest
-from chroma.fileio import root
+from chroma.io import root
 from chroma import event
 import numpy as np
 
-class TestFileIO(unittest.TestCase):
+class TestRootIO(unittest.TestCase):
     def test_file_write_and_read(self):
         ev = event.Event(1, event.Vertex('e-', pos=(0,0,1), dir=(1,0,0),
                                          ke=15.0, pol=(0,1,0)))