From f4a5c6bb15113a93c887211ce6e723f19f86393a Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 14:29:15 +0000 Subject: [PATCH 01/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/3e4a5accbebb88ee0ff6987819504ae9aba940c4 --- tools/lightcurve-analysis/.shed.yml | 9 ++ tools/lightcurve-analysis/detect_impulsive.py | 89 +++++++++++++++++++ .../lightcurve_analysis_astro_tool.xml | 25 ++++++ 3 files changed, 123 insertions(+) create mode 100644 tools/lightcurve-analysis/.shed.yml create mode 100644 tools/lightcurve-analysis/detect_impulsive.py create mode 100644 tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml diff --git a/tools/lightcurve-analysis/.shed.yml b/tools/lightcurve-analysis/.shed.yml new file mode 100644 index 00000000..edcbafc5 --- /dev/null +++ b/tools/lightcurve-analysis/.shed.yml @@ -0,0 +1,9 @@ +categories: +- Astronomy +description: lightcurve-analysis +homepage_url: null +long_description: lightcurve-analysis +name: lightcurve_analysis_astro_tool +owner: astroteam +remote_repository_url: https://github.com/esg-epfl-apc/tools-astro/tree/main/tools +type: unrestricted diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py new file mode 100644 index 00000000..5d0e9349 --- /dev/null +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# coding: utf-8 + +# flake8: noqa + +import json +import os +import shutil + +from oda_api.json import CustomJSONEncoder + +light_curve = "spiacs_lc_query.fits" # oda:POSIXPath + +_galaxy_wd = os.getcwd() + +with open("inputs.json", "r") as fd: + inp_dic = json.load(fd) +if "_data_product" in inp_dic.keys(): + inp_pdic = inp_dic["_data_product"] +else: + inp_pdic = inp_dic + +for vn, vv in inp_pdic.items(): + if vn != "_selector": + globals()[vn] = type(globals()[vn])(vv) + +import numpy as np +from astropy.io import fits +from oda_api.data_products import PictureProduct + +lc = fits.open(light_curve)[1].data + +lc + +t = lc["TIME"] +rate = lc["RATE"] +rate_err = lc["ERROR"] + +bkg = np.mean(rate) + +peak_i = rate.argmax() + +from matplotlib import pylab as plt + +plt.figure() + +plt.errorbar(t, rate - bkg, rate_err) + +plt.axvline(t[peak_i], c="r") + +plt.xlabel("seconds since T$_0$") +plt.ylabel("counts/s") + +plt.savefig("lc.png") + +lc = PictureProduct.from_file("lc.png") + +detection_image = lc # oda:ODAPictureProduct + +# output gathering +_galaxy_meta_data = {} +_oda_outs = [] +_oda_outs.append( + ( + "out_detect_impulsive_detection_image", + "detection_image_galaxy.output", + detection_image, + ) +) + +for _outn, _outfn, _outv in _oda_outs: + _galaxy_outfile_name = os.path.join(_galaxy_wd, _outfn) + if isinstance(_outv, str) and os.path.isfile(_outv): + shutil.move(_outv, _galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "_sniff_"} + elif getattr(_outv, "write_fits_file", None): + _outv.write_fits_file(_galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "fits"} + elif getattr(_outv, "write_file", None): + _outv.write_file(_galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "_sniff_"} + else: + with open(_galaxy_outfile_name, "w") as fd: + json.dump(_outv, fd, cls=CustomJSONEncoder) + _galaxy_meta_data[_outn] = {"ext": "json"} + +with open(os.path.join(_galaxy_wd, "galaxy.json"), "w") as fd: + json.dump(_galaxy_meta_data, fd) +print("*** Job finished successfully ***") diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml new file mode 100644 index 00000000..93cace84 --- /dev/null +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -0,0 +1,25 @@ + + + astropy + matplotlib + oda-api + + python '$__tool_directory__/detect_impulsive.py' + + + + + + + + + + + + + + + + + + \ No newline at end of file From fbd8cb031bf6c57a4b0663d182bf53f652d292d2 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 14:41:35 +0000 Subject: [PATCH 02/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/bed634c3e276ae9bc7f89c0a66b4d1d812b96db6 --- tools/lightcurve-analysis/detect_impulsive.py | 2 +- tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index 5d0e9349..6f6ec43e 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -9,7 +9,7 @@ from oda_api.json import CustomJSONEncoder -light_curve = "spiacs_lc_query.fits" # oda:POSIXPath +light_curve = "spiacs_lc_query.fits" # http://odahub.io/ontology#POSIXPath _galaxy_wd = os.getcwd() diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 93cace84..e5dd84a1 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -3,6 +3,7 @@ astropy matplotlib oda-api + python '$__tool_directory__/detect_impulsive.py' From cfc40d247d3112670662f15d1631bcaa8bbe1714 Mon Sep 17 00:00:00 2001 From: Denys SAVCHENKO Date: Mon, 19 Feb 2024 17:12:11 +0100 Subject: [PATCH 03/20] empty From cc5fa638a7d56ca900aa2b7a8f8dd2d329de067e Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 16:18:48 +0000 Subject: [PATCH 04/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/06e0de19b80bacc2cc68e5b9e0af5a9a23a30ead --- tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index e5dd84a1..8fdbf4a1 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -10,7 +10,7 @@ - + From 0704c6eb2fcc4afe2d4bcaba36cc37cb78b07cb4 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 16:30:24 +0000 Subject: [PATCH 05/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/29d29c7eaac2ea309e9829b58e9068af4e81ecae --- tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 8fdbf4a1..f7f59758 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -7,10 +7,10 @@ python '$__tool_directory__/detect_impulsive.py' - + - + From d69cedef005605b3f208b067a0e6eed33018bd7b Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 17:03:55 +0000 Subject: [PATCH 06/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/eac8b065c2ca1e824b1e01a7341d30d2297598f6 --- tools/lightcurve-analysis/detect_impulsive.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index 6f6ec43e..17d6fd36 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -32,8 +32,14 @@ lc +lc.columns.names + t = lc["TIME"] -rate = lc["RATE"] + +for rate_name in ["RATE", "FLUX"]: + if rate_name in lc.columns.names: + rate = lc[rate_name] + rate_err = lc["ERROR"] bkg = np.mean(rate) From 9843d2092412828ea45b93e206d532a7c8d15a87 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 17:19:55 +0000 Subject: [PATCH 07/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/a20896ba5edba3d5e9c63506e0bf867225dcf3b9 --- tools/lightcurve-analysis/detect_impulsive.py | 22 ++++++++++++------- .../lightcurve_analysis_astro_tool.xml | 6 +++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index 17d6fd36..83dc13df 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -10,6 +10,9 @@ from oda_api.json import CustomJSONEncoder light_curve = "spiacs_lc_query.fits" # http://odahub.io/ontology#POSIXPath +time_column = "TIME" +rate_column = "FLUX" +rate_err_column = "FLUX_ERR" _galaxy_wd = os.getcwd() @@ -34,13 +37,16 @@ lc.columns.names -t = lc["TIME"] +def get_one_of_names(d, names): + for n in names: + if n in lc.columns.names: + return lc[n] -for rate_name in ["RATE", "FLUX"]: - if rate_name in lc.columns.names: - rate = lc[rate_name] - -rate_err = lc["ERROR"] +t = get_one_of_names(lc, ["TIME", "Tmean[MJD]", time_column]) +rate = get_one_of_names(lc, ["RATE", "FLUX", "Flux[counts/cm2s]", rate_column]) +rate_err = get_one_of_names( + lc, ["ERROR", "Flux_error[counts/cm2s]", rate_err_column] +) bkg = np.mean(rate) @@ -59,9 +65,9 @@ plt.savefig("lc.png") -lc = PictureProduct.from_file("lc.png") +outlc = PictureProduct.from_file("lc.png") -detection_image = lc # oda:ODAPictureProduct +detection_image = outlc # oda:ODAPictureProduct # output gathering _galaxy_meta_data = {} diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index f7f59758..581be882 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -11,6 +11,9 @@ + + + @@ -18,6 +21,9 @@ + + + From 3384abf11bc4997d403c5efa02dc0ee4217cc60a Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 17:35:33 +0000 Subject: [PATCH 08/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/7405a3315b38fb70433802c049cb0c37cfd941bc --- tools/lightcurve-analysis/detect_impulsive.py | 25 ++++++++++++++++--- .../lightcurve_analysis_astro_tool.xml | 9 ++++++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index 83dc13df..fe137d67 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -13,6 +13,9 @@ time_column = "TIME" rate_column = "FLUX" rate_err_column = "FLUX_ERR" +mode = ( + "Background" # oda:String; oda:allowed_value 'Background','Peak','Focus'. +) _galaxy_wd = os.getcwd() @@ -29,7 +32,7 @@ import numpy as np from astropy.io import fits -from oda_api.data_products import PictureProduct +from oda_api.data_products import LightCurveDataProduct, PictureProduct lc = fits.open(light_curve)[1].data @@ -52,11 +55,14 @@ def get_one_of_names(d, names): peak_i = rate.argmax() +if mode == "Background": + rate -= bkg + from matplotlib import pylab as plt plt.figure() -plt.errorbar(t, rate - bkg, rate_err) +plt.errorbar(t, rate, rate_err) plt.axvline(t[peak_i], c="r") @@ -65,9 +71,15 @@ def get_one_of_names(d, names): plt.savefig("lc.png") -outlc = PictureProduct.from_file("lc.png") +from astropy.time import Time + +outlcpng = PictureProduct.from_file("lc.png") +outlc = LightCurveDataProduct.from_arrays( + times=Time(t, format="mjd"), rates=rate, errors=rate_err +) detection_image = outlc # oda:ODAPictureProduct +processed_lc = outlc # oda:LightCurve # output gathering _galaxy_meta_data = {} @@ -79,6 +91,13 @@ def get_one_of_names(d, names): detection_image, ) ) +_oda_outs.append( + ( + "out_detect_impulsive_processed_lc", + "processed_lc_galaxy.output", + processed_lc, + ) +) for _outn, _outfn, _outv in _oda_outs: _galaxy_outfile_name = os.path.join(_galaxy_wd, _outfn) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 581be882..ba75fc1b 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -14,16 +14,23 @@ + + + + + + - + + From bccc64b05e29b1eb522eacf62cab2a3ad3f166c7 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 17:48:50 +0000 Subject: [PATCH 09/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/486d4bb34d958eb876c2537baf77a671cf11d9e6 --- tools/lightcurve-analysis/detect_impulsive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index fe137d67..0bfa9937 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -78,7 +78,7 @@ def get_one_of_names(d, names): times=Time(t, format="mjd"), rates=rate, errors=rate_err ) -detection_image = outlc # oda:ODAPictureProduct +detection_image = outlcpng # oda:ODAPictureProduct processed_lc = outlc # oda:LightCurve # output gathering From affed69a07668114cb2ae757769ef876d0be0d47 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 17:58:56 +0000 Subject: [PATCH 10/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/c47b095499372ce5177f9cc8f25c1a8f943252a6 --- tools/lightcurve-analysis/correlate.py | 86 +++++++++++++++++++ tools/lightcurve-analysis/detect_impulsive.py | 4 +- .../lightcurve_analysis_astro_tool.xml | 76 ++++++++++++---- 3 files changed, 146 insertions(+), 20 deletions(-) create mode 100644 tools/lightcurve-analysis/correlate.py diff --git a/tools/lightcurve-analysis/correlate.py b/tools/lightcurve-analysis/correlate.py new file mode 100644 index 00000000..de3f3b4c --- /dev/null +++ b/tools/lightcurve-analysis/correlate.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# coding: utf-8 + +# flake8: noqa + +import json +import os +import shutil + +from oda_api.json import CustomJSONEncoder + +light_curve_1 = "spiacs_lc_query.fits" # http://odahub.io/ontology#POSIXPath +light_curve_2 = "spiacs_lc_query.fits" # http://odahub.io/ontology#POSIXPath +mode = ( + "Background" # oda:String; oda:allowed_value 'Background','Peak','Focus'. +) + +_galaxy_wd = os.getcwd() + +with open("inputs.json", "r") as fd: + inp_dic = json.load(fd) +if "_data_product" in inp_dic.keys(): + inp_pdic = inp_dic["_data_product"] +else: + inp_pdic = inp_dic + +for vn, vv in inp_pdic.items(): + if vn != "_selector": + globals()[vn] = type(globals()[vn])(vv) + +from astropy.io import fits +from astropy.time import Time +from matplotlib import pylab as plt +from oda_api.data_products import LightCurveDataProduct, PictureProduct + +lc1 = fits.open(light_curve_1)[1].data +lc2 = fits.open(light_curve_2)[1].data + +plt.figure() + +plt.plot(lc1["TIME"], lc1["RATE"]) +plt.plot(lc2["TIME"], lc1["RATE"]) + +outlcpng = PictureProduct.from_file("lc.png") +outlc = LightCurveDataProduct.from_arrays( + times=Time(lc1["TIME"], format="mjd"), + rates=lc1["RATE"] - lc2["RATE"], + errors=lc2["ERROR"], +) + +detection_image = outlcpng # oda:ODAPictureProduct +processed_lc = outlc # oda:LightCurve + +# output gathering +_galaxy_meta_data = {} +_oda_outs = [] +_oda_outs.append( + ( + "out_correlate_detection_image", + "detection_image_galaxy.output", + detection_image, + ) +) +_oda_outs.append( + ("out_correlate_processed_lc", "processed_lc_galaxy.output", processed_lc) +) + +for _outn, _outfn, _outv in _oda_outs: + _galaxy_outfile_name = os.path.join(_galaxy_wd, _outfn) + if isinstance(_outv, str) and os.path.isfile(_outv): + shutil.move(_outv, _galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "_sniff_"} + elif getattr(_outv, "write_fits_file", None): + _outv.write_fits_file(_galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "fits"} + elif getattr(_outv, "write_file", None): + _outv.write_file(_galaxy_outfile_name) + _galaxy_meta_data[_outn] = {"ext": "_sniff_"} + else: + with open(_galaxy_outfile_name, "w") as fd: + json.dump(_outv, fd, cls=CustomJSONEncoder) + _galaxy_meta_data[_outn] = {"ext": "json"} + +with open(os.path.join(_galaxy_wd, "galaxy.json"), "w") as fd: + json.dump(_galaxy_meta_data, fd) +print("*** Job finished successfully ***") diff --git a/tools/lightcurve-analysis/detect_impulsive.py b/tools/lightcurve-analysis/detect_impulsive.py index 0bfa9937..b486727e 100644 --- a/tools/lightcurve-analysis/detect_impulsive.py +++ b/tools/lightcurve-analysis/detect_impulsive.py @@ -13,9 +13,7 @@ time_column = "TIME" rate_column = "FLUX" rate_err_column = "FLUX_ERR" -mode = ( - "Background" # oda:String; oda:allowed_value 'Background','Peak','Focus'. -) +mode = "Background" # oda:String; oda:allowed_value 'Background','Peak','Focus', 'Standartize'. _galaxy_wd = os.getcwd() diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index ba75fc1b..0b4e1b47 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -5,32 +5,74 @@ oda-api - python '$__tool_directory__/detect_impulsive.py' + python '$__tool_directory__/${_data_product._selector}.py' - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + _data_product['_selector'] == 'detect_impulsive' + + + _data_product['_selector'] == 'detect_impulsive' + + + _data_product['_selector'] == 'correlate' + + + _data_product['_selector'] == 'correlate' + - - - - - + + + + + + + + + + + + + + + + + + + From 04666be2589d1f515bcc995910f03507dd9c842c Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 18:05:14 +0000 Subject: [PATCH 11/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/e91425e3218e47df7f7b31543d8bb10e0bcca6e7 --- tools/lightcurve-analysis/correlate.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/lightcurve-analysis/correlate.py b/tools/lightcurve-analysis/correlate.py index de3f3b4c..09acd2ca 100644 --- a/tools/lightcurve-analysis/correlate.py +++ b/tools/lightcurve-analysis/correlate.py @@ -41,10 +41,12 @@ plt.plot(lc1["TIME"], lc1["RATE"]) plt.plot(lc2["TIME"], lc1["RATE"]) +plt.savefig("lc.png") + outlcpng = PictureProduct.from_file("lc.png") outlc = LightCurveDataProduct.from_arrays( - times=Time(lc1["TIME"], format="mjd"), - rates=lc1["RATE"] - lc2["RATE"], + times=Time(lc2["TIME"], format="mjd"), + rates=lc2["RATE"], errors=lc2["ERROR"], ) From ec078cdba2b09d2f2c03cf1c4cfe6fdd13c70e78 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 19 Feb 2024 18:11:33 +0000 Subject: [PATCH 12/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/5094132dd5e5f577ade4e843492603435e0a7656 --- tools/lightcurve-analysis/correlate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lightcurve-analysis/correlate.py b/tools/lightcurve-analysis/correlate.py index 09acd2ca..8facfd21 100644 --- a/tools/lightcurve-analysis/correlate.py +++ b/tools/lightcurve-analysis/correlate.py @@ -39,7 +39,7 @@ plt.figure() plt.plot(lc1["TIME"], lc1["RATE"]) -plt.plot(lc2["TIME"], lc1["RATE"]) +plt.plot(lc2["TIME"], lc2["RATE"]) plt.savefig("lc.png") From 97d53f69b8b16e3c847f4505968ae5b8b339c25b Mon Sep 17 00:00:00 2001 From: ODA bot Date: Wed, 21 Feb 2024 17:02:31 +0000 Subject: [PATCH 13/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/5094132dd5e5f577ade4e843492603435e0a7656 --- .../lightcurve_analysis_astro_tool.xml | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 0b4e1b47..27b393f9 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -1,8 +1,9 @@ + ipython + oda-api astropy matplotlib - oda-api python '$__tool_directory__/${_data_product._selector}.py' @@ -12,54 +13,52 @@ - - + + - - - - - + + + - - - - + + + + + + - - _data_product['_selector'] == 'detect_impulsive' - - - _data_product['_selector'] == 'detect_impulsive' - _data_product['_selector'] == 'correlate' _data_product['_selector'] == 'correlate' + + _data_product['_selector'] == 'detect_impulsive' + + + _data_product['_selector'] == 'detect_impulsive' + - - - - - + + + @@ -68,9 +67,11 @@ - - - + + + + + From dc5e2e6542b54a212263f89eab0827ba3d72e3f5 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Tue, 27 Feb 2024 00:01:49 +0000 Subject: [PATCH 14/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/5094132dd5e5f577ade4e843492603435e0a7656 --- .../lightcurve_analysis_astro_tool.xml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 27b393f9..4276f51b 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -1,9 +1,19 @@ - ipython - oda-api - astropy + ipython + astropy + numpy + scipy + iminuit matplotlib + wget + multiprocess + oda-api + nbconvert + gammapy + astroquery + pydantic + tqdm python '$__tool_directory__/${_data_product._selector}.py' From 8d91c3adb7ff450054875bdbca1b651b356c2484 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 11 Mar 2024 18:10:25 +0000 Subject: [PATCH 15/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/61f02819fcdaeaa43ec92db0949db7a029fd71c9 --- .../lightcurve_analysis_astro_tool.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 4276f51b..fc0cb7e4 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -1,19 +1,8 @@ - ipython - astropy - numpy - scipy - iminuit + astropy matplotlib - wget - multiprocess oda-api - nbconvert - gammapy - astroquery - pydantic - tqdm python '$__tool_directory__/${_data_product._selector}.py' From 96e95e3e28387b31914cfdbb4cd9dd410037b8b5 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Fri, 15 Mar 2024 11:15:25 +0000 Subject: [PATCH 16/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/c8bab344dc771c571e7e347f34ecf20c53543c7b --- .../lightcurve-analysis/lightcurve_analysis_astro_tool.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index fc0cb7e4..f29a80ec 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -56,8 +56,8 @@ - - + + @@ -67,7 +67,7 @@ - + From bb9571102306e3c3a8575625af012ea3bc0e816e Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 18 Mar 2024 10:46:37 +0000 Subject: [PATCH 17/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/79ac0083817eb87ef0be9e71ac7a77df5dc7214a --- .../lightcurve_analysis_astro_tool.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index f29a80ec..082a60cf 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -16,8 +16,8 @@ - - + + @@ -25,7 +25,7 @@ - + @@ -56,8 +56,8 @@ - - + + @@ -67,7 +67,7 @@ - + From 432f31cd2470632a263976f510c331e41cd07943 Mon Sep 17 00:00:00 2001 From: ODA bot Date: Mon, 18 Mar 2024 11:08:01 +0000 Subject: [PATCH 18/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/494ed7bc970180eb3f06719a5ca64e6ef821edd2 --- .../lightcurve_analysis_astro_tool.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 082a60cf..09e2bdfb 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -16,8 +16,8 @@ - - + + @@ -25,7 +25,7 @@ - + @@ -56,8 +56,8 @@ - - + + @@ -67,7 +67,7 @@ - + From b16e035dfe1a5f4b8d209a3ea9cedddbf9979212 Mon Sep 17 00:00:00 2001 From: mmoda-esg-bot Date: Wed, 5 Jun 2024 14:15:04 +0000 Subject: [PATCH 19/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/fdeef1d7e716c836601f41dc961ebfb288fa456f --- .../lightcurve_analysis_astro_tool.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 09e2bdfb..0fc54c33 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -1,8 +1,10 @@ - astropy - matplotlib - oda-api + ipython + matplotlib + astropy + numpy + oda-api python '$__tool_directory__/${_data_product._selector}.py' @@ -56,8 +58,8 @@ - - + + @@ -67,7 +69,7 @@ - + From 535bfe783fc3efb7d7909e1662271e14a2bb0aa0 Mon Sep 17 00:00:00 2001 From: mmoda-esg-bot Date: Tue, 2 Jul 2024 11:39:45 +0000 Subject: [PATCH 20/20] automatic update following https://gitlab.renkulab.io/astronomy/mmoda/lightcurve-analysis/-/commit/fdeef1d7e716c836601f41dc961ebfb288fa456f --- .../lightcurve_analysis_astro_tool.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml index 0fc54c33..9d3459fb 100644 --- a/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml +++ b/tools/lightcurve-analysis/lightcurve_analysis_astro_tool.xml @@ -1,10 +1,18 @@ - ipython - matplotlib - astropy - numpy + pandas oda-api + matplotlib + requests + astroquery + rdflib + beautifulsoup4 + sparqlwrapper + networkx + scipy + ipython + astropy + numpy python '$__tool_directory__/${_data_product._selector}.py'