Skip to content

Commit

Permalink
fix for read_l2skel
Browse files Browse the repository at this point in the history
* supports newer fafbseg-py
* also needs fafbseg upgrade
  • Loading branch information
jefferis committed Jan 30, 2024
1 parent b995667 commit 19b38b2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ URL: https://github.com/flyconnectome/fancr
BugReports: https://github.com/flyconnectome/fancr/issues
Depends:
R (>= 2.10),
fafbseg (> 0.9.3),
fafbseg (>= 0.13.0.9100),
nat.flybrains
Imports:
nat,
Expand Down
8 changes: 7 additions & 1 deletion R/l2.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ fanc_read_l2dp <- function(id, OmitFailures=TRUE, dataset=NULL, ...) {
#' @rdname fanc_read_l2dp
fanc_read_l2skel <- function(id, OmitFailures=TRUE, dataset=NULL, ...) {
id=fanc_ids(id)
# partial duplication of fafbseg::read_l2skel
# partial duplication of fafbseg::read_l2skel for older versions of fafbseg-py
fp=fafbseg:::check_fafbsegpy()

if("set_default_dataset" %in% names(fp$flywire)) {
# new fafbseg-py, everything is simpler
return(with_fanc(fafbseg::read_l2skel(id)))
}
# this used to work with FANC and older fafbseg-py, but not sure if it still works ...
# manually set the cloudvolume url / cave datastack name
# see https://flyconnectome.slack.com/archives/C342Q3H4Y/p1694682637820519
if(is.null(dataset)) {
Expand Down

0 comments on commit 19b38b2

Please sign in to comment.