Skip to content

Commit 020a185

Browse files
committed
Remove obsolete check for UnsignedShortType when exporting to HDF5
1 parent c47e237 commit 020a185

File tree

1 file changed

+24
-36
lines changed

1 file changed

+24
-36
lines changed

src/main/java/bdv/export/WriteSequenceToHdf5.java

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,30 @@
2828
*/
2929
package bdv.export;
3030

31+
import java.io.File;
32+
import java.io.IOException;
33+
import java.util.ArrayList;
34+
import java.util.Collections;
35+
import java.util.HashMap;
36+
import java.util.Map;
37+
import java.util.Map.Entry;
38+
import java.util.concurrent.ExecutorService;
39+
import java.util.concurrent.Executors;
40+
import java.util.function.Function;
41+
42+
import org.janelia.saalfeldlab.n5.ByteArrayDataBlock;
43+
import org.janelia.saalfeldlab.n5.Compression;
44+
import org.janelia.saalfeldlab.n5.DataBlock;
45+
import org.janelia.saalfeldlab.n5.DataType;
46+
import org.janelia.saalfeldlab.n5.DatasetAttributes;
47+
import org.janelia.saalfeldlab.n5.DoubleArrayDataBlock;
48+
import org.janelia.saalfeldlab.n5.FloatArrayDataBlock;
49+
import org.janelia.saalfeldlab.n5.GzipCompression;
50+
import org.janelia.saalfeldlab.n5.IntArrayDataBlock;
51+
import org.janelia.saalfeldlab.n5.LongArrayDataBlock;
52+
import org.janelia.saalfeldlab.n5.RawCompression;
53+
import org.janelia.saalfeldlab.n5.ShortArrayDataBlock;
54+
3155
import bdv.export.ExportScalePyramid.AfterEachPlane;
3256
import bdv.export.ExportScalePyramid.Block;
3357
import bdv.export.ExportScalePyramid.DatasetIO;
@@ -38,19 +62,8 @@
3862
import bdv.img.n5.DataTypeProperties;
3963
import bdv.spimdata.SequenceDescriptionMinimal;
4064
import ch.systemsx.cisd.hdf5.HDF5Factory;
41-
import ch.systemsx.cisd.hdf5.HDF5IntStorageFeatures;
4265
import ch.systemsx.cisd.hdf5.IHDF5Reader;
4366
import ch.systemsx.cisd.hdf5.IHDF5Writer;
44-
import java.io.File;
45-
import java.io.IOException;
46-
import java.util.ArrayList;
47-
import java.util.Collections;
48-
import java.util.HashMap;
49-
import java.util.Map;
50-
import java.util.Map.Entry;
51-
import java.util.concurrent.ExecutorService;
52-
import java.util.concurrent.Executors;
53-
import java.util.function.Function;
5467
import mpicbg.spim.data.XmlHelpers;
5568
import mpicbg.spim.data.generic.sequence.AbstractSequenceDescription;
5669
import mpicbg.spim.data.generic.sequence.BasicImgLoader;
@@ -61,28 +74,11 @@
6174
import mpicbg.spim.data.sequence.ViewId;
6275
import net.imglib2.Dimensions;
6376
import net.imglib2.RandomAccessibleInterval;
64-
import net.imglib2.cache.img.SingleCellArrayImg;
6577
import net.imglib2.img.cell.CellImg;
6678
import net.imglib2.type.NativeType;
6779
import net.imglib2.type.numeric.RealType;
6880
import net.imglib2.type.numeric.integer.UnsignedShortType;
6981
import net.imglib2.util.Cast;
70-
import net.imglib2.util.Intervals;
71-
import org.janelia.saalfeldlab.n5.ByteArrayDataBlock;
72-
import org.janelia.saalfeldlab.n5.Compression;
73-
import org.janelia.saalfeldlab.n5.DataBlock;
74-
import org.janelia.saalfeldlab.n5.DataType;
75-
import org.janelia.saalfeldlab.n5.DatasetAttributes;
76-
import org.janelia.saalfeldlab.n5.DoubleArrayDataBlock;
77-
import org.janelia.saalfeldlab.n5.FloatArrayDataBlock;
78-
import org.janelia.saalfeldlab.n5.GzipCompression;
79-
import org.janelia.saalfeldlab.n5.IntArrayDataBlock;
80-
import org.janelia.saalfeldlab.n5.LongArrayDataBlock;
81-
import org.janelia.saalfeldlab.n5.N5Writer;
82-
import org.janelia.saalfeldlab.n5.RawCompression;
83-
import org.janelia.saalfeldlab.n5.ShortArrayDataBlock;
84-
85-
import static net.imglib2.util.Util.long2int;
8682

8783
/**
8884
* Create a hdf5 files containing image data from all views and all timepoints
@@ -398,14 +394,6 @@ public static void writeHdf5PartitionFile(
398394
// get the BasicImgLoader that supplies the images
399395
final BasicImgLoader imgLoader = seq.getImgLoader();
400396

401-
for ( final BasicViewSetup setup : seq.getViewSetupsOrdered() ) {
402-
final Object type = imgLoader.getSetupImgLoader( setup.getId() ).getImageType();
403-
if ( !( type instanceof UnsignedShortType ) )
404-
throw new IllegalArgumentException( "Expected BasicImgLoader<UnsignedShortTyp> but your dataset has BasicImgLoader<"
405-
+ type.getClass().getSimpleName() + ">.\nCurrently writing to HDF5 is only supported for UnsignedShortType." );
406-
}
407-
408-
409397
// open HDF5 partition output file
410398
final File hdf5File = new File( partition.getPath() );
411399
if ( hdf5File.exists() )

0 commit comments

Comments
 (0)