From 99dc2aa8f6132f0e82e60ced56dfca76aea61af9 Mon Sep 17 00:00:00 2001
From: Roman Krivonos <romakrivonos@gmail.com>
Date: Fri, 12 Jul 2024 16:39:53 +0300
Subject: [PATCH] before vac

---
 ridge/ridge/utils.py          | 1 +
 scripts/01_bgdmodel.py        | 8 +++++++-
 scripts/02_grxe_resid.py      | 2 +-
 scripts/02_grxe_resid_plot.py | 5 +++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ridge/ridge/utils.py b/ridge/ridge/utils.py
index e2f3974..56ef2d4 100644
--- a/ridge/ridge/utils.py
+++ b/ridge/ridge/utils.py
@@ -260,6 +260,7 @@ def get_spec(df, grxe_err_cut=None, skey=None, enkey=None, sigma=3, n_bins = 60,
         coldefs = fits.ColDefs([
             fits.Column(name='REV', format='J', unit='', array=rev[filtered_grxe.mask==False]),
             fits.Column(name='CLEAN', format='D', unit='cts/s', array=clean[filtered_grxe.mask==False]),
+            fits.Column(name='PHASE', format='D', unit='', array=phase[filtered_grxe.mask==False]),
             fits.Column(name='MODEL', format='D', unit='cts/s', array=model[filtered_grxe.mask==False]),
             fits.Column(name='CRAB', format='D', unit='cts/s', array=crab[filtered_grxe.mask==False]),
             fits.Column(name='RESID', format='D', unit='cts/s', array=resid[filtered_grxe.mask==False]),
diff --git a/scripts/01_bgdmodel.py b/scripts/01_bgdmodel.py
index 5790d15..05dabdd 100755
--- a/scripts/01_bgdmodel.py
+++ b/scripts/01_bgdmodel.py
@@ -49,7 +49,13 @@ nrev=0
 bgdmodel={}
 
 ignored_scw=[]
-ignored_rev=[334,1760] # ignore orbits with pecular slope over phase
+ignored_rev=[131,132,133,134,135,136,# flare
+             280,281,282,#flare
+             1057,1102, # flare
+             1459,1472, # flare
+             2303,2304, # flare
+             2549, # flare
+             334,1760] # ignore orbits with pecular slope over phase
 
 if not os.path.exists(proddir):
     os.makedirs(proddir)
diff --git a/scripts/02_grxe_resid.py b/scripts/02_grxe_resid.py
index 66c7efb..192b7e9 100755
--- a/scripts/02_grxe_resid.py
+++ b/scripts/02_grxe_resid.py
@@ -29,7 +29,7 @@ from ridge.config import *
 plotme=True
 enkey = sys.argv[1]
 #outkey = sys.argv[2]
-outkey = "ALL"
+outkey = "BKG"
 
 fn="detcnts.{}.fits".format(enkey)
 
diff --git a/scripts/02_grxe_resid_plot.py b/scripts/02_grxe_resid_plot.py
index e6f9e42..9f3c4dc 100755
--- a/scripts/02_grxe_resid_plot.py
+++ b/scripts/02_grxe_resid_plot.py
@@ -59,6 +59,7 @@ df = df.query(query)
 print("{} N={}".format(query, df.shape[0]))
 
 t = Table.from_pandas(df)
-t.write("{}/BKG.E01.resid_filtered.fits".format(proddir),overwrite=True)
+t.write("{}/{}.{}.resid_filtered_rev.fits".format(proddir,inkey,enkey),overwrite=True)
  
-sg_mean,sg_sem = get_spec(df, sigma=sigma,  grxe_err_cut=grxe_err_cut, skey=skey, enkey=enkey, plotme=True, fout="test.fits")
+sg_mean,sg_sem = get_spec(df, sigma=sigma,  grxe_err_cut=grxe_err_cut, skey=skey, enkey=enkey, plotme=True,
+                          fout="{}/{}.{}.resid_filtered_spec.fits".format(proddir,inkey,enkey))