Skip to content

Commit 01af9ef

Browse files
committed
Use original event file by default for timing
and cleaned event file for spectroscopy
1 parent f2e2b66 commit 01af9ef

7 files changed

Lines changed: 31 additions & 15 deletions

File tree

mos1/events/mos1events.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
1212
os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
1313

14-
shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
15-
subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
16-
table = 'mos1_clean_barycen.ds'
14+
# To use the clean event file
15+
# shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
16+
# subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
17+
# table = 'mos1_clean_barycen.ds'
18+
19+
# Use original baricentric corrected event file
20+
table = '../../rpcdata/mos1events_barycen.ds'
1721

1822
pattern = 12
1923

mos1/lightcurves/mos1lightcurve.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
1212
os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
1313

14-
shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
15-
subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
16-
table = 'mos1_clean_barycen.ds'
14+
# To use the clean event file
15+
# shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
16+
# subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
17+
# table = 'mos1_clean_barycen.ds'
18+
19+
# Use original baricentric corrected event file
20+
table = '../../rpcdata/mos1events_barycen.ds'
1721

1822
srcregionfile = 'src.reg'
1923
bkgregionfile = 'bkg.reg'

mos1/spectra/mos1spec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
prefix = ""
1919
sufix = ""
2020

21-
table = 'mos1_clean.ds'
21+
table = '../mos1_clean.ds'
2222
srcspc = '{0}mos1_srcspc{1}.ds'.format(prefix, sufix)
2323
srcimg = '{0}mos1_srcimg{1}.ds'.format(prefix, sufix)
2424
bkgspc = '{0}mos1_bkgspc{1}.ds'.format(prefix, sufix)

mos2/events/mos2events.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
1212
os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
1313

14-
shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
15-
subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
16-
table = 'mos2_clean_barycen.ds'
14+
# To use the clean event file
15+
# shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
16+
# subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
17+
# table = 'mos2_clean_barycen.ds'
18+
19+
# Use original baricentric corrected event file
20+
table = '../../rpcdata/mos2events_barycen.ds'
1721

1822
pattern = 12
1923

mos2/lightcurves/mos2lightcurve.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
1212
os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
1313

14-
shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
15-
subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
16-
table = 'mos2_clean_barycen.ds'
14+
# To use the clean event file
15+
# shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
16+
# subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
17+
# table = 'mos2_clean_barycen.ds'
18+
19+
# Use original baricentric corrected event file
20+
table = '../../rpcdata/mos2events_barycen.ds'
1721

1822
srcregionfile = 'src.reg'
1923
bkgregionfile = 'bkg.reg'

mos2/spectra/mos2spec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
prefix = ""
1919
sufix = ""
2020

21-
table = 'mos2_clean.ds'
21+
table = '../mos2_clean.ds'
2222
srcspc = '{0}mos2_srcspc{1}.ds'.format(prefix, sufix)
2323
srcimg = '{0}mos2_srcimg{1}.ds'.format(prefix, sufix)
2424
bkgspc = '{0}mos2_bkgspc{1}.ds'.format(prefix, sufix)

pn/spectra/pnspec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
prefix = ""
1919
sufix = ""
2020

21-
table = 'pn_clean.ds'
21+
table = '../pn_clean.ds'
2222
srcspc = '{0}pn_srcspc{1}.ds'.format(prefix, sufix)
2323
srcimg = '{0}pn_srcimg{1}.ds'.format(prefix, sufix)
2424
bkgspc = '{0}pn_bkgspc{1}.ds'.format(prefix, sufix)

0 commit comments

Comments
 (0)