Deltavision: parse more key/value pairs from the log file #2974
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mtbc
approved these changes
Oct 13, 2017
There was a problem hiding this comment.
The resulting changes are,
13c13
< Initialization took 0.633s
---
> Initialization took 0.644s
48a49
> CHANNEL: 0.1000,FITC,FITC,100%
53a55,65
> DURATION: 0.100000
> EM_SHUTTERS: 1,CCD1=F
> ENTIRE_EXP_REPEATS: 1
> EVENT_BLEACH: PATTERN
> EVENT_MOTION_OPTIMIZE: POSITION
> EVENT_REPEATS: 5
> EVENT_TIME_MARK: END
> EXPECTED_HALFTIME: 1.000
> EXPERIMENT_TYPE: PK
> EXP_REPEATS_TIMELAPSE: 10.000
> EX_SHUTTERS: 3,EX=T,TRANS=F,LASER=F
404,408c416,420
< Image Properties Binning: 1x1
< Image Properties Flat-field Calibration: Off
< Image Properties Pixel Size: 0.16000 0.16000 0.200
< Image Properties XY Dimensions: 512 x 512
< Image Properties ZWT Dimensions (expected): 1 x 1 x 35
---
> Image Properties: Binning: 1x1
> Image Properties: Flat-field Calibration: Off
> Image Properties: Pixel Size: 0.16000 0.16000 0.200
> Image Properties: XY Dimensions: 512 x 512
> Image Properties: ZWT Dimensions (expected): 1 x 1 x 35
412a425,426
> LASER_CHANNEL: 406
> Laser Event Locations (x,y): 47.36, 47.52 (spot)
421a436,438
> POST_EVENT_IMAGES: 32
> PRE_EVENT_IMAGES: 3
> PRE_IMAGE_TIME_INTERVAL: 0.500
464a482,486
> QLM Bleach Event Points #1: SPOT 45.62 45.39
> QLM Bleach Event Points #2: SPOT 43.55 42.95
> QLM Bleach Event Points #3: SPOT 41.49 40.50
> QLM Bleach Event Points #4: SPOT 39.43 38.06
> QLM Bleach Event Points #5: SPOT 47.36 47.52
465a488,489
> QLM Settings for PhotoKinetics Experiment #1: Laser 406 nm, Power 20.00(%), 4.00(mW), Duration 0.1000
> QLM Settings for PhotoKinetics Experiment #2: Beam Expander Position 0, Laser Spot Radius 0.00 um
466a491,494
> Resolve3D Macro #1: OPF
> Resolve3D Macro #2: SCANPK 0.100000,1,0,3,1,2,0,0,1,-1.000,0.100000,1,3,5,3,32,1.000,120.000,4,1,0.500,1,0.000
> Resolve3D Macro #3: CLF
> Resolve3D Macro #4: BEEP
475a504
> TIME_COURSE_STYLE: AUTO
|
Merging the PR as all additions to the global meta look good and remaining metadata is unchanged. |
|
This pull request has been mentioned on Image.sc Forum. There might be relevant details there: https://forum.image.sc/t/omero-and-omx-v4-omx-sr-metadata/40140/7 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes https://trac.openmicroscopy.org/ome/ticket/13237
To test, use the dataset in
data_repo/curated/deltavision/michael/ticket-13237/. This was created by copyingdata_repo/curated/deltavision/michael/mtools/CTR_centrosome_01_R3D.dvto01_R3D.dvand placing01_R3D.dv.logfrom the ticket attachment in the same directory.Comparing
showinf -nopix 01_R3D.dvwith and without this change should show that there are more original metadata key/value pairs with this change. The log file lines noted on the ticket should be represented by original metadata with this change. There should be no difference in pixel data or image dimensions.