Merge pull request #122 from mireianievas/master

Minor fixes, matplotlib style, gtpsf and Bayesian Blocks

enrico/RunGTlike.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
-import os,os.path,math
+import os,glob,os.path,math
 from enrico import utils
 from enrico.gtfunction import Observation
 from enrico.fitmaker import FitMaker
 import Loggin
 import SummedLikelihood
+from enrico.xml_model import XmlMaker
 from enrico.extern.configobj import ConfigObj
 from utils import hasKey, isKey, typeirfs
 
@@ -31,8 +32,8 @@ def GenAnalysisObjects(config, verbose = 1, xmlfile =""):
     SummedLike = config['Spectrum']['SummedLike']
     folder = config['out']
 
-    # If there is no xml file, create it and print a warning
-    if (not os.path.isfile(config['file']['xml'])):
+    # If there are no xml files, create it and print a warning
+    if (glob.glob("%s*.xml" %config['file']['xml'].replace('.xml','')) is []):
         mes.warning("Xml not found, creating one for the given config %s" %config['file']['xml'])
         XmlMaker(config)
 

enrico/appertureLC.py

@@ -8,6 +8,8 @@
 from enrico.config import get_config
 from enrico import environ
 from enrico import utils
+import matplotlib
+matplotlib.rc('text', usetex=True)
 import matplotlib.pyplot as plt
 
 def AppLC(infile):

enrico/config/default.conf

@@ -130,6 +130,8 @@ Submit = option('yes', 'no', default='no')
 	#Index for the power law. Left free to vary if 0
 	SpectralIndex =  float(default=2, min=0, max=5)
 	MakeConfFile = option('yes', 'no', default='yes')c
+	#Bayesian blocks 
+	BayesianBlocks = option('yes', 'no', default='no')
 	#Compute Variability index as in the 2FGL. 
 	ComputeVarIndex = option('yes', 'no', default='yes')
 	#Compute an UL if the TS of the sources is <TSLightCurve