Write luminosity and all cyclotron line energies (assuming it is gabs)

V 1.3.20

oda_integral_wrapper/fit_cyclotron.py

@@ -403,10 +403,10 @@ def fit_cyclotron(subcases_pattern, source_name, reference_location="subcases/sc
 
     with open('res_%s.txt' % subcases_pattern, 'w') as f:
         out_str = '%.5f %.5f ' % ((tstop+tstart)/2, (tstop-tstart)/2)
-        x = fit_by_bin[subcases_pattern]['LineE__01']
-        out_str += "%.3f %.3f %.3f " % (x[0], x[1]-x[0], x[2]-x[0] )
-        x = fit_by_bin[subcases_pattern]['LineE__04']
-        out_str += "%.3f %.3f %.3f " % (x[0], x[1]-x[0], x[2]-x[0] )
+        out_str += "%.4g %.4g %.4g " % (luminosity[0], luminosity[1], luminosity[2])
+        for kk, ii in fit_by_bin[subcases_pattern].items():
+            if 'LineE__' in kk:
+                out_str += "%.3f %.3f %.3f " % (ii[0], ii[1]-ii[0], ii[2]-ii[0])
         f.write('%s' % out_str)
 
     res = {'fit_result':  fit_result,

setup.py

@@ -15,7 +15,7 @@ include_package_data=True
 
 scripts_list = glob.glob('./bin/*')
 setup(name='oda_integral_wrapper',
-      version="1.3.19",
+      version="1.3.20",
       description='wrapper for INTEGRAL analysis using the API plugin for CDCI online data analysis',
       author='Carlo Ferrigno',
       author_email='carlo.ferrigno@unige.ch',