Use original event file by default for timing

and cleaned event file for spectroscopy
evandromr · Jan 22, 2015 · 01af9ef · 01af9ef
1 parent f2e2b66
commit 01af9ef
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git a/mos1/events/mos1events.py b/mos1/events/mos1events.py
@@ -11,9 +11,13 @@
 os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
 os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
 
-shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
-subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
-table = 'mos1_clean_barycen.ds'
+# To use the clean event file
+# shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
+# subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
+# table = 'mos1_clean_barycen.ds'
+
+# Use original baricentric corrected event file
+table = '../../rpcdata/mos1events_barycen.ds'
 
 pattern = 12
 

diff --git a/mos1/lightcurves/mos1lightcurve.py b/mos1/lightcurves/mos1lightcurve.py
@@ -11,9 +11,13 @@
 os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
 os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
 
-shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
-subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
-table = 'mos1_clean_barycen.ds'
+# To use the clean event file
+# shutil.copyfile('../mos1_clean.ds', 'mos1_clean_barycen.ds')
+# subprocess.call(['barycen', 'table=mos1_clean_barycen.ds:EVENTS'])
+# table = 'mos1_clean_barycen.ds'
+
+# Use original baricentric corrected event file
+table = '../../rpcdata/mos1events_barycen.ds'
 
 srcregionfile = 'src.reg'
 bkgregionfile = 'bkg.reg'

diff --git a/mos1/spectra/mos1spec.py b/mos1/spectra/mos1spec.py
@@ -18,7 +18,7 @@
 prefix = ""
 sufix = ""
 
-table = 'mos1_clean.ds'
+table = '../mos1_clean.ds'
 srcspc = '{0}mos1_srcspc{1}.ds'.format(prefix, sufix)
 srcimg = '{0}mos1_srcimg{1}.ds'.format(prefix, sufix)
 bkgspc = '{0}mos1_bkgspc{1}.ds'.format(prefix, sufix)

diff --git a/mos2/events/mos2events.py b/mos2/events/mos2events.py
@@ -11,9 +11,13 @@
 os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
 os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
 
-shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
-subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
-table = 'mos2_clean_barycen.ds'
+# To use the clean event file
+# shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
+# subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
+# table = 'mos2_clean_barycen.ds'
+
+# Use original baricentric corrected event file
+table = '../../rpcdata/mos2events_barycen.ds'
 
 pattern = 12
 

diff --git a/mos2/lightcurves/mos2lightcurve.py b/mos2/lightcurves/mos2lightcurve.py
@@ -11,9 +11,13 @@
 os.environ['SAS_ODF'] = os.path.abspath(glob.glob('../../rpcdata/*SUM.SAS')[0])
 os.environ['SAS_CCF'] = os.path.abspath(glob.glob('../../rpcdata/ccf.cif')[0])
 
-shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
-subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
-table = 'mos2_clean_barycen.ds'
+# To use the clean event file
+# shutil.copyfile('../mos2_clean.ds', 'mos2_clean_barycen.ds')
+# subprocess.call(['barycen', 'table=mos2_clean_barycen.ds:EVENTS'])
+# table = 'mos2_clean_barycen.ds'
+
+# Use original baricentric corrected event file
+table = '../../rpcdata/mos2events_barycen.ds'
 
 srcregionfile = 'src.reg'
 bkgregionfile = 'bkg.reg'

diff --git a/mos2/spectra/mos2spec.py b/mos2/spectra/mos2spec.py
@@ -18,7 +18,7 @@
 prefix = ""
 sufix = ""
 
-table = 'mos2_clean.ds'
+table = '../mos2_clean.ds'
 srcspc = '{0}mos2_srcspc{1}.ds'.format(prefix, sufix)
 srcimg = '{0}mos2_srcimg{1}.ds'.format(prefix, sufix)
 bkgspc = '{0}mos2_bkgspc{1}.ds'.format(prefix, sufix)

diff --git a/pn/spectra/pnspec.py b/pn/spectra/pnspec.py
@@ -18,7 +18,7 @@
 prefix = ""
 sufix = ""
 
-table = 'pn_clean.ds'
+table = '../pn_clean.ds'
 srcspc = '{0}pn_srcspc{1}.ds'.format(prefix, sufix)
 srcimg = '{0}pn_srcimg{1}.ds'.format(prefix, sufix)
 bkgspc = '{0}pn_bkgspc{1}.ds'.format(prefix, sufix)