Skip to content
Snippets Groups Projects
Commit 0c584f0c authored by Peter Swain's avatar Peter Swain
Browse files

change(pipeline): logfile name specifies experiment

parent 83f92a1b
No related branches found
No related tags found
No related merge requests found
...@@ -186,11 +186,19 @@ class Pipeline(ProcessABC): ...@@ -186,11 +186,19 @@ class Pipeline(ProcessABC):
for k in ("host", "username", "password") for k in ("host", "username", "password")
} }
self.expt_id = config["general"]["id"] self.expt_id = config["general"]["id"]
self.setLogger(config["general"]["directory"]) self.setLogger(
config["general"]["directory"],
logfile_root_name=config["general"]["id"]
.split("/")[-1]
.split(".")[0],
)
@staticmethod @staticmethod
def setLogger( def setLogger(
folder, file_level: str = "INFO", stream_level: str = "INFO" folder,
file_level: str = "INFO",
stream_level: str = "INFO",
logfile_root_name: str = None,
): ):
"""Initialise and format logger.""" """Initialise and format logger."""
logger = logging.getLogger("aliby") logger = logging.getLogger("aliby")
...@@ -205,7 +213,11 @@ class Pipeline(ProcessABC): ...@@ -205,7 +213,11 @@ class Pipeline(ProcessABC):
ch.setFormatter(formatter) ch.setFormatter(formatter)
logger.addHandler(ch) logger.addHandler(ch)
# create file handler that logs even debug messages # create file handler that logs even debug messages
fh = logging.FileHandler(Path(folder) / "aliby.log", "w+") if logfile_root_name is None:
logfile_root_name = "aliby"
fh = logging.FileHandler(
Path(folder) / f"{logfile_root_name}.log", "w+"
)
fh.setLevel(getattr(logging, file_level)) fh.setLevel(getattr(logging, file_level))
fh.setFormatter(formatter) fh.setFormatter(formatter)
logger.addHandler(fh) logger.addHandler(fh)
...@@ -400,6 +412,7 @@ class Pipeline(ProcessABC): ...@@ -400,6 +412,7 @@ class Pipeline(ProcessABC):
self.log( self.log(
"WARNING: Bud has been assigned as its own mother." "WARNING: Bud has been assigned as its own mother."
) )
raise Exception("Catastrophic Baby error")
baby_writer.write( baby_writer.write(
data=result, data=result,
overwrite=["mother_assign"], overwrite=["mother_assign"],
...@@ -486,8 +499,7 @@ def check_earlystop(filename: str, es_parameters: dict, tile_size: int): ...@@ -486,8 +499,7 @@ def check_earlystop(filename: str, es_parameters: dict, tile_size: int):
) )
# find tiles with cells covering too great a fraction of the tiles' area # find tiles with cells covering too great a fraction of the tiles' area
traps_above_athresh = ( traps_above_athresh = (
cells_used.groupby("trap").sum().apply(np.mean, axis=1) cells_used.groupby("trap").sum().apply(np.mean, axis=1) / tile_size**2
/ tile_size**2
> es_parameters["thresh_trap_area"] > es_parameters["thresh_trap_area"]
) )
return (traps_above_nthresh & traps_above_athresh).mean() return (traps_above_nthresh & traps_above_athresh).mean()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment