Skip to content

Commit 56df08a

Browse files
committed
added MAARS deps; updated BfSeg manual;
Former-commit-id: 912280a
1 parent 23271ae commit 56df08a

File tree

107 files changed

+59
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+59
-41
lines changed

README.md

+16-13

batchMAAR.py

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#@OpService ops
2+
#@String(choices={"fluoConfigurator", "batchSegmentation", "batchFluoAnalysis"}, style="radioButtonVertical") method
3+
#@File(label="Select a directory", style="directory") d
4+
ops.run(method, d.getPath(), "maars_config.xml")

copyFijiDeps.sh

100644100755
File mode changed.

copyMMDeps.sh

100644100755
+7-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
#!/usr/bin/env bash
2-
mvn dependency:copy-dependencies -DoutputDirectory=../jars/MAARS_deps -DexcludeGroupIds=org.micromanager -DexcludeArtifactIds=commons-math3,eventbus,gentyref,jcommon,jfreechart,3D_Viewer,scijava-common
2+
cd maars_lib
3+
mvn dependency:copy-dependencies -DoutputDirectory=../jars/MAARS_deps -DexcludeGroupIds=org.micromanager
4+
cd ../maars_otf
5+
mvn dependency:copy-dependencies -DoutputDirectory=../jars/MAARS_deps -DexcludeGroupIds=org.micromanager
6+
cd ../maars_bfSeg
7+
mvn dependency:copy-dependencies -DoutputDirectory=../jars/MAARS_deps -DexcludeGroupIds=org.micromanager
8+
cd ..

doc/BfSeg_manual.md

+23-16

doc/images/seg_bf.gif

1.15 MB

doc/manual.md

+6-8

jars/Fiji_deps/json-20170516.jar

55.9 KB
Binary file not shown.

jars/MM_deps/3D_Viewer-4.0.2.jar

555 KB
Binary file not shown.

jars/MM_deps/JWlz-1.4.0.jar

115 KB
Binary file not shown.

jars/MM_deps/TrackMate_-3.5.3.jar

1.33 MB
Binary file not shown.

jars/MM_deps/VIB-lib-2.1.2.jar

621 KB
Binary file not shown.

jars/MM_deps/batik-awt-util-1.9.jar

411 KB
Binary file not shown.

jars/MM_deps/batik-constants-1.9.jar

8.05 KB
Binary file not shown.

jars/MM_deps/batik-css-1.9.jar

317 KB
Binary file not shown.

jars/MM_deps/batik-dom-1.9.jar

180 KB
Binary file not shown.

jars/MM_deps/batik-ext-1.9.jar

12.7 KB
Binary file not shown.

jars/MM_deps/batik-i18n-1.9.jar

11 KB
Binary file not shown.

jars/MM_deps/batik-svggen-1.9.jar

219 KB
Binary file not shown.

jars/MM_deps/batik-util-1.9.jar

124 KB
Binary file not shown.

jars/MM_deps/batik-xml-1.9.jar

32.7 KB
Binary file not shown.
244 KB
Binary file not shown.
244 KB
Binary file not shown.
240 KB
Binary file not shown.
575 KB
Binary file not shown.

jars/MM_deps/commons-io-1.3.1.jar

81.7 KB
Binary file not shown.

jars/MM_deps/commons-lang3-3.5.jar

469 KB
Binary file not shown.
59.3 KB
Binary file not shown.

jars/MM_deps/commons-math3-3.4.1.jar

1.94 MB
Binary file not shown.

jars/MM_deps/commons-math3-3.6.1.jar

2.11 MB
Binary file not shown.

jars/MM_deps/ejml-0.24.jar

338 KB
Binary file not shown.

jars/MM_deps/eventbus-1.4.jar

80.8 KB
Binary file not shown.

jars/MM_deps/fiji-lib-2.1.2.jar

90.7 KB
Binary file not shown.

jars/MM_deps/formats-api-5.5.3.jar

116 KB
Binary file not shown.

jars/MM_deps/formats-bsd-5.5.3.jar

674 KB
Binary file not shown.

jars/MM_deps/formats-gpl-5.5.3.jar

1.24 MB
Binary file not shown.

jars/MM_deps/gentyref-1.1.0.jar

16.5 KB
Binary file not shown.

jars/MM_deps/gluegen-rt-2.3.2.jar

338 KB
Binary file not shown.

jars/MM_deps/guava-21.0.jar

2.4 MB
Binary file not shown.

jars/MM_deps/ij-1.51n.jar

2.08 MB
Binary file not shown.

jars/MM_deps/ij1-patcher-0.12.6.jar

152 KB
Binary file not shown.

jars/MM_deps/imagej-common-0.24.4.jar

449 KB
Binary file not shown.
693 KB
Binary file not shown.

jars/MM_deps/imglib2-4.2.1.jar

632 KB
Binary file not shown.
459 KB
Binary file not shown.
20.1 KB
Binary file not shown.
152 KB
Binary file not shown.
34.6 KB
Binary file not shown.
Binary file not shown.

jars/MM_deps/imglib2-roi-0.4.6.jar

139 KB
Binary file not shown.

jars/MM_deps/itextpdf-5.5.11.jar

2.2 MB
Binary file not shown.
1.85 MB
Binary file not shown.
1020 KB
Binary file not shown.

jars/MM_deps/jai_imageio-5.5.3.jar

1020 KB
Binary file not shown.

jars/MM_deps/jama-1.0.3.jar

36.5 KB
Binary file not shown.

jars/MM_deps/javassist-3.22.0-CR1.jar

718 KB
Binary file not shown.

jars/MM_deps/jcommon-1.0.24.jar

323 KB
Binary file not shown.

jars/MM_deps/jdom2-2.0.6.jar

298 KB
Binary file not shown.

jars/MM_deps/jfreechart-1.0.19.jar

1.49 MB
Binary file not shown.
33 KB
Binary file not shown.

jars/MM_deps/jgoodies-forms-1.7.2.jar

115 KB
Binary file not shown.

jars/MM_deps/jgrapht-0.8.3.jar

240 KB
Binary file not shown.

jars/MM_deps/jgraphx-3.4.1.3.jar

769 KB
Binary file not shown.

jars/MM_deps/jhdf5-14.12.0.jar

9.43 MB
Binary file not shown.

jars/MM_deps/jitk-tps-2.1.1.jar

18.8 KB
Binary file not shown.

jars/MM_deps/joda-time-2.9.9.jar

619 KB
Binary file not shown.

jars/MM_deps/jogl-all-2.3.2.jar

3.26 MB
Binary file not shown.

jars/MM_deps/json-20170516.jar

55.9 KB
Binary file not shown.

jars/MM_deps/jxrlib-all-0.2.1.jar

492 KB
Binary file not shown.

jars/MM_deps/kryo-2.24.0.jar

331 KB
Binary file not shown.

jars/MM_deps/log4j-1.2.17.jar

478 KB
Binary file not shown.
284 KB
Binary file not shown.

jars/MM_deps/logback-core-1.2.3.jar

461 KB
Binary file not shown.
96.6 KB
Binary file not shown.
206 KB
Binary file not shown.

jars/MM_deps/metakit-5.3.0.jar

13.9 KB
Binary file not shown.

jars/MM_deps/mines-jtk-20151125.jar

1.92 MB
Binary file not shown.

jars/MM_deps/minlog-1.2.jar

4.85 KB
Binary file not shown.

jars/MM_deps/mpicbg-1.1.1.jar

330 KB
Binary file not shown.
17.5 KB
Binary file not shown.

jars/MM_deps/netcdf-4.3.22.jar

4.38 MB
Binary file not shown.

jars/MM_deps/objenesis-2.1.jar

40.8 KB
Binary file not shown.

jars/MM_deps/ojalgo-43.0.jar

1.59 MB
Binary file not shown.

jars/MM_deps/ome-common-5.3.1.jar

123 KB
Binary file not shown.

jars/MM_deps/ome-mdbtools-5.3.0.jar

90.4 KB
Binary file not shown.

jars/MM_deps/ome-poi-5.3.1.jar

929 KB
Binary file not shown.

jars/MM_deps/ome-xml-5.5.4.jar

638 KB
Binary file not shown.

jars/MM_deps/opencsv-3.9.jar

78.8 KB
Binary file not shown.
43.4 KB
Binary file not shown.

jars/MM_deps/parsington-1.0.1.jar

42.7 KB
Binary file not shown.

jars/MM_deps/perf4j-0.9.13.jar

107 KB
Binary file not shown.
766 KB
Binary file not shown.

jars/MM_deps/slf4j-api-1.7.25.jar

40.2 KB
Binary file not shown.

jars/MM_deps/specification-5.5.4.jar

637 KB
Binary file not shown.

jars/MM_deps/trove4j-3.0.3.jar

2.41 MB
Binary file not shown.

jars/MM_deps/turbojpeg-5.5.3.jar

1.24 MB
Binary file not shown.

jars/MM_deps/udunits-4.3.18.jar

124 KB
Binary file not shown.
160 KB
Binary file not shown.

jars/MM_deps/xercesImpl-2.8.1.jar

1.16 MB
Binary file not shown.

jars/MM_deps/xml-apis-ext-1.3.04.jar

83.7 KB
Binary file not shown.
631 KB
Binary file not shown.

jars/MM_deps/xmpcore-5.1.2.jar

115 KB
Binary file not shown.

jars/maars_bfSeg_2.0.0-SNAPSHOT.jar

-5 Bytes
Binary file not shown.

jars/maars_lib_2.0.0-SNAPSHOT.jar

-3.74 KB
Binary file not shown.

jars/maars_otf_2.0.0-SNAPSHOT.jar

10 Bytes
Binary file not shown.

jars/maars_post_2.0.0-SNAPSHOT.jar

152 Bytes
Binary file not shown.

maars_lib/src/main/resources/maars_default_config.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<CALIBRATION>0.1066</CALIBRATION>
44
<PATH_TO_POSITION_LIST></PATH_TO_POSITION_LIST>
55
<FLUO_ANALYSIS_PARAMETERS>
6-
<FLUO_PREFIX></FLUO_PREFIX>
6+
<FLUO_PREFIX>FLUO_1</FLUO_PREFIX>
77
<PATH_TO_FLUO_ACQ_SETTING>AcqSettings_fluo.txt</PATH_TO_FLUO_ACQ_SETTING>
88
<DYNAMIC>true</DYNAMIC>
99
<!-- the order is important !!!! -->
@@ -57,13 +57,13 @@
5757
</DEFAULT_CHANNEL_PARAMATERS>
5858
<SAVING_PATH></SAVING_PATH>
5959
<!-- not editable with GUI -->
60-
<BATCH_MODE>true</BATCH_MODE>
60+
<BATCH_MODE>false</BATCH_MODE>
6161
</GENERAL_ACQUISITION_PARAMETERS>
6262
<SEGMENTATION_PARAMETERS>
6363
<!-- only useful in batch mode -->
6464
<TOLERANCE>10</TOLERANCE>
6565
<PATH_TO_BF_ACQ_SETTING>AcqSettings_bf.txt</PATH_TO_BF_ACQ_SETTING>
66-
<SEG_PREFIX></SEG_PREFIX>
66+
<SEG_PREFIX>BF_1</SEG_PREFIX>
6767
<SIGMA>3.0</SIGMA>
6868
<DIRECTION>-1</DIRECTION>
6969
<FOCUS>17</FOCUS>

0 commit comments

Comments
 (0)