Skip to content

Commit

Permalink
Merge 5b59226 into 97052d6
Browse files Browse the repository at this point in the history
  • Loading branch information
prjemian committed Jul 12, 2019
2 parents 97052d6 + 5b59226 commit 4eb87bc
Show file tree
Hide file tree
Showing 46 changed files with 646 additions and 408 deletions.
2 changes: 1 addition & 1 deletion src/spec2nexus/extractSpecScan.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import os
import sys
from spec2nexus import spec
from . import spec


#-------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/spec2nexus/nexus.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
path = os.path.join('..', os.path.dirname(__file__))
sys.path.insert(0, os.path.abspath(path))

from spec2nexus import spec
from spec2nexus import writer
from . import spec
from . import writer


hdf5_extension = '.hdf5'
Expand Down

0 comments on commit 4eb87bc

Please sign in to comment.