Skip to content

Commit 491ed0d

Browse files
committed
Added option to not save rem_df
1 parent dfe73c7 commit 491ed0d

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

mera/mera_pymer4.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MeraResults:
5050
site_res_df: Optional[pd.DataFrame]
5151
site_cond_std_df: Optional[pd.DataFrame]
5252

53-
def save(self, output_dir: Path, save_fit: bool = True):
53+
def save(self, output_dir: Path, save_fit: bool = True, save_rem: bool = True):
5454
"""
5555
Saves the MeraResults to the given directory
5656
@@ -61,8 +61,9 @@ def save(self, output_dir: Path, save_fit: bool = True):
6161
"""
6262
self.event_res_df.to_csv(output_dir / "event_res_df.csv")
6363
self.event_cond_std_df.to_csv(output_dir / "event_cond_std_df.csv")
64-
self.rem_res_df.to_csv(output_dir / "rem_res_df.csv")
6564
self.bias_std_df.to_csv(output_dir / "bias_std_df.csv")
65+
if save_rem:
66+
self.rem_res_df.to_csv(output_dir / "rem_res_df.csv")
6667
if save_fit and self.fit_df is not None:
6768
self.fit_df.to_csv(output_dir / "fit_df.csv")
6869

@@ -89,8 +90,12 @@ def load(cls, data_dir: Path):
8990
return cls(
9091
pd.read_csv(data_dir / "event_res_df.csv", index_col=0),
9192
pd.read_csv(data_dir / "event_cond_std_df.csv", index_col=0),
92-
pd.read_csv(data_dir / "rem_res_df.csv", index_col=0),
9393
pd.read_csv(data_dir / "bias_std_df.csv", index_col=0),
94+
(
95+
pd.read_csv(data_dir / "rem_res_df.csv", index_col=0)
96+
if (data_dir / "rem_res_df.csv").exists()
97+
else None
98+
),
9499
(
95100
pd.read_csv(data_dir / "fit_df.csv", index_col=0)
96101
if (data_dir / "fit_df.csv").exists()
@@ -108,7 +113,9 @@ def load(cls, data_dir: Path):
108113
),
109114
)
110115

111-
def save_to_parquet(self, output_dir: Path, save_fit: bool = True):
116+
def save_to_parquet(
117+
self, output_dir: Path, save_fit: bool = True, save_rem: bool = True
118+
):
112119
"""
113120
Saves the MeraResults to the given directory in parquet format
114121
@@ -119,8 +126,9 @@ def save_to_parquet(self, output_dir: Path, save_fit: bool = True):
119126
"""
120127
self.event_res_df.to_parquet(output_dir / "event_res_df.parquet")
121128
self.event_cond_std_df.to_parquet(output_dir / "event_cond_std_df.parquet")
122-
self.rem_res_df.to_parquet(output_dir / "rem_res_df.parquet")
123129
self.bias_std_df.to_parquet(output_dir / "bias_std_df.parquet")
130+
if save_rem and self.rem_res_df is not None:
131+
self.rem_res_df.to_parquet(output_dir / "rem_res_df.parquet")
124132
if save_fit and self.fit_df is not None:
125133
self.fit_df.to_parquet(output_dir / "fit_df.parquet")
126134

@@ -146,8 +154,12 @@ def load_from_parquet(cls, data_dir: Path):
146154
return cls(
147155
pd.read_parquet(data_dir / "event_res_df.parquet"),
148156
pd.read_parquet(data_dir / "event_cond_std_df.parquet"),
149-
pd.read_parquet(data_dir / "rem_res_df.parquet"),
150157
pd.read_parquet(data_dir / "bias_std_df.parquet"),
158+
(
159+
pd.read_parquet(data_dir / "rem_res_df.parquet")
160+
if (data_dir / "rem_res_df.parquet").exists()
161+
else None
162+
),
151163
(
152164
pd.read_parquet(data_dir / "fit_df.parquet")
153165
if (data_dir / "fit_df.parquet").exists()

0 commit comments

Comments
 (0)