Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit 441457f

Browse files
seiriosseirios
committed
Use both hemispheres in flat views with BOTH=1
+ Also allow per-layer split with SPLIT=1
1 parent 4c82008 commit 441457f

File tree

11 files changed

+144
-42
lines changed

11 files changed

+144
-42
lines changed

‎flatmap/code/utils/flatplot.py‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
# AUTHOR: Sirio Bolaños Puchet <[email protected]>
33
# CREATION DATE: 2023-05-30
4-
# LAST MODIFICATION: 2024-05-02
4+
# LAST MODIFICATION: 2024-05-13
55

66
_PROGNAME = 'flatplot'
77

@@ -68,25 +68,26 @@
6868
import colorcet
6969

7070

71-
def flatplot(flatpos, flatval, cmap=colorcet.gray, flatpix=256, reduction=ds.max, how='linear',
72-
span=(0, 1), dual=False):
71+
def flatplot(flatpos, flatval, cmap=colorcet.gray, flatpix=256, reduction=ds.max,
72+
how='linear', span=(0, 1), dual=False):
7373
import pandas as pd
74-
plot_width = 2 * flatpix if dual else flatpix
75-
x_range = (0,2) if dual else (0,1)
76-
cvs = ds.Canvas(plot_width=plot_width, plot_height=flatpix, x_range=x_range, y_range=(0,1))
77-
df = pd.DataFrame(flatpos, columns=('x','y'))
74+
x_range = (0, 2) if dual else (0, 1)
75+
width = 2 * flatpix if dual else flatpix
76+
cvs = ds.Canvas(plot_width=width, plot_height=flatpix, x_range=x_range, y_range=(0, 1))
77+
df = pd.DataFrame(flatpos, columns=('x', 'y'))
7878
df['val'] = flatval # set column while keeping data type
79-
agg = cvs.points(df,'x','y',reduction('val'))
79+
agg = cvs.points(df, 'x', 'y', reduction('val'))
8080
return tf.shade(agg, how=how, cmap=cmap, span=span), agg
8181

8282

8383
def flatplot_dots(flatpos, flatval, cmap='#000000', flatpix=256, how='eq_hist', spread=None,
8484
dual=False):
8585
import pandas as pd
86-
x_range = (0,2) if dual else (0,1)
87-
cvs = ds.Canvas(plot_width=flatpix, plot_height=flatpix, x_range=x_range, y_range=(0,1))
88-
df = pd.DataFrame(flatpos, columns=('x','y'))
89-
agg = cvs.points(df,'x','y')
86+
x_range = (0, 2) if dual else (0, 1)
87+
width = 2 * flatpix if dual else flatpix
88+
cvs = ds.Canvas(plot_width=width, plot_height=flatpix, x_range=x_range, y_range=(0, 1))
89+
df = pd.DataFrame(flatpos, columns=('x', 'y'))
90+
agg = cvs.points(df, 'x', 'y')
9091
if spread is not None:
9192
return tf.shade(tf.spread(agg, px=spread), cmap=cmap, how=how), agg
9293
else:
@@ -98,7 +99,8 @@ def get_mode(vals):
9899
return x[np.argmax(c)]
99100

100101

101-
def flatplot_regions(flatpos, flatval, cmap=colorcet.glasbey, flatpix=256, valbkg=-1):
102+
def flatplot_regions(flatpos, flatval, cmap=colorcet.glasbey, flatpix=256, valbkg=-1,
103+
dual=False):
102104
from collections import defaultdict
103105
import xarray as xr
104106
try:
@@ -117,23 +119,25 @@ def flatplot_regions(flatpos, flatval, cmap=colorcet.glasbey, flatpix=256, valbk
117119
# compute mode of values per pixel
118120
d = defaultdict(list)
119121
for x, y, z in idat:
120-
d[(x,y)].append(z)
122+
d[(x, y)].append(z)
121123
if has_parallel:
122124
with parallel_config(backend='threading', n_jobs=cpu_count()):
123125
result = Parallel()(delayed(get_mode)(v) for v in d.values())
124126
else:
125127
result = [get_mode(v) for v in d.values()]
126128
dmode = {k: result[i] for i, k in enumerate(d.keys())}
127129
# setup raster
128-
arr = np.full((flatpix,flatpix), np.nan, dtype='float32')
129-
for k,v in dmode.items():
130+
width = 2 * flatpix if dual else flatpix
131+
arr = np.full((width, flatpix), np.nan, dtype='float32')
132+
for k, v in dmode.items():
130133
arr[k] = v
131134
# correct orientation
132135
arr = np.rot90(np.flipud(arr), -1)
133136
# plot
134-
cvs = ds.Canvas(plot_width=flatpix, plot_height=flatpix)
135-
xs = ys = np.linspace(0, 1, flatpix)
136-
x = xr.DataArray(arr,coords=[('y', ys), ('x', xs)])
137+
cvs = ds.Canvas(plot_width=width, plot_height=flatpix)
138+
xs = np.linspace(0, 1, width)
139+
ys = np.linspace(0, 1, flatpix)
140+
x = xr.DataArray(arr, coords=[('y', ys), ('x', xs)])
137141
agg = cvs.raster(x)
138142
return tf.shade(agg, how='linear', cmap=cmap, span=(0, len(cmap) - 1)), agg
139143

@@ -143,13 +147,13 @@ def str_to_reduction(s):
143147
return ds.max
144148
elif s in ['min']:
145149
return ds.min
146-
elif s in ['avg','mean']:
150+
elif s in ['avg', 'mean']:
147151
return ds.mean
148152
elif s in ['sum']:
149153
return ds.sum
150154
elif s in ['mode']:
151155
return ds.mode
152-
elif s in ['std','sd']:
156+
elif s in ['std', 'sd']:
153157
return ds.std
154158
elif s in ['var']:
155159
return ds.var
@@ -172,6 +176,7 @@ def str_to_reduction(s):
172176
if args.regions:
173177
func = flatplot_regions
174178
kwargs.update({'valbkg': args.regions_background})
179+
kwargs.update({'dual': args.dual})
175180
elif args.dots:
176181
func = flatplot_dots
177182
kwargs.update({'spread': args.spread})
@@ -185,6 +190,7 @@ def str_to_reduction(s):
185190
LOGGER.info('Loading flat map "{}"'.format(args.flatmap))
186191
fmap, fmap_valid = fmutil.load_flatmap(args.flatmap)
187192

193+
lay = None
188194
if args.dots:
189195
LOGGER.info('Loading dots "{}"'.format(args.dataset))
190196
dots = np.loadtxt(args.dataset)
@@ -203,13 +209,12 @@ def str_to_reduction(s):
203209

204210
data_valid = True
205211
if args.mask is not None:
206-
LOGGER.info('Loading data mask "{}"'.format(args.mask))
212+
LOGGER.info('Loading mask "{}"'.format(args.mask))
207213
dmsk = VoxelData.load_nrrd(args.mask)
208214
assert(dmsk.shape == dat.shape)
209215
data_valid = (dmsk.raw != 0)
210216
del dmsk
211217

212-
lay = None
213218
if args.split or args.only_layer is not None:
214219
LOGGER.info('Loading layer annotation "{}"'.format(args.layers))
215220
lay = VoxelData.load_nrrd(args.layers)
@@ -225,17 +230,18 @@ def str_to_reduction(s):
225230
flatpos = fmap.raw[mask]
226231
flatval = dat.raw[mask]
227232

233+
img_w = 2 * args.flatpix if args.dual else args.flatpix
228234
if lay is not None:
229235
LOGGER.info('Masking layer annotation')
230236
layval = lay.raw[mask]
231237
for k, v in ldict.items():
232-
LOGGER.info('Generating and saving image for Layer {} ({}x{})'.format(v, args.flatpix, args.flatpix))
238+
LOGGER.info('Generating and saving image for Layer {} ({}x{})'.format(v, img_w, args.flatpix))
233239
lmask = np.where(layval == k)
234240
img, agg = func(flatpos[lmask], flatval[lmask], cmap, args.flatpix, **kwargs)
235241
LOGGER.info('Min: {} Max: {}'.format(np.nanmin(agg.values), np.nanmax(agg.values)))
236242
ds.utils.export_image(img, '{}_Layer{}'.format(args.output_prefix, v), background=None, _return=False)
237243
else:
238-
LOGGER.info('Generating and saving image ({}x{})'.format(args.flatpix, args.flatpix))
244+
LOGGER.info('Generating and saving image ({}x{})'.format(img_w, args.flatpix))
239245
img, agg = func(flatpos, flatval, cmap, args.flatpix, **kwargs)
240246
LOGGER.info('Min: {} Max: {}'.format(np.nanmin(agg.values), np.nanmax(agg.values)))
241247
ds.utils.export_image(img, args.output_prefix, background=None, _return=False)

‎flatmap/workflow/applications/config.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ DEFAULT_STEPS := flatview_annotations
1313

1414
## file names
1515
FLATVIEW_ANNOTATIONS_FILE := flatview_annotations.png
16+
FLATVIEW_ANNOTATIONS_BOTH_FILE := flatview_annotations_both.png
1617
VOLUME_DECOMPOSITION_NRRD_FILE := hexgrid.nrrd
1718
STREAMLINE_DERIVED_DEPTH_FILE := depth.nrrd
1819
STREAMLINE_DERIVED_THICKNESS_FILE := thickness.nrrd

‎flatmap/workflow/applications/flatview_3d_data/Makefile‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,36 @@ ifndef FLATVIEW_DATA_INPUT_FILE
44
$(error Please set FLATVIEW_DATA_INPUT_FILE to location of input NRRD data file)
55
endif
66

7-
output/$(FLATVIEW_DATA_PNG_FILE): input/$(FLATMAP_NRRD_FILE) input/$(FLATVIEW_DATA_NRRD_FILE)
8-
$(FLATPLOT_BIN) $(FLATPLOT_DATA_EXTRA) $< $(word 2,$^) $(subst .png,,$@)
7+
FLATPLOT_DATA_EXTRA ?= --autospan -p $(PIXEL_RESOLUTION)
8+
override FLATPLOT_FLAGS := $(FLATPLOT_DATA_EXTRA) $(FLATPLOT_FLAGS)
9+
10+
ifeq (1,$(BOTH))
11+
TARGET := output/$(subst .png,_both.png,$(FLATVIEW_DATA_PNG_FILE))
12+
FLATMAP_DEP := input/$(FLATMAP_BOTH_NRRD_FILE)
13+
override FLATPLOT_FLAGS := $(FLATPLOT_FLAGS) --dual
14+
else
15+
TARGET := output/$(FLATVIEW_DATA_PNG_FILE)
16+
FLATMAP_DEP := input/$(FLATMAP_NRRD_FILE)
17+
endif
18+
19+
ifeq (1,$(SPLIT))
20+
override FLATPLOT_FLAGS := $(FLATPLOT_FLAGS) --split --layers input/$(LAYERS_FILE)
21+
TARGET := $(subst .png,_split,$(TARGET))
22+
EXTRA_DEPS := input/$(LAYERS_FILE)
23+
endif
24+
25+
ifdef FLATVIEW_DATA_MASK_FILE
26+
EXTRA_DEPS += input/$(notdir $(FLATVIEW_DATA_MASK_FILE))
27+
override FLATPLOT_FLAGS := $(FLATPLOT_FLAGS) --mask input/$(notdir $(FLATVIEW_DATA_MASK_FILE))
28+
input/$(notdir $(FLATVIEW_DATA_MASK_FILE)): SRC := $(FLATVIEW_DATA_MASK_FILE)
29+
endif
30+
31+
$(TARGET): $(FLATMAP_DEP) input/$(FLATVIEW_DATA_NRRD_FILE) $(EXTRA_DEPS)
32+
$(FLATPLOT_BIN) $(FLATPLOT_FLAGS) $< $(word 2,$^) $(subst .png,,$@)
933

1034
# input links
1135
input/$(FLATMAP_NRRD_FILE): SRC := $(STAGE_III_ROOT)/02_flatmap/output/$(FLATMAP_NRRD_FILE)
36+
input/$(FLATMAP_BOTH_NRRD_FILE): SRC := $(POSTPROC_ROOT)/both_hemispheres/output/$(FLATMAP_BOTH_NRRD_FILE)
1237
input/$(FLATVIEW_DATA_NRRD_FILE): SRC := $(FLATVIEW_DATA_INPUT_FILE)
1338

1439
# auxiliary commands

‎flatmap/workflow/applications/flatview_3d_data/config.mk‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,24 @@
22
FLATVIEW_DATA_NRRD_FILE = $(notdir $(FLATVIEW_DATA_INPUT_FILE))
33
FLATVIEW_DATA_PNG_FILE = $(subst .nrrd,.png,$(FLATVIEW_DATA_NRRD_FILE))
44

5+
ifeq (1,$(BOTH))
6+
override INPUTS := input/$(FLATMAP_BOTH_NRRD_FILE)\
7+
input/$(FLATVIEW_DATA_NRRD_FILE)
8+
9+
override OUTPUTS := output/$(subst .png,_both.png,$(FLATVIEW_DATA_PNG_FILE))
10+
else
511
override INPUTS := input/$(FLATMAP_NRRD_FILE)\
612
input/$(FLATVIEW_DATA_NRRD_FILE)
713

814
override OUTPUTS := output/$(FLATVIEW_DATA_PNG_FILE)
15+
endif
16+
17+
ifeq (1,$(SPLIT))
18+
override INPUTS := $(INPUTS)\
19+
input/$(LAYERS_FILE)
20+
21+
override OUTPUTS := $(subst .png,_split,$(OUTPUTS))
22+
endif
923

1024
override USER_PARAMETERS := FLATPLOT_DATA_EXTRA
1125

‎flatmap/workflow/applications/flatview_annotations/Makefile‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
include ../../common_header.mk
22

3-
output/$(FLATVIEW_ANNOTATIONS_FILE): input/$(FLATMAP_NRRD_FILE) input/$(ANNOTATIONS_FILE)
4-
$(FLATPLOT_BIN) --regions --colormap $(FLATVIEW_ANNOTATIONS_COLORMAP) -p $(PIXEL_RESOLUTION) \
3+
ifeq (1,$(BOTH))
4+
TARGET := output/$(FLATVIEW_ANNOTATIONS_BOTH_FILE)
5+
FLATMAP_DEP := input/$(FLATMAP_BOTH_NRRD_FILE)
6+
FLATPLOT_FLAGS += --dual
7+
else
8+
TARGET := output/$(FLATVIEW_ANNOTATIONS_FILE)
9+
FLATMAP_DEP := input/$(FLATMAP_NRRD_FILE)
10+
MASK_DEP := input/$(MASK_FILE)
11+
FLATPLOT_FLAGS += --mask $(MASK_DEP)
12+
endif
13+
14+
ifeq (1,$(SPLIT))
15+
FLATPLOT_FLAGS += --split --layers input/$(LAYERS_FILE)
16+
TARGET := $(subst .png,_split,$(TARGET))
17+
EXTRA_DEPS := input/$(LAYERS_FILE)
18+
endif
19+
20+
$(TARGET): $(FLATMAP_DEP) input/$(ANNOTATIONS_FILE) $(MASK_DEP) $(EXTRA_DEPS)
21+
$(FLATPLOT_BIN) $(FLATPLOT_FLAGS) --regions --colormap $(FLATVIEW_ANNOTATIONS_COLORMAP) -p $(PIXEL_RESOLUTION) \
522
$< $(word 2,$^) $(subst .png,,$@)
623

724
# input links
825
input/$(FLATMAP_NRRD_FILE): SRC := $(STAGE_III_ROOT)/02_flatmap/output/$(FLATMAP_NRRD_FILE)
26+
input/$(FLATMAP_BOTH_NRRD_FILE): SRC := $(POSTPROC_ROOT)/both_hemispheres/output/$(FLATMAP_BOTH_NRRD_FILE)
927

1028
# auxiliary commands
1129
view: view-image

‎flatmap/workflow/applications/flatview_annotations/config.mk‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
# DO NOT EDIT BELOW THIS LINE
2+
ifeq (1,$(BOTH))
23
override INPUTS := input/$(ANNOTATIONS_FILE)\
3-
input/$(FLATMAP_NRRD_FILE)
4+
input/$(FLATMAP_BOTH_NRRD_FILE)\
5+
6+
override OUTPUTS := output/$(FLATVIEW_ANNOTATIONS_BOTH_FILE)
7+
else
8+
override INPUTS := input/$(ANNOTATIONS_FILE)\
9+
input/$(FLATMAP_NRRD_FILE)\
10+
input/$(MASK_FILE)
411

512
override OUTPUTS := output/$(FLATVIEW_ANNOTATIONS_FILE)
13+
endif
14+
15+
ifeq (1,$(SPLIT))
16+
override INPUTS := $(INPUTS)\
17+
input/$(LAYERS_FILE)
18+
19+
override OUTPUTS := $(subst .png,_split,$(OUTPUTS))
20+
endif
621

722
override USER_PARAMETERS := FLATVIEW_ANNOTATIONS_COLORMAP\
823
PIXEL_RESOLUTION

‎flatmap/workflow/applications/flatview_morphology/Makefile‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,31 @@ ifndef FLATVIEW_MORPHO_INPUT_FILE
44
$(error Please set FLATVIEW_MORPHO_INPUT_FILE to location of input JSON morphology file)
55
endif
66

7-
TMPFILE_SOMA = $@.soma.tmp
8-
TMPFILE_AXON = $@.axon.tmp
97
FLATPLOT_FLAGS := --dots
8+
109
ifeq (1,$(REFLECT))
1110
FLATPLOT_FLAGS += --reflect
1211
endif
13-
output/$(FLATVIEW_MORPHO_PNG_FILE): input/$(FLATVIEW_MORPHO_JSON_FILE) input/$(FLATMAP_NRRD_FILE) input/$(FLATVIEW_ANNOTATIONS_FILE)
12+
13+
ifeq (1,$(BOTH))
14+
FLATMAP_DEP := input/$(FLATMAP_BOTH_NRRD_FILE)
15+
ANNOTATIONS_DEP := input/$(FLATVIEW_ANNOTATIONS_BOTH_FILE)
16+
FLATPLOT_FLAGS += --dual
17+
WIDTH := $(shell expr 2 \* $(PIXEL_RESOLUTION))
18+
else
19+
FLATMAP_DEP := input/$(FLATMAP_NRRD_FILE)
20+
ANNOTATIONS_DEP := input/$(FLATVIEW_ANNOTATIONS_FILE)
21+
WIDTH := $(PIXEL_RESOLUTION)
22+
endif
23+
24+
TMPFILE_SOMA = $@.soma.tmp
25+
TMPFILE_AXON = $@.axon.tmp
26+
output/$(FLATVIEW_MORPHO_PNG_FILE): input/$(FLATVIEW_MORPHO_JSON_FILE) $(FLATMAP_DEP) $(ANNOTATIONS_DEP)
1427
$(JQ) '.neuron.soma | .x, .y, .z' $< > $(TMPFILE_SOMA)
1528
$(JQ) '.neuron.axon[] | .x, .y, .z' $< > $(TMPFILE_AXON)
1629
$(FLATPLOT_BIN) $(FLATPLOT_FLAGS) -c '#FFFFFF' -p $(PIXEL_RESOLUTION) --spread 1 $(FLATPLOT_MORPHO_EXTRA) $(word 2,$^) $(TMPFILE_SOMA) $(TMPFILE_SOMA)
1730
$(FLATPLOT_BIN) $(FLATPLOT_FLAGS) -c '#000000' -p $(PIXEL_RESOLUTION) $(FLATPLOT_MORPHO_EXTRA) $(word 2,$^) $(TMPFILE_AXON) $(TMPFILE_AXON)
18-
$(MAGICK) composite -blend 50 $(word 3,$^) -size $(PIXEL_RESOLUTION)x$(PIXEL_RESOLUTION) xc:white -alpha Set $@.tmp.png
31+
$(MAGICK) composite -blend 50 $(word 3,$^) -size $(WIDTH)x$(PIXEL_RESOLUTION) xc:white -alpha Set $@.tmp.png
1932
$(MAGICK) composite -compose CopyOpacity $(word 3,$^) $@.tmp.png $@.tmp.png
2033
$(MAGICK) composite $(TMPFILE_AXON).png $@.tmp.png - \
2134
| $(MAGICK) composite $(TMPFILE_SOMA).png - $@
@@ -24,7 +37,9 @@ output/$(FLATVIEW_MORPHO_PNG_FILE): input/$(FLATVIEW_MORPHO_JSON_FILE) input/$(F
2437
# input links
2538
input/$(FLATVIEW_MORPHO_JSON_FILE): SRC := $(FLATVIEW_MORPHO_INPUT_FILE)
2639
input/$(FLATMAP_NRRD_FILE): SRC := $(STAGE_III_ROOT)/02_flatmap/output/$(FLATMAP_NRRD_FILE)
40+
input/$(FLATMAP_BOTH_NRRD_FILE): SRC := $(POSTPROC_ROOT)/both_hemispheres/output/$(FLATMAP_BOTH_NRRD_FILE)
2741
input/$(FLATVIEW_ANNOTATIONS_FILE): SRC := $(APPLICATIONS_ROOT)/flatview_annotations/output/$(FLATVIEW_ANNOTATIONS_FILE)
42+
input/$(FLATVIEW_ANNOTATIONS_BOTH_FILE): SRC := $(APPLICATIONS_ROOT)/flatview_annotations/output/$(FLATVIEW_ANNOTATIONS_BOTH_FILE)
2843

2944
# auxiliary commands
3045
view: view-image

‎flatmap/workflow/applications/flatview_morphology/config.mk‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ MAGICK := magick
66
FLATVIEW_MORPHO_JSON_FILE = $(notdir $(FLATVIEW_MORPHO_INPUT_FILE))
77
FLATVIEW_MORPHO_PNG_FILE = $(subst .json,.png,$(FLATVIEW_MORPHO_JSON_FILE))
88

9+
ifeq (1,$(BOTH))
10+
override INPUTS := input/$(FLATVIEW_MORPHO_JSON_FILE)\
11+
input/$(FLATMAP_BOTH_NRRD_FILE)\
12+
input/$(FLATVIEW_ANNOTATIONS_BOTH_FILE)
13+
else
914
override INPUTS := input/$(FLATVIEW_MORPHO_JSON_FILE)\
1015
input/$(FLATMAP_NRRD_FILE)\
1116
input/$(FLATVIEW_ANNOTATIONS_FILE)
17+
endif
1218

13-
override OUTPUTS := output/$(FLATVIEW_MORPHO_PNG_FILE)\
14-
output/flat_soma_dots.xyz\
15-
output/flat_axon_dots.xyz
19+
override OUTPUTS := output/$(FLATVIEW_MORPHO_PNG_FILE)
1620

1721
override USER_PARAMETERS := FLATPLOT_MORPHO_EXTRA\
1822
PIXEL_RESOLUTION

‎flatmap/workflow/config.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ STAGE_II_ROOT := $(WORKFLOW_ROOT)/02_stageII
6464
STAGE_III_ROOT := $(WORKFLOW_ROOT)/03_stageIII
6565
METRICS_ROOT := $(WORKFLOW_ROOT)/metrics
6666
APPLICATIONS_ROOT := $(WORKFLOW_ROOT)/applications
67+
POSTPROC_ROOT := $(WORKFLOW_ROOT)/postproc
6768

6869
## steps
6970
FLATMAP_STEPS := 01_stageI\
@@ -113,4 +114,6 @@ VOXEL_PROJECTIONS_POSITION_FILE := voxel_projections_position.xyz
113114
NEAREST_VERTICES_FILE := nearest_vertices.txt
114115
FLATMAP_FILE := flatmap.txt
115116
FLATMAP_NRRD_FILE := flatmap.nrrd
117+
FLATMAP_BOTH_NRRD_FILE := flatmap_both.nrrd
116118
FLATMAP_DISCRETE_NRRD_FILE := flatmap_discrete.nrrd
119+
FLATMAP_BOTH_DISCRETE_NRRD_FILE := flatmap_both_discrete.nrrd

‎flatmap/workflow/postproc/config.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ STEPS := both_hemispheres\
66
DEFAULT_STEPS :=
77

88
## file names
9-
FLATMAP_BOTH_NRRD_FILE := flatmap_both.nrrd
10-
FLATMAP_BOTH_DISCRETE_NRRD_FILE := flatmap_both_discrete.nrrd
119
FLATMAP_SPLIT_X_NRRD_FILE := flat_x.nrrd
1210
FLATMAP_SPLIT_Y_NRRD_FILE := flat_y.nrrd
1311
FLATMAP_SPLIT_X_DISCRETE_NRRD_FILE := flat_discrete_x.nrrd

0 commit comments

Comments
 (0)