Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ODA
api clients
oda_integral_wrapper
Commits
5381f713
Commit
5381f713
authored
Oct 08, 2021
by
Carlo Ferrigno
Browse files
Add option for data right on JEM-X
V 1.3.23
parent
edeadecb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
oda_integral_wrapper/fit_cyclotron.py
oda_integral_wrapper/fit_cyclotron.py
+3
-2
setup.py
setup.py
+1
-1
No files found.
oda_integral_wrapper/fit_cyclotron.py
View file @
5381f713
...
...
@@ -78,6 +78,7 @@ def write_fits_files(instrument, spectrum, source_name, output_dir, subcases_pat
@
logged
def
fit_cyclotron
(
subcases_pattern
,
source_name
,
reference_location
=
"subcases/scw_lists"
,
nscw
=-
1
,
systematic_fraction
=
0.01
,
jemx_systematic_fraction
=
0.05
,
integral_data_rights
=
"all-private"
,
jemx_data_rights
=
"public"
,
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
,
isgri_ignore
=
'**-23.0,100.0-**'
,
jemx_ignore
=
'**-3.5,23.0-**'
):
...
...
@@ -231,11 +232,11 @@ def fit_cyclotron(subcases_pattern, source_name, reference_location="subcases/sc
if
ys
==
'J1'
:
par_dict
.
update
({
"jemx_num"
:
"1"
,
"osa_version"
:
"OSA11.1"
,
"instrument"
:
"jemx"
,
"product"
:
"jemx_spectrum"
,
'integral_data_rights'
:
'public'
})
"product"
:
"jemx_spectrum"
,
'integral_data_rights'
:
jemx_data_rights
})
if
ys
==
'J2'
:
par_dict
.
update
({
"jemx_num"
:
"2"
,
"osa_version"
:
"OSA11.1"
,
"instrument"
:
"jemx"
,
"product"
:
"jemx_spectrum"
,
'integral_data_rights'
:
'public'
})
"product"
:
"jemx_spectrum"
,
'integral_data_rights'
:
jemx_data_rights
})
if
ys
==
'II'
:
if
'jemx_num'
in
par_dict
:
del
par_dict
[
'jemx_num'
]
...
...
setup.py
View file @
5381f713
...
...
@@ -15,7 +15,7 @@ include_package_data=True
scripts_list
=
glob
.
glob
(
'./bin/*'
)
setup
(
name
=
'oda_integral_wrapper'
,
version
=
"1.3.2
2
"
,
version
=
"1.3.2
3
"
,
description
=
'wrapper for INTEGRAL analysis using the API plugin for CDCI online data analysis'
,
author
=
'Carlo Ferrigno'
,
author_email
=
'carlo.ferrigno@unige.ch'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment