summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Seibert <stan@mtrr.org>2011-08-10 11:25:39 -0400
committerStan Seibert <stan@mtrr.org>2011-08-10 11:25:39 -0400
commit01d5527db39520ca548518ed1194f8b863a4f077 (patch)
treeac75370a5677bac0f64e0b7529af40b94cfef4f8
parent23b4bedf43f2ff120c1178c3445e39b8735030f3 (diff)
downloadchroma-01d5527db39520ca548518ed1194f8b863a4f077.tar.gz
chroma-01d5527db39520ca548518ed1194f8b863a4f077.tar.bz2
chroma-01d5527db39520ca548518ed1194f8b863a4f077.zip
Rename chroma.io to chroma.fileio to avoid collision with Python package named io
-rw-r--r--.rootlogon.C2
-rw-r--r--fileio/__init__.py (renamed from io/__init__.py)0
-rw-r--r--fileio/root.C (renamed from io/root.C)0
-rw-r--r--fileio/root.py (renamed from io/root.py)0
-rwxr-xr-xsim.py2
5 files changed, 2 insertions, 2 deletions
diff --git a/.rootlogon.C b/.rootlogon.C
index f1b4cf6..17915c5 100644
--- a/.rootlogon.C
+++ b/.rootlogon.C
@@ -1,3 +1,3 @@
{
- gROOT->ProcessLine(".L io/root.C+g");
+ gROOT->ProcessLine(".L fileio/root.C+g");
}
diff --git a/io/__init__.py b/fileio/__init__.py
index e69de29..e69de29 100644
--- a/io/__init__.py
+++ b/fileio/__init__.py
diff --git a/io/root.C b/fileio/root.C
index 096811a..096811a 100644
--- a/io/root.C
+++ b/fileio/root.C
diff --git a/io/root.py b/fileio/root.py
index e43f5d4..e43f5d4 100644
--- a/io/root.py
+++ b/fileio/root.py
diff --git a/sim.py b/sim.py
index 34477f9..7644266 100755
--- a/sim.py
+++ b/sim.py
@@ -8,7 +8,7 @@ import detectors
import optics
import gpu
import g4gen
-from io import root
+from fileio import root
import numpy as np
import math
import ROOT