From c4391df2460af130a2199d2aec70f294bfddd9e1 Mon Sep 17 00:00:00 2001
From: Roman Krivonos <krivonos@cosmos.ru>
Date: Sat, 13 Apr 2024 15:31:40 +0300
Subject: [PATCH] first run

---
 ridge/ridge/config.py  | 9 +++++++--
 ridge/ridge/utils.py   | 2 +-
 scripts/01_bgdmodel.py | 4 +++-
 scripts/01_bgdmodel.sh | 0
 4 files changed, 11 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 scripts/01_bgdmodel.py
 mode change 100644 => 100755 scripts/01_bgdmodel.sh

diff --git a/ridge/ridge/config.py b/ridge/ridge/config.py
index fbc6064..f0a3bb6 100644
--- a/ridge/ridge/config.py
+++ b/ridge/ridge/config.py
@@ -1,5 +1,10 @@
-datadir="./data"
-proddir="./products"
+"""
+Предполагается, что скрипты запускаются непосредственно в директории scripts
+
+Пути должны оканчиваться на /
+"""
+datadir="../data/"
+proddir="../products/"
 
 """ Определение областей "Галактика" и "Внегалактика" """
 bmax=30.0
diff --git a/ridge/ridge/utils.py b/ridge/ridge/utils.py
index a8e10de..2b9d7f9 100644
--- a/ridge/ridge/utils.py
+++ b/ridge/ridge/utils.py
@@ -63,7 +63,7 @@ def plot_best_fit(X, y, model):
     y_pred = model.predict(X)
     resid = y - y_pred
     err = np.sqrt(np.sum((resid)**2))/len(resid)
-    print("ax+b: a={}, b={}, std={}".format(a,b,err))
+    print("ax+b: a={:.2e}, b={:.2e}, std={:.2f}".format(a,b,err))
     """
     plt.scatter(X, y)
     xaxis = arange(X.min(), X.max(), 0.01)
diff --git a/scripts/01_bgdmodel.py b/scripts/01_bgdmodel.py
old mode 100644
new mode 100755
index 58d2800..ad9cbce
--- a/scripts/01_bgdmodel.py
+++ b/scripts/01_bgdmodel.py
@@ -28,6 +28,7 @@ from ridge.config import *
 enkey = sys.argv[1]
 
 fn="detcnts.{}.fits".format(enkey)
+print("Reading {}".format(datadir+fn))
 
 d = fits.getdata(datadir+fn)
 df=pd.DataFrame(np.array(d).byteswap().newbyteorder())
@@ -139,4 +140,5 @@ with open(proddir+fn.replace(".fits",".pkl"), 'wb') as fp:
 with open(proddir+fn.replace(".fits",".ignored_scw.pkl"), 'wb') as fp:
     pickle.dump(ignored_scw, fp, protocol=pickle.HIGHEST_PROTOCOL)
 
-print(ignored_scw)
+
+print("Removed ScWs:",ignored_scw)
diff --git a/scripts/01_bgdmodel.sh b/scripts/01_bgdmodel.sh
old mode 100644
new mode 100755