Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zeiss CZI: fix dimension calculations when expected planes are missing (rebased onto dev_5_0) #1400

Merged
merged 3 commits into from
Nov 4, 2014

Conversation

melissalinkert
Copy link
Member

This is the same as gh-1386 but rebased onto dev_5_0.


This should fix http://trac.openmicroscopy.org.uk/ome/ticket/12556. The dimensions for the files in QA 9521 and 10301 should now match the expected dimensions listed in the ticket and QA issues. I would not expect this to cause any test failures.

/cc @emilroz

This prevents blank planes from containing garbage data.
This prevents pixel data from being accidentally included on the
companion file list.
@melissalinkert
Copy link
Member Author

--rebased-from #1386

@dominikl
Copy link
Member

dominikl commented Nov 3, 2014

Checked with image from ticket 12556, looks fine:

Filename = /Users/dlindner/Desktop/c3_z11_t1.czi
Series count = 1
Series #0 :
    Image count = 33
    RGB = false (1) 
    Interleaved = false
    Indexed = true (false color, 16-bit LUT: 3 x 65536)
    Width = 512
    Height = 512
    SizeZ = 11
    SizeT = 1
    SizeC = 3

Unfortunately I couldn't figure out, what the expected result for the QA 10301 files should look like, handing over to someone else to review

@dominikl
Copy link
Member

dominikl commented Nov 3, 2014

The showinf results for 141016_OP43adult_Worm3_DAPI_head.czi (QA 10301) match the results from the original PR's review, so I think, it's good to merge!
Just noticed that the last file mentioned in QA 10301, couldn't be read (but probably nothing to do with this PR):

Checking file format [Zeiss CZI]
Initializing reader
ZeissCZIReader initializing /Users/dlindner/Desktop/10301/FixDoubleIlluMax.czi
Unknown segment type: //dir = "/Volum
Exception in thread "main" java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
    at java.util.ArrayList.rangeCheck(ArrayList.java:635)
    at java.util.ArrayList.get(ArrayList.java:411)
    at loci.formats.in.ZeissCZIReader.initFile(ZeissCZIReader.java:541)
    at loci.formats.FormatReader.setId(FormatReader.java:1317)
    at loci.formats.ImageReader.setId(ImageReader.java:753)
    at loci.formats.ReaderWrapper.setId(ReaderWrapper.java:569)
    at loci.formats.tools.ImageInfo.testRead(ImageInfo.java:992)
    at loci.formats.tools.ImageInfo.main(ImageInfo.java:1074)

@emilroz
Copy link
Member

emilroz commented Nov 3, 2014

It doesn't look like FixDoubleIlluMax.czi is a part of the original QA 10301. It is also very small (5 KB) so we should probably get rid of it. Unless someone knows what is that file good for.

@sbesson sbesson added the dev_5_0 label Nov 4, 2014
@melissalinkert
Copy link
Member Author

I can't remove FixDoubleIluMax.czi from /ome/apache_repo/10301, but it is removed from /ome/data_repo/from_skyking/zeiss-czi/10301 (which is what is being tested automatically).

melissalinkert added a commit that referenced this pull request Nov 4, 2014
Zeiss CZI: fix dimension calculations when expected planes are missing (rebased onto dev_5_0)
@melissalinkert melissalinkert merged commit 5e39d0a into ome:dev_5_0 Nov 4, 2014
@emilroz
Copy link
Member

emilroz commented Nov 4, 2014

From QA post: FixDoubleIlluMax.czi is not a .czi, it's a Fiji Macro.

@sbesson sbesson added this to the 5.0.6 milestone Nov 11, 2014
@melissalinkert melissalinkert deleted the rebased/dev_5_0/12556 branch April 13, 2015 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants