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

Performance and position count fixes for ND2 #1275

Merged
merged 13 commits into from Aug 25, 2014

Conversation

melissalinkert
Copy link
Member

Fixes https://trac.openmicroscopy.org.uk/ome/ticket/12477 and https://trac.openmicroscopy.org.uk/ome/ticket/12508. I am intentionally leaving 12477 open though, as I think more investigation at the formats-common level is in order (but likely not appropriate for 5.0.x).

To test, verify that jobs are green, and that QA 9438 (corresponding to ticket 12508) has 4 positions and 4 channels. Physical size X and Y should be present, as should exposure times. Initialization times of large .nd2 files (e.g. nd2/richard, nd2/guillaume) should be slightly smaller with this PR included.

@bramalingam
Copy link
Member

Everything looks good. Please merge.

Imported the following files,

%ND2 jobs
nd2_job={10939,'/Volumes/ome/team/rleigh/samples/nd2/nowell/CamND2.nd2';...
11998,'/Volumes/ome/apache_repo/7906';11305,...
'/Volumes/ome/apache_repo/7534';11305,...
'/Volumes/ome/apache_repo/7535';11873,...
'/Volumes/ome/apache_repo/7799';11997,...
'/Volumes/ome/apache_repo/7908';12205,...
'/Volumes/ome/apache_repo/9183';10773,...
'/Volumes/ome/apache_repo/5042';11387,...
'/Volumes/ome/apache_repo/7571';'All_ND2',...
'/Volumes/ome/data_repo/from_skyking/nd2’};

and QA 9438.

Performance on Aug4th :
OMERO Version: 5.0.3-rc3-46-e7a742d-ice35-b94
Bioformats version: 5.0.3-DEV revision: b67297a date: 4 August 2014
Server: 5.0.3
Client: 5.0.3-rc3-46-e7a742d-ice35-b94
Java Version: 1.7.0_11
OS Name: Mac OS X
OS Arch: x86_64
OS Version: 10.9.4

Time take for 224 file sets : 6.5 hours

Performance on August 21st :
OMERO Version: 5.0.3-11-42b1483-ice35-b108
Bioformats version: 5.0.3-DEV revision: d5302f5 date: 21 August 2014
Attempting initial SSL connection to localhost:14064
Server: 5.0.3
Client: 5.0.3-11-42b1483-ice35-b108
Java Version: 1.7.0_11
OS Name: Mac OS X
OS Arch: x86_64
OS Version: 10.9.4

Time taken for 224 file sets : 5.80 hours.

@ghost
Copy link

ghost commented Aug 25, 2014

Last commit looks fine and wavelength looks correct in OME-XML.

melissalinkert added a commit that referenced this pull request Aug 25, 2014
Performance and position count fixes for ND2
@melissalinkert melissalinkert merged commit 608008b into ome:dev_5_0 Aug 25, 2014
@sbesson sbesson added this to the 5.0.4 milestone Sep 1, 2014
@melissalinkert
Copy link
Member Author

--rebased-to #1311

@melissalinkert melissalinkert deleted the nd2-5.0.4-dev_5_0 branch September 26, 2014 13:32
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

3 participants