diff --git a/Generic Revolution LC.ipynb b/Generic Revolution LC.ipynb index 28cb63fdc93e3291cccefaec57eddd5db2893333..eae2f7cc2d943243f3653a296801d7f8a3a93284 100644 --- a/Generic Revolution LC.ipynb +++ b/Generic Revolution LC.ipynb @@ -342,15 +342,11 @@ "metadata": {}, "outputs": [], "source": [ - "import re\n", - "\n", - "reg_ex_source_title = r'[\\W]+'\n", - "\n", "reload(oda_integral_wrapper.wrapper)\n", "wrap=oda_integral_wrapper.wrapper.INTEGRALwrapper(token=token, integral_data_rights='all-private', )\n", "\n", "for source in observations:\n", - " sanitized_source_title = re.sub(reg_ex_source_title, '_', source['title'])\n", + " sanitized_source_title = oda_integral_wrapper.wrapper.INTEGRALwrapper.clean_source_title(source['title'])\n", " pattern = sanitized_source_title + '_' + str(source['expid'])\n", " if use_isgri: \n", " lc_isgri=source.get('isgri_lc', None)\n", diff --git a/Generic Revolution Mosaics.ipynb b/Generic Revolution Mosaics.ipynb index df712985614e36ad806881af9581cb022eea1e1f..6783b07b8ed229f0dcc3ea62fab45a62b34db255 100644 --- a/Generic Revolution Mosaics.ipynb +++ b/Generic Revolution Mosaics.ipynb @@ -659,9 +659,6 @@ " instruments.append('jemx1')\n", "if use_jemx2:\n", " instruments.append('jemx2')\n", - " \n", - "reg_ex_source_title = r'[\\W]+'\n", - "\n", "\n", "for instr in instruments:\n", " for source in observations:\n", @@ -672,7 +669,7 @@ " if type(data) == str or data is None:\n", " continue\n", " \n", - " sanitized_source_title = re.sub(reg_ex_source_title, '_', source['title'])\n", + " sanitized_source_title = oda_integral_wrapper.wrapper.INTEGRALwrapper.clean_source_title(source['title'])\n", "\n", " outfile_name = sanitized_source_title + '_' + str(source['expid']) + '_%s_mosaic.fits' % instr\n", "\n", diff --git a/Generic Revolution Spectra.ipynb b/Generic Revolution Spectra.ipynb index 8261cc83b47302478bec2ac9b32872a66aa4939a..34950995ea197a5b3148c2da22cb4dce41ddf57f 100644 --- a/Generic Revolution Spectra.ipynb +++ b/Generic Revolution Spectra.ipynb @@ -340,15 +340,11 @@ "metadata": {}, "outputs": [], "source": [ - "import re\n", - "\n", - "reg_ex_source_title = r'[\\W]+'\n", - "\n", "reload(oda_integral_wrapper.wrapper)\n", "wrap=oda_integral_wrapper.wrapper.INTEGRALwrapper(token=token, integral_data_rights='all-private', )\n", "\n", "for source in observations:\n", - " sanitized_source_title = re.sub(reg_ex_source_title, '_', source['title'])\n", + " sanitized_source_title = oda_integral_wrapper.wrapper.INTEGRALwrapper.clean_source_title(source['title'])\n", " pattern = sanitized_source_title + '_' + str(source['expid'])\n", " if use_isgri: \n", " spectra_isgri=source.get('isgri_spectra', None)\n", diff --git a/requirements.txt b/requirements.txt index 12151bfb1b86c6918836442dfbeb3388f83d7760..3c5cc46a92b011dea4a81a01afb248266218cafa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,6 @@ GitPython==3.1.27 #cdci_data_analysis -e git+https://github.com/oda-hub/dispatcher-app.git#egg=cdci_data_analysis #oda_api from a certain branch --e git+https://github.com/oda-hub/oda_api.git#egg=oda_api +-e git+https://github.com/oda-hub/oda_api.git@decode-response-after-checking-code#egg=oda_api #oda-integral-wrapper -e git+https://gitlab.astro.unige.ch/oda/api-clients/oda_api_wrapper#egg=oda-integral-wrapper --e git+https://github.com/oda-hub/renku-aqs.git#egg=renku_aqs