Skip to content

Commit

Permalink
further updates for reading meshes from public MANC dataset
Browse files Browse the repository at this point in the history
* changes to ability to identify the DVID head node for public dataset
* appears to be due to additional config changes since 6 Oct.
  • Loading branch information
jefferis committed Oct 17, 2023
1 parent f3d4d2d commit 7fab382
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion R/datasets.R
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ choose_malevnc_dataset <- function(dataset=NULL,
malevnc.neuprint='https://neuprint.janelia.org',
malevnc.neuprint_dataset="manc:v1.0",
malevnc.rootnode=NULL,
malevnc.server="https://manc-dvid.janelia.org"
malevnc.server="https://manc-dvid.janelia.org",
malevnc.rootnode='1ec355123bf94e588557a4568d26d258'
)
if(set) return(options(ops)) else return(ops)
}
Expand Down
8 changes: 5 additions & 3 deletions R/dvid.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ manc_dvid_node <- function(type=c("clio", "neutu", "neuprint", "master"), cached
if(is.null(dsname))
stop("The package option malevnc.dataset is unset. Please set or manually reload package!")

if(type=='neuprint') {
if(dsname=="MANC" || type=='neuprint') {
vncc=manc_neuprint()
ds=neuprintr::neuprint_datasets(cache = cached, conn=vncc)
node=ds[[tolower(dsname)]]$uuid
if(is.null(node))
nds=sort(names(ds),decreasing = T)
midx=match(tolower(dsname), sub(":.+", "", nds))
if(is.na(midx))
stop("Unable to find neuprint node")
node=ds[[nds[midx]]]$uuid
return(node)
}

Expand Down

0 comments on commit 7fab382

Please sign in to comment.