Ticket #8546 (closed: fixed)
Enable LoadParameterFile to take an XML string instead of parameter file
| Reported by: | Karl Palmen | Owned by: | Karl Palmen |
|---|---|---|---|
| Priority: | major | Milestone: | Release 3.1 |
| Component: | Framework | Keywords: | |
| Cc: | anders.markvardsen@… | Blocked By: | |
| Blocking: | #8398 | Tester: | Anders Markvardsen |
Description
Add a 3rd property to enable LoadParameterFile to receive the contents of the parameter file as a string instead of reading from file. Either this 3ed property or the file property must be set. Unit test needs to be extended to test this.
This 3rd property would be of use when LoadParameterFile is run as a child algorithm, because it would save one from having to write the XML into a file. This is needed for ticket #8398
Change History
comment:4 Changed 7 years ago by Karl Palmen
LoadInstrument has an InstrumentXML property, which is the IDF in the form of a string.
comment:5 Changed 7 years ago by Karl Palmen
Add non-active parameterXML property re #8546
I also drilled it down into the execManually method changing its arguments.
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: a6a122b3bd26258b10655974b8dfad94a08279a8
comment:6 Changed 7 years ago by Martyn Gigg
- Cc anders.markvardsen@… added; Emailanders.markvardsen@… removed
There are a couple of compiler warnings that need addressing: http://download.mantidproject.org/jenkins/view/Develop%20Clean%20Builds%20and%20Tests/job/is_clean_rhel6_develop/292/warnings20Result/package.1169530989/
comment:7 Changed 7 years ago by Karl Palmen
Use AutoPtr in LoadParameterFile.cpp re #8546
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: 94586525f2323cff119ce4efcb8f76a03dc14445
comment:8 Changed 7 years ago by Karl Palmen
Extend parameterXML code (still inactive) re #8546
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: 86a24a86f8cabf34c3627daf56017a6210e72451
comment:9 Changed 7 years ago by Karl Palmen
Activate new code and remove unneeded AutoPtr re #8546
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: 4a96bab3ca8dfb21b515c65ae038eea91dba8b4f
comment:10 Changed 7 years ago by Karl Palmen
Check file and string property re #8546
At least one of these two properties must be set.
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: 7fc14c6e7b5db84f696921867a305a667fdd597c
comment:11 Changed 7 years ago by Karl Palmen
Add unit test to test new property re #8546
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: 254d7579796c2120456b3c06917906f615ca2f64
comment:12 Changed 7 years ago by Karl Palmen
Add test for absence of file or string re #8546
Also correct the error message.
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: f496828dd5bc5792f416635394ba42388b3e6557
comment:13 Changed 7 years ago by Karl Palmen
Add reference to ticket #8521 in comment re #8546
Signed-off-by: Karl Palmen <karl.palmen@…>
Changeset: c21d90af98edf77c86f502212e13563edee3ee0b
comment:14 Changed 7 years ago by Karl Palmen
- Status changed from inprogress to verify
- Resolution set to fixed
To test I suggest you use a short parameter file to load. Run loadParameterFile with this file and again with the contents of the file as a parameterXML string. Check that the parameters are modified the same way for both tests.
comment:15 Changed 7 years ago by Anders Markvardsen
- Status changed from verify to verifying
- Tester set to Anders Markvardsen
comment:16 Changed 7 years ago by Anders Markvardsen
- Status changed from verifying to closed
Merge remote-tracking branch 'origin/feature/8546_load_parameter_file_string'
Full changeset: 15c7c796514d0f89f1e84a2e9f921b6d2f9e2aeb
comment:17 Changed 7 years ago by Anders Markvardsen
Tested this with HRPD.
Note unrelated to this ticket came accross this defect #8608
comment:18 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 9390
