LOQ: Integration Algorithm

[Nick Draper]

Create an integration algorithm for the LOQ framework,

This should produce a single count number for each detector.

The result will need to be outputted into a text file, I suggest a simple tab separated text format.

Detector No \t Counts

Talk to Dickon to ensure that your algorithms are comparable.

[Nick Draper]

(In [6]) Adding LOQ pilot code refs #7

[Stuart Ansell]

(In [13]) refs #7

This check in is part of the MCPing merge into the LoqCode base. This is the top level merge (Methods outside of the enclose MonteCarlo namespaces). Namespaces MonteCarlo, Geometry, and Detector are to follow.

In this case specifically files mathSupport, support, Matrix have been changed. However, this has a number of effects since mathSupport now requires std::complex and hence include <complex> in appropiate headers. The B merge (new files / namespace scope) will be done later.

New unit tests have been added in testMathSupport and testSupport.

Methods that have changed calling form:

StrFunc::setValues

TimeData has been removed: It is being replaced by XMLgridSupport. TimeData's functionallity is being taken over by the template methods in XMLgridSupport. No change to existing usage code is expected.

Check.cxx has been removed since it is a test code that (a) doesn't work (b) doesn't have anything to do with this project.

[Stuart Ansell]

(In [14]) refs #7

First inclusion of XMLgridSupport: Part of the XML namespace. Allows {multi}-vector data groups to be merged into a single table. Replaces highly specialised implementaion from TimeData.

[Stuart Ansell]

(In [26]) refs #7 refs #7

This check-in has ten areas of modification listed below. None are particularly significant relative to the utilization of the code (except the bug). It is not expected to break any onward build.

(a) Better XML input method

AreaWorkSpace.cxx

(b) Addition of proto-labels within equations

Code.cxx

(c) Addition of determine a CmdDescriptor (without actually creating

a command) [useful for parsing the string commands]

CommandFactory.cxx

(d) Minor language modernization and TR1 compliance issues:

Algorithm.cxx

(e) Extension to MapSupport to improve STL isomorphism (addition

of MapSwap) and then used in tokenParser.

MapSupport.h/cxx [fixed #define inconsistency inMapSupport_h]

(f) Commands now can be have results associated with them.

The results object is lazy copied and is controlled by the flag resultSet.

CommandObj.cxx

(g) Bug fix parsing multi-component functions at depth > 2

e.g. min(atan(2.3),4.5)

FuncDataBase.cxx

(h) Improvements and extension of test code:

testBoost.cxx testFunction.cxx testMapSupport.cxx

(i) Addition of include files to facility improvement to

Function Interpreter [ funcList.h contains CmdDefinition ]

funcList.cxx CommandMaker.cxx getSpectra.cxx getWorkSpace.cxx loqRead.cxx Interpreter.cxx MasterControl.cxx cmdHelp.cxx testCommandFactory.cxx testCommandObj.cxx

(j) documentation changes :

testXML.cxx testUnitSupport.cxx

[Stuart Ansell]

(In [27]) refs #7

This file needs to be added for the build to work, but

currently is a placeholder

[Stuart Ansell]

(In [28]) refs #7

tokenParser (complete) + tests.

[Stuart Campbell]

This ticket has been transferred to github issue ​855