Commit 82233dcf authored by Carlo Ferrigno's avatar Carlo Ferrigno
Browse files

Allowing ignore to be set by user

V 1.3.21
parent 254e79b9
......@@ -30,12 +30,11 @@ import time
import sys
#TODO Remove this development import!!
lib_path = os.path.abspath("/home/ferrigno/Soft/pysas")
if lib_path not in sys.path:
sys.path.append(lib_path)
else:
fit_cyclotron._log.info("Not appending")
# lib_path = os.path.abspath("/home/ferrigno/Soft/pysas")
# if lib_path not in sys.path:
# sys.path.append(lib_path)
# else:
# fit_cyclotron._log.info("Not appending")
import pyxmmsas
from astropy.table import Table
......@@ -81,7 +80,7 @@ def fit_cyclotron(subcases_pattern, source_name, reference_location="subcases/sc
systematic_fraction=0.01, jemx_systematic_fraction=0.05, integral_data_rights="all-private",
osa_version="OSA11.0-dev210827.0528-37487--fullbkg", base_mod_file='mod_broad.xcm', run_chain=True,
load_chain=False, plot_chains=True, plot_corners=True, sleep_time=1, just_submit=False,
distance = 10):
distance=10, isgri_ignore='**-23.0,100.0-**', jemx_ignore='**-3.5,23.0-**'):
......@@ -303,13 +302,11 @@ def fit_cyclotron(subcases_pattern, source_name, reference_location="subcases/sc
fit_cyclotron._log.info(isgri_spec_fn)
ignore_string=['**-20.0,100.0-**', '**-3.5,23.0-**', '**-3.5,23.0-**' ]
ignore_string=[isgri_ignore, jemx_ignore, jemx_ignore]
if jemx1_spec_fn =='none' or jemx2_spec_fn =='none':
ignore_string=['**-20.0,100.0-**', '**-3.5,12.0-**']
ignore_string=[isgri_ignore, jemx_ignore]
if jemx1_spec_fn == 'none' and jemx2_spec_fn == 'none':
ignore_string = ['**-20.0,100.0-**']
ignore_string = [isgri_ignore]
if isgri_spec_fn == 'none':
fit_cyclotron._log.warning("We have no ISGRI spectrum, skipping the fit")
return {}
......
......@@ -15,7 +15,7 @@ include_package_data=True
scripts_list = glob.glob('./bin/*')
setup(name='oda_integral_wrapper',
version="1.3.20",
version="1.3.21",
description='wrapper for INTEGRAL analysis using the API plugin for CDCI online data analysis',
author='Carlo Ferrigno',
author_email='carlo.ferrigno@unige.ch',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment