Closed suhlatwork closed 9 years ago
Small update:
calcAmplitude
, the default arguments are defined when adding this function to the Boost Python interface.pwaFit
classes, with the final interface Boost can figure this out automaticallyCovarianceMatrix
methods of pwaLikelihood
callable, previously always the one taking a TMatrixT was chosen.The new commit largely equivalent to the current master is 1d1e964084dc9368830084ba7d142da0e102809a.
This pull request is supposed to replace #86. It is based on the changes of this pull request including commit 26e34ae1428d00dc559569474e8f2fa72143fb4c.
Compared to this the following changes have been done:
TTree
pointer of anamplitudeMetadata
object (similar toeventMetadata
)amplitudeMetadata
objects in a couple of places instead of pointers toTTree
and wave names:ampIntegralMatrix::integrate
pwaLikelihood::addAmplitude
legacyScripts
directories to the top level directorylegacy
, the idea would be to have stuff that still compiles directly in this directory, and stuff that does no longer compile in the same structure as in the current main directory, but belowlegacy/
calcAmplitudes
,calcIntegrals
, and the twopwafit
s using the new file formats and facilities (except the file manager (obviously)), this should ease the migration a bit in case where some parts in the file manager are still missinggetReflectivity
to work with old and new key file naming convention, as this is still required in thefitResult
pwaLikelihood::init
now requires a vector of tuples of wave name, wave description and threshold (instead of two separate vectors), the wave name has been added, it is required if the name of the on-file object does not correspond to the name constructed from the decay topology (this seems to be the simplest way to keep the possibility of having the same waves with different isobar parametrization (though I did not try this till the end))_decayAmps
was resized for each new amplitudecalcAmplitudes
allow to limit the bins forcalcIntegrals
calcIntegrals
Quite a number of smaller bugfixes and cosmetics:
amplitude
andintegral
(names for ROOT objects) and replace by the static variables of the according meta data classClassDef
version ofeventMetadata
I basically reshuffled all the commits, most commits should compile (again), 1504fca4be3e53d94f8060847fc1cd7c73029848 is the last commit largely equivalent to the current master.
I tested this branch on a single bin of my data obtaining the same result as with the current master, I do not know how to test this more properly (in any case some of the test scripts were broken?). This is a comparison of the memory usage:
* during writing up to 350 MB
So
calcIntegrals
still needs to be improved, but that was already the case with ROOT amplitudes previously. A couple of issues raised in #86 are still open, but they can also be attacked later.