Skip to content

Commit 04e7e2b

Browse files
committed
Fixed a leftover diff statement in quickCurve. Added installing make2FGLxml to setup.py.
1 parent 28de765 commit 04e7e2b

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed
File renamed without changes.

quickCurve.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,6 @@ def cli():
263263
except getopt.error as e:
264264
print "Command Line Error: " + e.msg
265265
printCLIHelp()
266-
266+
267267
if __name__ == '__main__': cli()
268-
>>>>>>> 205b0ae087c304e0219ee076d76c3a5d653b4e01
268+

setup.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
#else:
1313
# print "pyds9 found."
1414

15-
try:
16-
import make2FGLxml
17-
except ImportError:
18-
print "make2FGLxml not found (required for making an XML model)."
19-
sys.exit(1)
20-
else:
21-
print "make2FGLxml found."
15+
#try:
16+
# import make2FGLxml
17+
#except ImportError:
18+
# print "make2FGLxml not found (required for making an XML model)."
19+
# sys.exit(1)
20+
#else:
21+
# print "make2FGLxml found."
2222

2323
fermi_dir = os.environ.get("FERMI_DIR")
2424

@@ -38,7 +38,8 @@
3838
'quickAnalysis',
3939
'quickLike',
4040
'quickPlot',
41-
'quickCurve'],
41+
'quickCurve',
42+
'make2FGLxml'],
4243
data_files=[(fermi_dir+"/bin",['scripts/quickAnalysis',
4344
'scripts/quickLike',
4445
'scripts/quickPlot',

0 commit comments

Comments
 (0)