Ticket #5397 (closed: fixed)
Implement quantification framework
| Reported by: | Martyn Gigg | Owned by: | Martyn Gigg |
|---|---|---|---|
| Priority: | critical | Milestone: | Release 2.2 |
| Component: | VATES | Keywords: | |
| Cc: | Blocked By: | ||
| Blocking: | Tester: | Owen Arnold |
Description
Attachments
Change History
comment:2 Changed 8 years ago by Martyn Gigg
Fleshing out models & tests. Refs #5397
Changeset: 0969c08f8741fb9c6506ce1906f4083670a7c9a6
comment:3 Changed 8 years ago by Martyn Gigg
Move MCRes to sub-directory. Refs #5397
Changeset: a4db244d1d9d044a769553c99f7e5173c3c8623a
comment:4 Changed 8 years ago by Martyn Gigg
Add ParamFunctionAttributeHolder. Refs #5397
Changeset: 5bbd147c7cb1f13250ab09c24a0dd77f18f26694
comment:5 Changed 8 years ago by Martyn Gigg
Tidying up attribute handling. Refs #5397
Changeset: 8bc656608e35e3ea157504555916dec627ffa1d5
comment:6 Changed 8 years ago by Martyn Gigg
Add moderator class. Refs #5397
Changeset: caae53e0c0331e44be838df6f4cbfbac61503eaf
comment:7 Changed 8 years ago by Martyn Gigg
Add a chopper class. Refs #5397
Changeset: 8d55cc1a201fe4535f1df8809f4d79d7d36ce4a0
comment:8 Changed 8 years ago by Martyn Gigg
Add helper methods to run object. Refs #5397
Changeset: 15dbf74045ed815b00698b1303782f0263de1e43
comment:9 Changed 8 years ago by Martyn Gigg
Access choppers from instrument. Refs #5397
Changeset: 2d52d290793e152edb1b0e82f8f76c298f9001c6
comment:10 Changed 8 years ago by Martyn Gigg
Allow the function domain to return the workspace. Refs #5397
Changeset: 515cab4641c1b7ddf99c79d408e61d0ce9dc9614
comment:11 Changed 8 years ago by Martyn Gigg
Use ExperimentInfo class in resolution model. Refs #5397
Changeset: 22be1bde70f0120f0ea80227d6ac603c153fdfbd
comment:12 Changed 8 years ago by Martyn Gigg
First stab at quantification framework. Refs #5397
Changeset: bc207a58e75a6f1eea0734aa795f2e6d822a00d7
comment:13 Changed 8 years ago by Martyn Gigg
Fleshing out models & tests. Refs #5397
Changeset: 0f5aaf26eb7c5d9474b1562393a8a86f19b280c6
comment:14 Changed 8 years ago by Martyn Gigg
Move MCRes to sub-directory. Refs #5397
Changeset: 7dac02b4e54edb7c3ee779f50bb212a0c3eac3db
comment:15 Changed 8 years ago by Martyn Gigg
Add ParamFunctionAttributeHolder. Refs #5397
Changeset: 721370e4f94e2fad0f39e462afae1d34d87b7ad1
comment:16 Changed 8 years ago by Martyn Gigg
Tidying up attribute handling. Refs #5397
Changeset: b85e9b81f5882ee0ae3039e8af6210a6426ae402
comment:17 Changed 8 years ago by Martyn Gigg
Add moderator class. Refs #5397
Changeset: 5add8381efb39397a4c9e737a44d19441f42a88c
comment:18 Changed 8 years ago by Martyn Gigg
Add a chopper class. Refs #5397
Changeset: 1597cbd2a22bbe14a37767184d4ce520a3bc3fdf
comment:19 Changed 8 years ago by Martyn Gigg
Add helper methods to run object. Refs #5397
Changeset: 7d14286930b45fe473afd1f429a0294332dd54e3
comment:20 Changed 8 years ago by Martyn Gigg
Access choppers from instrument. Refs #5397
Changeset: 39e2af0869d8a074e0cace753e9a3554a1ba057a
comment:21 Changed 8 years ago by Martyn Gigg
Allow the function domain to return the workspace. Refs #5397
Changeset: a82eceac38da29a21af972d4a7bed43f8ca03965
comment:22 Changed 8 years ago by Martyn Gigg
Use ExperimentInfo class in resolution model. Refs #5397
Changeset: 3fca1b8cede849146500248b3444ae11467ce00d
comment:23 Changed 8 years ago by Martyn Gigg
Fix tests. Refs #5397
Changeset: f6285cb8d1dc6f53826d80d809fd3b1d924ecb85
comment:24 Changed 8 years ago by Martyn Gigg
Allow efixed to be retrieved from ExperimentInfo. Refs #5397
A single run will have a defined DeltaE mode, this can now be retrieved from a central location much more easily
Changeset: 4d554ef681a39cd7ddc7d5666a2cfafcadf59111
comment:25 Changed 8 years ago by Martyn Gigg
Add observation class Refs #5397
Defines observables for a particular run & detector, i.e efixed, theta.
Changeset: 7f730591ca92bb454aff0d947bf7cbc02fb6b0aa
comment:26 Changed 8 years ago by Martyn Gigg
Checkpoint resolution calculation. Refs #5397
Changeset: 7a94fe31b7fc92658dfef1fa8f792e2cefd4b303
comment:27 Changed 8 years ago by Martyn Gigg
Observation class calculates component distances. Refs #5397
Changeset: 14432c4d6f79915f080e03e1a6716ae0d622dd4d
comment:28 Changed 8 years ago by Martyn Gigg
Access to fit params from foreground & resolution. Refs #5397
Changeset: aa554b5be3cac3004bd213648684ad46cd506523
comment:29 Changed 8 years ago by Martyn Gigg
Add MDResolutionConvolution factory + tests. Refs #5397
Changeset: b304634b836d38b13a6648a2b13adf8a51751f1c
comment:30 Changed 8 years ago by Martyn Gigg
Add portion of Monte Carlo loop. Refs #5397
Also cached some parameters for speed.
Changeset: 0a04a27d29d69df7eba1a817df20aba8e59b64de
comment:31 Changed 8 years ago by Martyn Gigg
First stab at quantification framework. Refs #5397
Changeset: 0305cbc1c8566785a83891f53d2b7dbba61b61aa
comment:32 Changed 8 years ago by Martyn Gigg
Fleshing out models & tests. Refs #5397
Changeset: 870ef1f1a47c1639c5111655975e18e9822db1d9
comment:33 Changed 8 years ago by Martyn Gigg
Move MCRes to sub-directory. Refs #5397
Changeset: 05d9d493599970dc711a671b40c0edaa9e760bda
comment:34 Changed 8 years ago by Martyn Gigg
Add ParamFunctionAttributeHolder. Refs #5397
Changeset: b8444e1b48e00aabc101b5bd259337d8537b8549
comment:35 Changed 8 years ago by Martyn Gigg
Tidying up attribute handling. Refs #5397
Changeset: b0988682d49f717b99ee988f2bf0985bdd578114
comment:36 Changed 8 years ago by Martyn Gigg
Add moderator class. Refs #5397
Changeset: c3b8b5f9f6ffbb0e3a848d517468477cb430b99b
comment:37 Changed 8 years ago by Martyn Gigg
Add a chopper class. Refs #5397
Changeset: 395e15a93beae2b2f146bb6a07bcba7edcfcf9d0
comment:38 Changed 8 years ago by Martyn Gigg
Add helper methods to run object. Refs #5397
Changeset: 8294bbc4b1d76211217155c5c08a328991d1e381
comment:39 Changed 8 years ago by Martyn Gigg
Access choppers from instrument. Refs #5397
Changeset: 77e18f359ccb596a57928bd427794fece071be50
comment:40 Changed 8 years ago by Martyn Gigg
Allow the function domain to return the workspace. Refs #5397
Changeset: 24e2a1a0accdd2ed37bcc40a475a4c46240c8512
comment:41 Changed 8 years ago by Martyn Gigg
Use ExperimentInfo class in resolution model. Refs #5397
Changeset: 42a8b4ec871863cf5486ac7679b5c6a49676f4c2
comment:42 Changed 8 years ago by Martyn Gigg
Fix tests. Refs #5397
Changeset: 4bba5b88e58bd9b383a6831cf13d325d0f9ade63
comment:43 Changed 8 years ago by Martyn Gigg
Allow efixed to be retrieved from ExperimentInfo. Refs #5397
A single run will have a defined DeltaE mode, this can now be retrieved from a central location much more easily
Changeset: df0883fbb794d17f7ef6fbd8fdf3567bad70a5ec
comment:44 Changed 8 years ago by Martyn Gigg
Add observation class Refs #5397
Defines observables for a particular run & detector, i.e efixed, theta.
Changeset: 82531c7de82d26573e9c5961d40f6278087ceb14
comment:45 Changed 8 years ago by Martyn Gigg
Checkpoint resolution calculation. Refs #5397
Changeset: fa7e47ad323e567daf4885a5963f0e57f852fcaa
comment:46 Changed 8 years ago by Martyn Gigg
Observation class calculates component distances. Refs #5397
Changeset: f298c93edda00d4b69db0e6a245b39fbb21367d5
comment:47 Changed 8 years ago by Martyn Gigg
Access to fit params from foreground & resolution. Refs #5397
Changeset: 08e727d19fe9562b0ccee7805fdf18f417e73131
comment:48 Changed 8 years ago by Martyn Gigg
Add MDResolutionConvolution factory + tests. Refs #5397
Changeset: 5111731e2f95d391d4cafcdeaad7f36659ec3195
comment:49 Changed 8 years ago by Martyn Gigg
Add portion of Monte Carlo loop. Refs #5397
Also cached some parameters for speed.
Changeset: 255a7e218de5dec002591a05a6edccf8b639d1d5
comment:50 Changed 8 years ago by Martyn Gigg
Allow sampling from moderator distribution. Refs #5397
Changeset: befe118193cf0592181a43871fba2fa8db432a2c
comment:51 Changed 8 years ago by Martyn Gigg
Allow sampling from chopper. Refs #5397
Changeset: 486a63fce3f61f4b8b7e667d5de1ad63c2e3f84f
comment:52 Changed 8 years ago by Martyn Gigg
Add horizontal pointing direction to reference frame. Refs #5397
Changeset: 111c053138be311a1387c3dbdc8509e6d9a75b6c
comment:53 Changed 8 years ago by Martyn Gigg
Generate integration vars in MC resolution. Refs #5397
Very basic at the moment but will improve when more tests in place.
Changeset: 53acf64fe94d537318f636e7301c33e41f194f70
comment:54 Changed 8 years ago by Martyn Gigg
Instrument only holds chopper positions. Refs #5397
Changeset: fc6fc18a975a76c6e2b79e5e63ac6727b393cc28
comment:55 Changed 8 years ago by Martyn Gigg
Remove ObjComponent from moderator/chopper hierarchy Refs #5397
Follow the approach of the sample object that is per-run not per instrument
Changeset: ce5f0b77e57379fa08825839e42be8f076c994a2
comment:56 Changed 8 years ago by Martyn Gigg
Add chopper description to experiment info Refs #5397
Changeset: be96460ea5ca24987fad92a0d4ea02e983dbd37d
comment:57 Changed 8 years ago by Martyn Gigg
Add source description to experiment info. Refs #5397
Changeset: 46bda599e25eebdf502dddabcfb69802388514d5
comment:58 Changed 8 years ago by Martyn Gigg
Add a BoseEinsteinDistribution class. Refs #5397
Changeset: 7ed5a880a302945ff164b02aa25070d121d784cb
comment:59 Changed 8 years ago by Martyn Gigg
Add a BoseEinsteinDistribution class. Refs #5397
Changeset: 7ed5a880a302945ff164b02aa25070d121d784cb
comment:60 Changed 8 years ago by Martyn Gigg
Implement backbone of VATES quantification framework. Refs #5397
Includes basis for creating a simulation workspace, the fitting function itself and the TobyFit resolution model.
Changeset: cca31197e3f4da4f0b5afea292c54bad4ee0aac8
comment:61 Changed 8 years ago by Martyn Gigg
Remove unused header. Refs #5397
Changeset: 35f75b5f22d9bab0510188ba736878a7b085b051
comment:62 Changed 8 years ago by Martyn Gigg
Fix using declaration on windows. Refs #5397
Changeset: d41c2ec8621475eb75931d1b5519a64fe745fa0e
comment:63 Changed 8 years ago by Martyn Gigg
Small fixes to help build. Refs #5397
Changeset: 58844787b56871826c45461d9464fd49bea45f00
comment:64 Changed 8 years ago by Martyn Gigg
Fix windows export declarations. Refs #5397.
Changeset: 8164e11656f9ac99b2867a830efe6db34ffdde7f
comment:65 Changed 8 years ago by Martyn Gigg
Fix more export declarations. .Refs #5397
Changeset: 2eb33275ef1916a29d14faf6e2ca6e9e5f0c9088
comment:66 Changed 8 years ago by Martyn Gigg
Diagnose tests on windows Refs #5397
Changeset: 95047b830d5c14c1921954ee294714ac277586f0
comment:67 Changed 8 years ago by Martyn Gigg
Implement backbone of VATES quantification framework. Refs #5397
Includes basis for creating a simulation workspace, the fitting function itself and the TobyFit resolution model.
Changeset: cca31197e3f4da4f0b5afea292c54bad4ee0aac8
comment:68 Changed 8 years ago by Martyn Gigg
Remove unused header. Refs #5397
Changeset: 35f75b5f22d9bab0510188ba736878a7b085b051
comment:69 Changed 8 years ago by Martyn Gigg
Fix using declaration on windows. Refs #5397
Changeset: d41c2ec8621475eb75931d1b5519a64fe745fa0e
comment:70 Changed 8 years ago by Martyn Gigg
Small fixes to help build. Refs #5397
Changeset: 58844787b56871826c45461d9464fd49bea45f00
comment:71 Changed 8 years ago by Martyn Gigg
Fix windows export declarations. Refs #5397.
Changeset: 8164e11656f9ac99b2867a830efe6db34ffdde7f
comment:72 Changed 8 years ago by Martyn Gigg
Fix more export declarations. .Refs #5397
Changeset: 2eb33275ef1916a29d14faf6e2ca6e9e5f0c9088
comment:73 Changed 8 years ago by Martyn Gigg
Diagnose tests on windows Refs #5397
Changeset: 95047b830d5c14c1921954ee294714ac277586f0
comment:74 Changed 8 years ago by Martyn Gigg
Fix factory export declarations. Refs #5397.
Changeset: 91e84bffbba7f360f7b9dfced0238833607c8cce
comment:75 Changed 8 years ago by Martyn Gigg
Cache the observations before the simulation/fit starts. Refs #5397
Changeset: cbb706c030ec57e0caaff1437e8a44f5e923b1ab
comment:76 Changed 8 years ago by Martyn Gigg
Do matrix qlab->qhkl by hand to avoid matrix cost. Refs #5397
Changeset: 7f7bf85f15ab1a277af91e3ad959804b33badfa3
comment:77 Changed 8 years ago by Martyn Gigg
More manual matrix multiplication. Refs #5397
Improves speed significantly by avoiding repeated memory allocations on the heap.
Changeset: 19ba227f458a95bde57d4e784b16014a1b35b149
comment:78 Changed 8 years ago by Martyn Gigg
Store histogram bins as separate field for performance. Refs #5397
Each call to this was creating a copy when it was pulled from the PropertyWithValue and it was just too slow.
Changeset: fed9f6f8f117ff862b8e2afe0df7008eb2240a16
comment:79 Changed 8 years ago by Martyn Gigg
Fix stupid error trying to save empty array. Refs #5397
Changeset: b00a43d3bec84422ebbaaaf9ea345d97da75e81f
comment:80 Changed 8 years ago by Martyn Gigg
Add OrientedLattice to tests. Refs #5397
Changeset: 5a175fb5cba31ae5728807432aafd68601b6f96a
comment:81 Changed 8 years ago by Martyn Gigg
Implement parallelization over events in box. Refs #5397
Changeset: 7010f2f599bd8a94a5468584e53b41dfaa203e79
comment:82 Changed 8 years ago by Martyn Gigg
Fix OpenMP loop variable. Refs #5397
Changeset: 7c292b4a20a7e6b135d392762189107c71b8af85
comment:83 Changed 8 years ago by Martyn Gigg
More descriptive name for observation class. Refs #5397
Changeset: ee812b4657cd627bdfa71ede5bac972d1d63f2f4
comment:84 Changed 8 years ago by Martyn Gigg
Improve efficiency in handling goniometer. Refs #5397
Added reference returns for goniometer & its axes plus moved where the computation of the matrix occurs.
Changeset: 1c81861a6dce5ae7901423243e2723fa665f746c
comment:85 Changed 8 years ago by Martyn Gigg
Fix function call & warning. Refs #5397
Changeset: 05a9755952de32104164f22a125daa1c476309f9
comment:86 Changed 8 years ago by Martyn Gigg
Fix getGoniometer call. Refs #5397
Changeset: 624e331eb93fb0da8988d1a66073dec46772a77c
comment:87 Changed 8 years ago by Martyn Gigg
Add notification of function eval to MD convolution. Refs #5397
Changeset: a8b1dc25307147fc3502ea23698788947a7819c7
comment:88 Changed 8 years ago by Martyn Gigg
Simulate appends if worksapce exists. Refs #5397
Changeset: 72814c4697bbb7c25fffe33f5e7ff209e0aee770
comment:90 Changed 8 years ago by Martyn Gigg
- Status changed from accepted to verify
- Resolution set to fixed
comment:91 Changed 8 years ago by Martyn Gigg
Correct MERLIN aperture shape XML. Refs #5397
Changeset: 2fe6f77a69ca9485225495857a6404e79110dea5
comment:92 Changed 8 years ago by Martyn Gigg
Sample test script is attached. The MERLIN file is in the System test data directory
comment:93 Changed 8 years ago by Stuart Campbell
- Status changed from verify to verifying
- Tester set to Stuart Campbell
comment:94 Changed 8 years ago by Stuart Campbell
- Status changed from verifying to verify
- Tester Stuart Campbell deleted
comment:95 Changed 8 years ago by Owen Arnold
- Status changed from verify to verifying
- Tester set to Owen Arnold
comment:96 Changed 8 years ago by Owen Arnold
I can only test this in that it runs end-to-end, which I've already done once for the progress updating ticket validation. The outputs are going to have to be numerically verified by Toby Perring, who has agreed to take a close interest in this for the next iteration.
comment:97 Changed 8 years ago by Owen Arnold
- Status changed from verifying to closed
This script has run end-to-end again on my 8 core windows 7 x64 machine. SimulateResolutionConvolvedModel took 517.45 seconds. I actually had 4-cores locked up for a VM at the time of running.
comment:98 Changed 8 years ago by Martyn Gigg
Fix factory export declarations. Refs #5397.
Changeset: 91e84bffbba7f360f7b9dfced0238833607c8cce
comment:99 Changed 8 years ago by Martyn Gigg
Cache the observations before the simulation/fit starts. Refs #5397
Changeset: cbb706c030ec57e0caaff1437e8a44f5e923b1ab
comment:100 Changed 8 years ago by Martyn Gigg
Do matrix qlab->qhkl by hand to avoid matrix cost. Refs #5397
Changeset: 7f7bf85f15ab1a277af91e3ad959804b33badfa3
comment:101 Changed 8 years ago by Martyn Gigg
More manual matrix multiplication. Refs #5397
Improves speed significantly by avoiding repeated memory allocations on the heap.
Changeset: 19ba227f458a95bde57d4e784b16014a1b35b149
comment:102 Changed 8 years ago by Martyn Gigg
Store histogram bins as separate field for performance. Refs #5397
Each call to this was creating a copy when it was pulled from the PropertyWithValue and it was just too slow.
Changeset: fed9f6f8f117ff862b8e2afe0df7008eb2240a16
comment:103 Changed 8 years ago by Martyn Gigg
Fix stupid error trying to save empty array. Refs #5397
Changeset: b00a43d3bec84422ebbaaaf9ea345d97da75e81f
comment:104 Changed 8 years ago by Martyn Gigg
Add OrientedLattice to tests. Refs #5397
Changeset: 5a175fb5cba31ae5728807432aafd68601b6f96a
comment:105 Changed 8 years ago by Martyn Gigg
Implement parallelization over events in box. Refs #5397
Changeset: 7010f2f599bd8a94a5468584e53b41dfaa203e79
comment:106 Changed 8 years ago by Martyn Gigg
Fix OpenMP loop variable. Refs #5397
Changeset: 7c292b4a20a7e6b135d392762189107c71b8af85
comment:107 Changed 8 years ago by Martyn Gigg
More descriptive name for observation class. Refs #5397
Changeset: ee812b4657cd627bdfa71ede5bac972d1d63f2f4
comment:108 Changed 8 years ago by Martyn Gigg
Improve efficiency in handling goniometer. Refs #5397
Added reference returns for goniometer & its axes plus moved where the computation of the matrix occurs.
Changeset: 1c81861a6dce5ae7901423243e2723fa665f746c
comment:109 Changed 8 years ago by Martyn Gigg
Fix function call & warning. Refs #5397
Changeset: 05a9755952de32104164f22a125daa1c476309f9
comment:110 Changed 8 years ago by Martyn Gigg
Fix getGoniometer call. Refs #5397
Changeset: 624e331eb93fb0da8988d1a66073dec46772a77c
comment:111 Changed 8 years ago by Martyn Gigg
Add notification of function eval to MD convolution. Refs #5397
Changeset: a8b1dc25307147fc3502ea23698788947a7819c7
comment:112 Changed 8 years ago by Martyn Gigg
Simulate appends if worksapce exists. Refs #5397
Changeset: 72814c4697bbb7c25fffe33f5e7ff209e0aee770
comment:113 Changed 8 years ago by Martyn Gigg
Correct MERLIN aperture shape XML. Refs #5397
Changeset: 2fe6f77a69ca9485225495857a6404e79110dea5
comment:114 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 6243
First stab at quantification framework. Refs #5397