Menu
▾
▴
[Rootpwa-git-push] [ROOTPWA-Maintainers/ROOTPWA] 5b743d: Add .gitlab-ci.yml
|
From: stefan-wallner <no...@gi...> - 2020-03-17 09:41:40
|
Branch: refs/heads/stable Home: https://github.com/ROOTPWA-Maintainers/ROOTPWA Commit: 5b743d2cdcd727d66543fefb4d2da7bd8c3adc61 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/5b743d2cdcd727d66543fefb4d2da7bd8c3adc61 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: A .gitlab-ci.yml Log Message: ----------- Add .gitlab-ci.yml Commit: 8e919996063443666dba83c90fa1b50e3b656575 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/8e919996063443666dba83c90fa1b50e3b656575 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- Make tests run in parallel Commit: aa7821cf65fc6cf74a031b1915217335a2b6bafb https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/aa7821cf65fc6cf74a031b1915217335a2b6bafb Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- .gitlab-ci.yml: Use python 2.7.13 version from SCL Commit: f69512573fe80e603f04d9c3b7315803315e3880 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f69512573fe80e603f04d9c3b7315803315e3880 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- gitlab-ci: Add limitation for number of threads Commit: a4c8b9184a9e44dcabd0b02a474b9186483317aa https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a4c8b9184a9e44dcabd0b02a474b9186483317aa Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- gitlab-ci: Add pylint log to artifacts Commit: 657a5b03a35b927beb07435190edfdaacaa5e02b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/657a5b03a35b927beb07435190edfdaacaa5e02b Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- gitlab-runner: Always upload testing artifacts Commit: 9fc4e55f00bdb4d76b877bc426a1d9479aa7fe4a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9fc4e55f00bdb4d76b877bc426a1d9479aa7fe4a Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- Update .gitlab-ci.yml Commit: da3caf86cfcbc96157ded9d3a0948a275597436a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/da3caf86cfcbc96157ded9d3a0948a275597436a Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- Update .gitlab-ci.yml Commit: 7ec54b90c9cd326eec2680c34b793c7c266692fb https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7ec54b90c9cd326eec2680c34b793c7c266692fb Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- Update .gitlab-ci.yml Commit: fa83ec892f4fdbb275f8e162fc77ef6707b5ae7c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/fa83ec892f4fdbb275f8e162fc77ef6707b5ae7c Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M partialWaveFit/fitResult.cc M partialWaveFit/fitResult.h M pyInterface/bindings/partialWaveFit/fitResult_py.cc M pyInterface/module/utils/_fitTreeUtils.py Log Message: ----------- partialWaveFit: Implement `quiet` option for `getFitResultsFromFiles` Commit: a0bdd9eee7ae131b6345efcfc8bc9add6107bc2d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a0bdd9eee7ae131b6345efcfc8bc9add6107bc2d Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/CMakeLists.txt A pyInterface/scripts/mergeFitResults.py Log Message: ----------- pyInterface: Implement `mergeFitResults` script Commit: 7bf04b8dec7799264f147979c61371df68d49c2a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7bf04b8dec7799264f147979c61371df68d49c2a Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M partialWaveFit/fitResult.cc M partialWaveFit/fitResult.h M pyInterface/bindings/partialWaveFit/fitResult_py.cc Log Message: ----------- partialWaveFit: Implement `clearNames` for fit results Ugly hack to remove amplitude and wave names from a fit result. Useful if you have many further fit attempts. Commit: 6fd1f6a7cdd31267223479e743a0fbed7515f84f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/6fd1f6a7cdd31267223479e743a0fbed7515f84f Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M particleData/particleDataTable2016.txt Log Message: ----------- particleData: Add K0*(1950) It is not in the summary tables. Commit: ea33211dbd50ed1a78b5bd53a22ddddfbb4a4d05 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/ea33211dbd50ed1a78b5bd53a22ddddfbb4a4d05 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/scripts/plotAngles.py Log Message: ----------- pyInterface: Update of plotAngles Implement the possibility to pass an integralMultibinID to the script. Events of the input file will only be taken into account if they lie within the intebralMultibin. Additionally, the old loop over bins was removed as it was obsolete. Additionally, the output file is not overwritten if it exists, but the uses will be asked whether the file should be overwritten. Commit: e35456a1087415d4f3de38d70746413d9cf02e14 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e35456a1087415d4f3de38d70746413d9cf02e14 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/scripts/plotAngles.py Log Message: ----------- pyInterface: Implement multiple input files for plotAngles Implement the possibility to have multiple input files for the plotAngles script. Also handling of multiple weight files is possible. If no integral multibin is specified, the binning range of the first file is used also for all other files. Commit: 74a9d78e9b28fe90604299bc82f777465175c50b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/74a9d78e9b28fe90604299bc82f777465175c50b Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M CMakeLists.txt A plotting/CMakeLists.txt A plotting/linkdef.h A plotting/plotcollection.cc A plotting/plotcollection.h A plotting/test.cc M pyInterface/CMakeLists.txt M pyInterface/bindings/CMakeLists.txt A pyInterface/bindings/plotting/plotcollection_py.cc A pyInterface/bindings/plotting/plotcollection_py.h M pyInterface/bindings/pyUtils/rootConverters_py.cc M pyInterface/bindings/rootPwaPy.cc M pyInterface/module/__init__.py A pyInterface/module/_plotting.py A pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- plotting: start Further work Further work Implement histstack (not jet completed) Using TMultiGraph and removed possibility of multiple solutions in one plots Further work ... Furter work additional plots, loading, ... multibin-summed spectra Minor fixes Plotting Code beautification Possibility to merge different Solutions into one multibinPlot object A few details Commit: b416ba362e12f5933c99867f8e27be7e416aae15 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/b416ba362e12f5933c99867f8e27be7e416aae15 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/bindings/pyUtils/rootConverters_py.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Implement setIntensitySpectra for multibinPlots Implement setIntensitySpectra and setLabel/Description in order to fill a multibinPlots object also manually. Additionally, extend the python interface for plotting. Commit: 146b647e22625b5568d6825813bbd07a0d1bc74c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/146b647e22625b5568d6825813bbd07a0d1bc74c Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/module/_plotting.py Log Message: ----------- pyInterface: Fix missing return True for write function Plotcollection's write function was not returning True if writing was successful. Commit: e2bb2e43735bd61be4c31c070badec7635991bb0 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e2bb2e43735bd61be4c31c070badec7635991bb0 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h Log Message: ----------- plotting: Use only (nRefWaves=16) reference waves for default plots Use only (nRefWaves=16) reference waves when generating the rel. phases in the buildDefaultPlots function. Commit: 8d3ff9cd6b72d9a216c6a6a3179cfdaa2bcb6f09 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/8d3ff9cd6b72d9a216c6a6a3179cfdaa2bcb6f09 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Add likelihood spectrum to plot collection Add a plot showing the likelihood spectrum as a function of the mass to the plot pollection for each multibin Commit: c72da2c9cf31a3d69ca794cb175dcd886692c76b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c72da2c9cf31a3d69ca794cb175dcd886692c76b Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc Log Message: ----------- plotting: Fix bug for empty graphs in rpwa::componentPlot::merge When the componentPlot merged into this one had no graphs, a segmentation violation was raised because of a null pointer. Commit: a97bf9da663db03e817aac71912b37629191e9e0 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a97bf9da663db03e817aac71912b37629191e9e0 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc Log Message: ----------- plotting: Improved some warning message Commit: 2baa67e7aa25985bee67dbda779a39a3fea452a3 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/2baa67e7aa25985bee67dbda779a39a3fea452a3 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Make plot labels only hex numbers Previously, also _ - and other characters were allowed. Commit: 39c44b15d4993f6e88a2f2ae885df968b633ba8c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/39c44b15d4993f6e88a2f2ae885df968b633ba8c Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Add functions to access likelihood distribution Commit: 98f98e5729270cba34896652856ac9c550f22920 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/98f98e5729270cba34896652856ac9c550f22920 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M partialWaveFit/fitResult.cc M partialWaveFit/fitResult.h Log Message: ----------- partialWaveFit: Improve performance if `intensity`, `spinDensityMatrixElem` Improve the performance of the `intensity` by directly using the amplitudes and not the spin-density matrix elements. This reduced the matching of wave names and amplitude names, which is very expensive, especially for spin-total intensity calculation. Improve the performance of `spinDensityMatrixElem` for the diagonal elements by building the amplitude-index vector only once, which is very expensive. Commit: c2d030357fcd010ffe07e2eb0363d84d70c598f1 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c2d030357fcd010ffe07e2eb0363d84d70c598f1 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/module/_plotting.py M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- plotting: Implement parallelization of `genPlotcollectionFromResults` and additional changes Some interface improvements. Some optimizations of intensity calculation. Less default phase references 16->4. Commit: e1dadac0c7b757e9d87e9f91840792ce1cf2e43a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e1dadac0c7b757e9d87e9f91840792ce1cf2e43a Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.h M pyInterface/module/_plotting.py Log Message: ----------- pyInterface/plotting: Implement `loadFromFile` and option to load only the best fit result Implement `loadFromFile` for the `plotcollection` class and an option to load only the best fit result in each bin. Commit: dd3343a40e3f872c1e1a2a3c734637ac7d25163e https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/dd3343a40e3f872c1e1a2a3c734637ac7d25163e Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- pyInterface: Allow to give folders with fit results to `genPlotcollectionFromResults` All .root files in the given folders will be used as input. Commit: 89a8a29339f2f9922d287b53d2beb6bc4d24ac05 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/89a8a29339f2f9922d287b53d2beb6bc4d24ac05 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/module/_plotting.py Log Message: ----------- plotting: Pass onlyBest option also to multibin loading So far, the `onlyBest` option to load only the best fit results of the `load` function of a `PlotCollection` was not passed to the loading function of a `MultibinPlots` object. Commit: f08c925b4d8d4fb69f624b062d86832651806e08 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f08c925b4d8d4fb69f624b062d86832651806e08 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h Log Message: ----------- plotting: Add incoherentVsCoherentSum Commit: 322e092b82f962b3d17c3fae734e9a79cd845db8 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/322e092b82f962b3d17c3fae734e9a79cd845db8 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Make `getAdditionalPlot` return a componentPlot Commit: c2cd8126021c07e1f9cf44584b73691cfd50e380 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c2cd8126021c07e1f9cf44584b73691cfd50e380 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Improve memory consumption when building multibinplots Commit: 7390720950e37a9f7cd46c7ceab9f5150f716acd https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7390720950e37a9f7cd46c7ceab9f5150f716acd Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h Log Message: ----------- plotting: Add information about number of performed / converged / same-as-best fit results Commit: be8e7c74a868ad12daf967bd36ede92ef1b877cd https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/be8e7c74a868ad12daf967bd36ede92ef1b877cd Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Fix bug from last commit Commit: e9c47b4bfe0554705dae665fd3a4fca6025f99f3 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e9c47b4bfe0554705dae665fd3a4fca6025f99f3 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/module/_plotting.py M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- fitResult: Implement clearing of amp/wave names Ugly hack to build plot collections with really many results Commit: 1b77a74272cd981089bc20f626fa3a2577e7d177 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/1b77a74272cd981089bc20f626fa3a2577e7d177 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h Log Message: ----------- plotting: Reduce the amount of default plots generated Commit: eeb5d0723d981bbf6c22492d868ba54d7bf8487f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/eeb5d0723d981bbf6c22492d868ba54d7bf8487f Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M plotting/plotcollection.cc Log Message: ----------- plotting: If no hessian is stored is now a warning not an error Commit: 89e2163ebc0e73774d66c402efb9dddb82e81050 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/89e2163ebc0e73774d66c402efb9dddb82e81050 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M generators/generatorManager.h M pyInterface/bindings/generators/generatorManager_py.cc Log Message: ----------- generators: Add getBeam function for C++ class and Python interface This allows as to get the beam, the beam particle and all beam particle properties, e.g. mass. Commit: f7f8718d14a79c028765a92a930a246e247242d3 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f7f8718d14a79c028765a92a930a246e247242d3 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/module/utils/_binning.py Log Message: ----------- pyInterface: Make the behaviour of `multiBin.inBin` more consistent Now, the multibin is considered as infinity in a variable that is not defined in the multibin. Previously, the `binningInfo` must have had the very same variables as the multibin. Commit: bd890dc39c547a9d25c83d3ba970971e4c2bfec7 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/bd890dc39c547a9d25c83d3ba970971e4c2bfec7 Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M test/testMC.sh Log Message: ----------- testMC: Setup paths to ensure that the correct version of ROOTPWA is used Commit: 9da37f1fe65b3cba570b90b17b20cf1c478fb29b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9da37f1fe65b3cba570b90b17b20cf1c478fb29b Author: Sebastian Uhl <su...@ce...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M partialWaveFit/fitResult.h Log Message: ----------- partialWaveFit: calculate weights in 'fitResult' Add a new method 'spinDensityMatrixTimesAmplitudeMatrix' to the 'fitResult' class. This method calculates the product of the spin-density matrix for a range of waves with an amplitude matrix. If the amplitude matrix is, e.g., the normalisation integral, the method can be used to calculate the intensity of a number of waves. By also providing the 'amplitudeMatrixAdapter' class, which calculates the used matrix elements from a vector of amplitudes, this new method can also be used to calculate the weight for an event or for a particular subset of waves in an event. The 'spinDensityMatrixTimesAmplitudeMatrix' method has been crosschecked against the 'intensity' method and the 'weightEvents' executable. Commit: fce0d9e06f95d896b75d4e76b0946a7e5a718756 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/fce0d9e06f95d896b75d4e76b0946a7e5a718756 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M partialWaveFit/fitResult.h M pyInterface/bindings/partialWaveFit/fitResult_py.cc Log Message: ----------- partialWaveFit: calculate weights in dedicated function Implement function 'spinDensityMatrixTimesAmplitudeMatrix', which takes two matrices and an index list as arguments and calculates the weights from them. Additionally, this function is used by the fitResult member function 'spinDensityMatrixTimesAmplitudeMatrix'. Commit: 416f45ec243bfed93a354c7f08c0e7ef9528beba https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/416f45ec243bfed93a354c7f08c0e7ef9528beba Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/CMakeLists.txt A pyInterface/scripts/calcEventWeights.py Log Message: ----------- pyInterface: Implement calcEventWeights Implement the calcEventWeights script to calculate weights for MC events from the precalculated amplitudes based on a given fit result. The weights are calculated for a given integral multibin. Commit: 4785818608f3e45b83acf73b5dd300dd488d2a3d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/4785818608f3e45b83acf73b5dd300dd488d2a3d Author: Stefan Wallner <st...@po...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/scripts/calcEventWeights.py Log Message: ----------- pyInterface: Only open new amplitude file if necessary in `calcEventWeights` Avoid opening the same amplitude file with multiple amplitudes more the once. Commit: 3b8673b5085ae1243502c1b816075fc7ef704ef6 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/3b8673b5085ae1243502c1b816075fc7ef704ef6 Author: Stefan Wallner <st...@nu...> Date: 2019-04-04 (Thu, 04 Apr 2019) Changed paths: M pyInterface/scripts/calcEventWeights.py Log Message: ----------- pyInterface: Load only needed amplitudes in calcEventWeights Do not load amplitudes where the corresponding transition amplitude is 0.0, i.e. waves which were fixed to 0.0 during the fit. Implement the calcEventWeights script to calculate weights for MC events from the precalculated amplitudes based on a given fit result. The weights are calculated for a given integral multibin. Additionally, ignore pylint error (E1111(assignment-from-no-return) in `calcEventWeights` as this gives an false-positive here. Commit: f8810e7388e772985404add09f6f25e1bb427240 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f8810e7388e772985404add09f6f25e1bb427240 Author: Stefan Wallner <st...@po...> Date: 2019-04-05 (Fri, 05 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- gitlab-ci: Make `make test` verbose on failure Commit: 6a7e560803edf9e2b1fb660c8449ecb33e7b2998 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/6a7e560803edf9e2b1fb660c8449ecb33e7b2998 Author: Stefan Wallner <st...@po...> Date: 2019-04-05 (Fri, 05 Apr 2019) Changed paths: M pyInterface/scripts/calcEventWeights.py Log Message: ----------- pyInterface: Prepare calcEventWeights for multiple data sets (WIP) Commit: cef2cc6dae16560225df6ba2735ef4f00276e125 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/cef2cc6dae16560225df6ba2735ef4f00276e125 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_fileManager.py M pyInterface/scripts/createFileManager.py M test/testMC.sh Log Message: ----------- pyInterface: Implement `openAmplitudeFiles` for the `fileManager` initialization Reads each file in the amplitudes directory and searches for already calculated amplitudes. Considers merged amplitude files. Commit: 2622c695969ddc08b892f48e9dffc78ea5965f3a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/2622c695969ddc08b892f48e9dffc78ea5965f3a Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_amplitude.py Log Message: ----------- pyInterface: Store empty amplitude tree for event files without events It can happen that event files do not have events, because there are no events in the corresponding bin. So far, `calcAmplitudes` did neither store an empty amplitude tree nor an `amplitudeMetadata` object in the corresponding amplitude file. Now, an empty amplitude tree and the corresponding `amplitudeMetadata` object is stored. Commit: c444347a81befbcc93656734163da6c7ca2df171 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c444347a81befbcc93656734163da6c7ca2df171 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_amplitude.py M pyInterface/scripts/calcAmplitudes.py Log Message: ----------- pyInterface: Add `output` option to calcAmplitudes to give a output file name This is useful when storing the amplitudes of multiple waves in the same amplitude file. Commit: 860c2b0a9709a82a3382ba87a27cb5ef1c3f842c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/860c2b0a9709a82a3382ba87a27cb5ef1c3f842c Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- gitlab-ci: Disable cache after using ccache Commit: 252c7c203e6380155de1326f717362e9ad3bec10 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/252c7c203e6380155de1326f717362e9ad3bec10 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M .gitlab-ci.yml Log Message: ----------- Revert "gitlab-ci: Disable cache after using ccache" This reverts commit 860c2b0a9709a82a3382ba87a27cb5ef1c3f842c. Commit: c2b4fbdd763702aabc99e623cef30a7312d0ec5f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c2b4fbdd763702aabc99e623cef30a7312d0ec5f Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_fileManager.py Log Message: ----------- pyInterface: implement `waveNameList` parameter for `getEventAndAmplitudeFilePathsInBin` This parameter allows to specify for which waves the amplitude should be returned. Commit: 9b7c26f8b8166882d342ccd61db7436ab3a236a0 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9b7c26f8b8166882d342ccd61db7436ab3a236a0 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc M decayAmplitude/ampIntegralMatrix.h M pyInterface/bindings/decayAmplitude/ampIntegralMatrix_py.cc Log Message: ----------- decayAmplitude: Implement `subMatrix` for `ampIntegralMatrix` Implement the possibility to project out a sub-matrix from an amplitude integral-matrix using a list of waves or wave indices. Commit: 9c39af6cf74c69f2a1c80caaf3e8dea0beafe43f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9c39af6cf74c69f2a1c80caaf3e8dea0beafe43f Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/bindings/decayAmplitude/ampIntegralMatrix_py.cc M pyInterface/bindings/rootPwaPy.cc Log Message: ----------- Implement `asNpArray` for Python interface of `ampIntegralMatrix` Implement a function to the Python interface of the `ampIntegralMatrix` class that returns directly the matrix as a numpy array. Commit: 7e8c90d78e2e503cc8f464f210171836dd408570 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7e8c90d78e2e503cc8f464f210171836dd408570 Author: Stefan Wallner <st...@nu...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc M storageFormats/amplitudeFileWriter.cc Log Message: ----------- storageFormats: Increase limit for autosave when writing amplitude trees Increase the limit for autoflush and autosave to 600MB when saving amplitude trees to avoid that multiple keys are stored in the amplitude root-file. These multiple keys lead, for whatever reason, to a very large memory consumption when reading the amplitude files for calculating the integral matrices. Additionally, reduce the read cache for the amplitude trees when calculating the integral matrices to 100MB and scale the cache per tree with the total number of waves. Commit: 87d64a4af958bbefe0525cc1592f69d214850500 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/87d64a4af958bbefe0525cc1592f69d214850500 Author: Stefan Wallner <st...@nu...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_integrals.py Log Message: ----------- pyInterface: Close amplitude files when calculating integrals Amplitude and event files were not closed when calculating the amplitudes. Commit: 00235031f30b58e0a0e47af9ffc8bba788c3ff11 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/00235031f30b58e0a0e47af9ffc8bba788c3ff11 Author: Stefan Wallner <st...@nu...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/bindings/decayAmplitude/ampIntegralMatrixMetadata_py.cc M pyInterface/module/_integralsOnTheFly.py M pyInterface/scripts/calcIntegrals.py Log Message: ----------- pyInterface: Add option for on-the-fly ingegration to calcIntegrals Add option to use on-the-fly integration instead of calculating integrals from precalculated amplitudes to the calcIntegrals script. Commit: 98ebeae17499d46d83d5948edf8c0d337c43f6a7 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/98ebeae17499d46d83d5948edf8c0d337c43f6a7 Author: Stefan Wallner <st...@nu...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc Log Message: ----------- decayAmplitude: Improve performance of integration Load amplitudes per wave blockwise and store them internaly to improve the performance of the integral matrix calculation. Commit: 12d50433a0edbc87f93b904aa9616db2b50d8c32 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/12d50433a0edbc87f93b904aa9616db2b50d8c32 Author: Stefan Wallner <st...@nu...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_integralsOnTheFly.py Log Message: ----------- pyInterface: Add option for on-the-fly ingegration to calcIntegrals Add option to use on-the-fly integration instead of calculating integrals from precalculated amplitudes to the calcIntegrals script. Commit: 95f5c42c272c68e88ea99a35beaf5e40567e64af https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/95f5c42c272c68e88ea99a35beaf5e40567e64af Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_integralsOnTheFly.py M pyInterface/pylintrc M pyInterface/scripts/calcIntegrals.py Log Message: ----------- pyInterface: Add option to process subsample for calc. integrals of the fly Add option to split the events into bunches and process only a certian bunch when calculationg the integral matrices with on-the-fly amplitude calculation. Commit: e70cb05748d1f8b90e48fc86d6f87f791530fa00 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e70cb05748d1f8b90e48fc86d6f87f791530fa00 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrixMetadata.cc M decayAmplitude/ampIntegralMatrixMetadata.h M pyInterface/CMakeLists.txt M pyInterface/bindings/decayAmplitude/ampIntegralMatrixMetadata_py.cc A pyInterface/scripts/mergeIntegrals.py Log Message: ----------- pyInterface: Implement mergeIntegrals script Implement script to merge integral matrices. Add an options to merge integral matrices from the same multibin. Commit: e040fd18cccdbb528b1d167d4d5fe7d108e22137 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e040fd18cccdbb528b1d167d4d5fe7d108e22137 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: A test/testIntegrals.py M test/testMC.sh Log Message: ----------- testMC: Add script to test on-the-fly integration Commit: 8120e99d28f412de31bd3f04d1982204ac351c4b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/8120e99d28f412de31bd3f04d1982204ac351c4b Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_integralsOnTheFly.py M pyInterface/pylintrc Log Message: ----------- pyInterface: Build wave descriptions only once when doing on-the-fly integration Commit: c85e4ea513c15c66591a20a7d1d55939fd9b175a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c85e4ea513c15c66591a20a7d1d55939fd9b175a Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M utilities/libConfigUtils.hpp Log Message: ----------- libConfigUtils: Open file before reading to check open status Commit: f46f17d6bbd4ce6a2df7cc0c77d49d2c1416c41d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f46f17d6bbd4ce6a2df7cc0c77d49d2c1416c41d Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M utilities/libConfigUtils.hpp Log Message: ----------- libConfigUtils: Try to open a key file 4x before breaking This should make ROOTPWA more robust against micro dropouts of the file system (e.g. NFS). Commit: 2c9667e01013fd0011f5ce87b93568a830ddc90a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/2c9667e01013fd0011f5ce87b93568a830ddc90a Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M highLevelInterface/CMakeLists.txt A highLevelInterface/calcIntegral.cc A highLevelInterface/calcIntegral.h M pyInterface/bindings/CMakeLists.txt A pyInterface/bindings/highLevelInterface/calcIntegral_py.cc A pyInterface/bindings/highLevelInterface/calcIntegral_py.h M pyInterface/bindings/rootPwaPy.cc M pyInterface/module/_integralsOnTheFly.py Log Message: ----------- highLevelInterface: Port calcIntegralOnTheFly to high-level interface Port the Python implementation of the on-the-fly integration to the high-level interface. This improves the performance by approx. 17%. (tested for 50000 MC events) Commit: 3b46e97cfb14f1c427effa96a680e677a47fefaa https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/3b46e97cfb14f1c427effa96a680e677a47fefaa Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc M decayAmplitude/ampIntegralMatrix.h M highLevelInterface/calcIntegral.cc Log Message: ----------- decayAmplitude: Implement high-performance `addEvent` function for `ampIntegralMatrix` Implement an `addEvent` member function to `ampIntegralMatrix`, which takes a vector<complex<double>> as argument instead of a map<string,complex<double>>. This function is much faster than the other one as no checks are performed and the wave index is used instead of the wave name. However, the user has to give the amplitudes in the correct order, otherwise the matrix is screwed up. This improves the performance of the on-the-fly integration by 17%. (50000 events, 95 waves) Commit: 62dbab58eb7eb0893ebaddbe42c7d21e03ea3f58 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/62dbab58eb7eb0893ebaddbe42c7d21e03ea3f58 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M pyInterface/module/_integralsOnTheFly.py M pyInterface/scripts/calcIntegrals.py Log Message: ----------- pyInterface: Fix building of wave descriptions for freed-isobar amplitudes Always, only the first wave description of a key file was used. Now all wave description are added to the integral matrix. Commit: a303bed1aadc208e21dd4b8aa35df9e1e8a9f287 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a303bed1aadc208e21dd4b8aa35df9e1e8a9f287 Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrixMetadata.cc Log Message: ----------- decayAmplitude: Merge integrals where two wave have the same amplitude hash In special cases it can happen that two wave have the same amplitude hash. We want to be able to merge integral matrices also with such waves. This is already possible when calculating the integral matrices, which this issue also just gives a warning. Commit: 94521141e10086010df99978efbfa885fa2ec49a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/94521141e10086010df99978efbfa885fa2ec49a Author: Stefan Wallner <st...@po...> Date: 2019-04-08 (Mon, 08 Apr 2019) Changed paths: M utilities/libConfigUtils.hpp Log Message: ----------- libConfigUtils: Try to open a key file 4x before breaking and increase wait time Commit: 1ae4d1d1179f3f6c108e9c10108e9f0b079cd50b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/1ae4d1d1179f3f6c108e9c10108e9f0b079cd50b Author: Stefan Wallner <ste...@tu...> Date: 2019-04-30 (Tue, 30 Apr 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc Log Message: ----------- decayAmplitude: Fix memory leak in `ampIntegralMatrix` The matrix is stored as an array in the ROOT file. If the matrix is loaded from a file, the data from the array is copied into the boost matrix. However, after the copy, the array is not deleted, which leads to a permanent doubling of the memory consumption. Now, the memory consumption is only doubled during the load. Commit: feefeb7c26c49cb570af51909e6dadb28ceafc46 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/feefeb7c26c49cb570af51909e6dadb28ceafc46 Author: Stefan Wallner <st...@po...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M decayAmplitude/massDependence.cc Log Message: ----------- decayAmplitude: Add default parameters to `KPiSGLASS` mass dependence The parameters of the LASS parameterization are used as default parameters. Commit: 7ad6295c95674df4ed46e4df36c965b1d392b4c4 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7ad6295c95674df4ed46e4df36c965b1d392b4c4 Author: Stefan Wallner <st...@po...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M decayAmplitude/massDependence.cc M decayAmplitude/massDependence.h M pyInterface/bindings/decayAmplitude/massDependence_py.cc Log Message: ----------- decayAmplitude: Implement `KPiSMagalhaesElastic` mass dependence Implement parameterization from Patricia Magalhaes: - Elastic parameterization - For the low-energy regime below 1.5 GeV/c^2 - Parameters form a fit to LASS data up to 1.5 GeV/c^2 Commit: 34f0362c16240725dd4d7b24b7137336771527ce https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/34f0362c16240725dd4d7b24b7137336771527ce Author: Stefan Wallner <st...@nu...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M pyInterface/bindings/decayAmplitude/massDependence_py.cc Log Message: ----------- pyInterface: Add 'parentLabelForWaveName' to python interface Commit: 574bf01994cd720afe0e77cd46602396b094efa6 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/574bf01994cd720afe0e77cd46602396b094efa6 Author: Stefan Wallner <st...@po...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M decayAmplitude/massDependence.cc M decayAmplitude/massDependence.h M pyInterface/bindings/decayAmplitude/massDependence_py.cc M pyInterface/module/_fileManager.py Log Message: ----------- decayAmplitude: Implement T_12 element of mass dependence Commit: 12d103b712b4888357291160217684402734a4a1 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/12d103b712b4888357291160217684402734a4a1 Author: Stefan Wallner <st...@po...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M decayAmplitude/massDependence.cc Log Message: ----------- decayAmplitude: Make check of characters in tag without regex Using regex lead to problems with gcc 4.8 Commit: 07332b6c0f54b6cf439d071e77eb73b547e2d5ca https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/07332b6c0f54b6cf439d071e77eb73b547e2d5ca Author: Stefan Wallner <ste...@tu...> Date: 2019-05-08 (Wed, 08 May 2019) Changed paths: M CMakeLists.txt M decayAmplitude/CMakeLists.txt M decayAmplitude/massDependence.cc M decayAmplitude/massDependence.h M pyInterface/bindings/decayAmplitude/massDependence_py.cc Log Message: ----------- decayAmplitude: Implement `lookupTable` mass dependence - It gets a path to an input file with a look-up table. - It determines the amplitude from the look-up table (with (default) or without interpolation) Commit: 3504efacb7b843522b79fa5c841ca1ceaf94d5b8 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/3504efacb7b843522b79fa5c841ca1ceaf94d5b8 Author: Stefan Wallner <ste...@tu...> Date: 2019-05-13 (Mon, 13 May 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Implement `copy` method for `plotcollection` Commit: a5e6f5ebaef76dbc080966f3f2fdc6daee63e261 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a5e6f5ebaef76dbc080966f3f2fdc6daee63e261 Author: Stefan Wallner <ste...@tu...> Date: 2019-05-14 (Tue, 14 May 2019) Changed paths: M plotting/CMakeLists.txt M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/_plotting.py M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- plotting: Implement parallel generation of default plots Now, the default plots for a `multibinPlot` are generated in parallel using openmp. Commit: 7b6459a6c135260747187eab897e82e2bf06f131 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7b6459a6c135260747187eab897e82e2bf06f131 Author: Stefan Wallner <ste...@tu...> Date: 2019-05-15 (Wed, 15 May 2019) Changed paths: M pyInterface/module/_plotting.py Log Message: ----------- plotting: Implement `variableRange` for `plotcollection` Returns the maximum range of all bins in this variable. Commit: 77b62adf80489c2258e2e1c541ea3cb277b3b569 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/77b62adf80489c2258e2e1c541ea3cb277b3b569 Author: Stefan Wallner <ste...@tu...> Date: 2019-05-21 (Tue, 21 May 2019) Changed paths: M pyInterface/scripts/calcAmplitudes.py Log Message: ----------- pyInterface: Define typeas int for `keyfileIndex` command-line option Commit: b2e7714d29e8b504fff08f55cbc13629bf7a922d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/b2e7714d29e8b504fff08f55cbc13629bf7a922d Author: Stefan Wallner <ste...@tu...> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M pyInterface/bindings/decayAmplitude/massDependence_py.cc Log Message: ----------- pyInterface: Add functions to Python interface of mass dependence Implement `getMassMin` and `getMassMax` for Python interface of the freed-isobar mass dependence Commit: 3f3abf383191debf708a36747cd73d677d9a0bcb https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/3f3abf383191debf708a36747cd73d677d9a0bcb Author: Stefan Wallner <ste...@tu...> Date: 2019-05-23 (Thu, 23 May 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/__init__.py M pyInterface/module/_plotting.py M pyInterface/module/utils/_binning.py Log Message: ----------- plotting: Implement some functionality for freed-isobar fits Commit: 66d82a90a4dc9d81861a088925bff3e4b7fe56db https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/66d82a90a4dc9d81861a088925bff3e4b7fe56db Author: Stefan Wallner <ste...@tu...> Date: 2019-05-24 (Fri, 24 May 2019) Changed paths: M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/__init__.py M pyInterface/module/_plotting.py Log Message: ----------- plotting: Add functionality for freed-isobar fits Commit: b34aeb1d41b44825eaa3876f4c76eb07f82bb456 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/b34aeb1d41b44825eaa3876f4c76eb07f82bb456 Author: Stefan Wallner <ste...@tu...> Date: 2019-05-31 (Fri, 31 May 2019) Changed paths: M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- pyInterface: Add `waveNamesSortedByIntensity` to python interface of `PlotCollection` Commit: f37d29aef9e8854063a24a32162133e60c96d751 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f37d29aef9e8854063a24a32162133e60c96d751 Author: Stefan Wallner <st...@po...> Date: 2019-06-07 (Fri, 07 Jun 2019) Changed paths: M decayAmplitude/ampIntegralMatrix.cc M decayAmplitude/ampIntegralMatrix.h M pyInterface/bindings/decayAmplitude/ampIntegralMatrix_py.cc Log Message: ----------- decayAmplitude: Implement functions to normalize an `ampIntegralMatrix` Implement member functions to normalize a `ampIntegralMatrix` sucht hat its diagonal elements are 1. Commit: bc338788b49eced9d16b85a6911743a707b0b4de https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/bc338788b49eced9d16b85a6911743a707b0b4de Author: Stefan Wallner <ste...@tu...> Date: 2019-06-12 (Wed, 12 Jun 2019) Changed paths: M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- plotting: Fix minor bug in `genPlotcollectionFromResults` Commit: 127a430c04d8d0d89c2c901a5fb4bc394ed42c52 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/127a430c04d8d0d89c2c901a5fb4bc394ed42c52 Author: Stefan Wallner <ste...@tu...> Date: 2019-06-18 (Tue, 18 Jun 2019) Changed paths: M pyInterface/scripts/genPlotcollectionFromResults.py Log Message: ----------- plotting: Fix bug in `genPlotcollectionFromResults` Commit: b69f3fd57d8006778f60052fdda8ebe19cd05975 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/b69f3fd57d8006778f60052fdda8ebe19cd05975 Author: Stefan Wallner <ste...@tu...> Date: 2019-06-18 (Tue, 18 Jun 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Add argument `refWaves` to `buildDefaultPlots` This allows to define a list of reference waves for which the phase plots are generated. Commit: c1fed67acdb44d01cdf35078f57e73390ff0dec9 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c1fed67acdb44d01cdf35078f57e73390ff0dec9 Author: Stefan Wallner <ste...@tu...> Date: 2019-07-04 (Thu, 04 Jul 2019) Changed paths: M partialWaveFit/fitResult.h M pyInterface/bindings/partialWaveFit/fitResult_py.cc Log Message: ----------- partialWaveFit: Move functions from `fitResult` to public interface They are needed for plotting. Commit: 9a5dd79cdfb45729c9b6fc801d6c9d853d2692fb https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9a5dd79cdfb45729c9b6fc801d6c9d853d2692fb Author: Stefan Wallner <ste...@tu...> Date: 2019-07-04 (Thu, 04 Jul 2019) Changed paths: M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Add function to access individual fit results Commit: 1091d3e1522824f2b896bd30d106eade910d2761 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/1091d3e1522824f2b896bd30d106eade910d2761 Author: Stefan Wallner <ste...@tu...> Date: 2019-09-26 (Thu, 26 Sep 2019) Changed paths: M storageFormats/eventMetadata.cc Log Message: ----------- storageFormats: Fix bug in `eventMetadata::merge` for files with data-set labels Commit: 76cb9fc1de8744833bc740307a78ee370f9e446b https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/76cb9fc1de8744833bc740307a78ee370f9e446b Author: Stefan Wallner <ste...@tu...> Date: 2019-09-27 (Fri, 27 Sep 2019) Changed paths: M pyInterface/module/utils/_fitTreeUtils.py Log Message: ----------- pyInterface: Fix bug in `getBestFitResultsFromFile` Commit: 7818bcfa555088f7fa23b8e54d15126ae850c9a3 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7818bcfa555088f7fa23b8e54d15126ae850c9a3 Author: Stefan Wallner <ste...@tu...> Date: 2019-09-27 (Fri, 27 Sep 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc Log Message: ----------- plotting: Implement calculation of intensity also for other solutions Commit: a4af0ea0c09aaedec2d27910b0a3aff5b9cf400a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a4af0ea0c09aaedec2d27910b0a3aff5b9cf400a Author: Stefan Wallner <st...@po...> Date: 2019-10-11 (Fri, 11 Oct 2019) Changed paths: M partialWaveFit/fitResult.h M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/__init__.py M pyInterface/module/_plotting.py Log Message: ----------- plotting: Implement freed isobar plots Implement freed isobar intensity, argand, and phase plots for the freed-isobar fits. In addition, implement negLogLikeDistribution and improve freed-isobar plots Commit: e9a3791b8d1987480a24752d34361bab52bcd87d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e9a3791b8d1987480a24752d34361bab52bcd87d Author: Stefan Wallner <ste...@tu...> Date: 2019-10-25 (Fri, 25 Oct 2019) Changed paths: M plotting/plotcollection.cc M plotting/plotcollection.h M pyInterface/bindings/plotting/plotcollection_py.cc M pyInterface/module/_plotting.py Log Message: ----------- plotting: Implement `loadPlots` argument for `plotcollection` and `multibinPlots` This options allows to avoid loading all plots form the root file Commit: 9ed7a8dee5365f75ce9754453dd26b2239aa10b4 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/9ed7a8dee5365f75ce9754453dd26b2239aa10b4 Author: Stefan Wallner <ste...@tu...> Date: 2019-10-25 (Fri, 25 Oct 2019) Changed paths: M pyInterface/module/_plotting.py M pyInterface/pylintrc Log Message: ----------- plotting: Store mass-dependent fit result in `plotcollection` Commit: db7d993cf6672440fd1f31bd8fded95affa15549 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/db7d993cf6672440fd1f31bd8fded95affa15549 Author: Stefan Wallner <ste...@tu...> Date: 2019-10-25 (Fri, 25 Oct 2019) Changed paths: M plotting/plotcollection.cc Log Message: ----------- plotting: Fix bug in copy-constructor of `multibinPlots` The new plot `_negLogLikelihoodDistribution` was not copied. This lead to segmentations faults. Commit: 097d5c5fa030503eb02bcfc970c663805a297d29 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/097d5c5fa030503eb02bcfc970c663805a297d29 Author: Stefan Wallner <st...@nu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M pyInterface/scripts/genPseudoData.py Log Message: ----------- pyInterface: Implement on-the-fly deweighting for genPseudoData Commit: a9301a0c479a5808887044acc3590ffbde55315d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/a9301a0c479a5808887044acc3590ffbde55315d Author: Stefan Wallner <st...@nu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M pyInterface/bindings/storageFormats/eventFileWriter_py.cc M pyInterface/scripts/deWeight.py M pyInterface/scripts/genPseudoData.py M storageFormats/eventFileWriter.h Log Message: ----------- pyInterface: Addionally store the maxWeight and weightNorm to the eventMetadata Commit: 6a542b699a05b0d76e30e02fd602c3424392b669 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/6a542b699a05b0d76e30e02fd602c3424392b669 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M generators/generatorManager.cc M generators/generatorManager.h M generators/generatorPickerFunctions.cc M generators/generatorPickerFunctions.h M generators/modelIntensity.cc M generators/modelIntensity.h M pyInterface/bindings/generators/generatorManager_py.cc M pyInterface/scripts/genPseudoData.py Log Message: ----------- [generators] Implement `genPseudoData` for different t' bins and further improvements Commit: faf64b22d7ff548728b449f0b2c54c917a8244b7 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/faf64b22d7ff548728b449f0b2c54c917a8244b7 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M generators/modelIntensity.cc M generators/modelIntensity.h M pyInterface/bindings/generators/modelIntensity_py.cc M pyInterface/scripts/genPseudoData.py Log Message: ----------- genPseudoData: Implement `--includeFlat` option This option allows to include the contribution of the flat wave when generating pseudo data. Commit: 938ad2c89787571fb0ddd66e89a88126bd81ae25 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/938ad2c89787571fb0ddd66e89a88126bd81ae25 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M generators/modelIntensity.cc M partialWaveFit/fitResult.cc M partialWaveFit/fitResult.h Log Message: ----------- generators: Further implementation details of `includeFlat` Commit: e6a3a1208412402a3ef073eceeed4e0b21a6366f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e6a3a1208412402a3ef073eceeed4e0b21a6366f Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M generators/diffractivePhaseSpace.cc M generators/generatorManager.cc M generators/generatorPickerFunctions.h Log Message: ----------- generators: Implement option to sample in mX according to the 4-body phase space Do not take mX dependence from the massAndTPrimePicker, but sample according to the mX dependence of the 3-body phase space for the `diffractivePhaseSpace`. In addition, remove the q(sqrt(s), mX, m_recoil) dependence of the 4-body phase space, as we sample in mX and t' instead of mX and cosTheta. Commit: be1aab6da44192356da66f34daadfece7e24d09f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/be1aab6da44192356da66f34daadfece7e24d09f Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M pyInterface/scripts/deWeight.py Log Message: ----------- pyInterface: Implement fixed weight for `deWeight` Setting a fixed normalized weight for all events, instead of the normalized weight for each individual events. This is useful when weighting different (already internally weighted files) among each other. Commit: 012f22042940a9b1ef1683da26e6e925f16c5263 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/012f22042940a9b1ef1683da26e6e925f16c5263 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M pyInterface/bindings/storageFormats/eventFileWriter_py.cc M pyInterface/bindings/storageFormats/eventMetadata_py.cc M pyInterface/scripts/deWeight.py M pyInterface/scripts/generatePhaseSpace.py M storageFormats/eventFileWriter.cc M storageFormats/eventFileWriter.h M storageFormats/eventMetadata.cc M storageFormats/eventMetadata.h Log Message: ----------- torageFormats: Implement storing of `vertexPosition` and `recoilKinematicsMomentum` Commit: d4856ee6929fec258888f403b6613391fc48e4d9 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/d4856ee6929fec258888f403b6613391fc48e4d9 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-08 (Fri, 08 Nov 2019) Changed paths: M pyInterface/CMakeLists.txt A pyInterface/scripts/convertToComgeant.py Log Message: ----------- pyInterface: Implement `convertToComgeant` script Commit: 96e1afbd90a51b6110cdbcf1b4ef9c451f242678 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/96e1afbd90a51b6110cdbcf1b4ef9c451f242678 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-11 (Mon, 11 Nov 2019) Changed paths: M pyInterface/scripts/generatePhaseSpace.py Log Message: ----------- scripts: Fix minor bug in `generatePhaseSpace` Program crashed if recoil particle was not stored. Commit: b050e62277bda8f91ec47b5aae08eeff42289fc2 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/b050e62277bda8f91ec47b5aae08eeff42289fc2 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-11 (Mon, 11 Nov 2019) Changed paths: M pyInterface/CMakeLists.txt M pyInterface/module/__init__.py A pyInterface/module/_genPseudoData.py M pyInterface/scripts/genPseudoData.py Log Message: ----------- pyInterface: Make `genPseudoData` usable also for other weights Split the parts that are specific to calculating weights from fit results from the general part of generating pseudo data according to some weight. This is done by implementing a base class `PseudoDataGenerator`, which handles the general case of generation based on a weight. Based on `PseudoDataGenerator`, we implemented a class `PseudoDataFromFitResultGenerator`, which implements the weight calculation based on a given fit result. `PseudoDataGenerator` can now be used also for other models, e.g. Deck. Commit: 6f5818a0da428debf3039f4ed32b1bb816d806c8 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/6f5818a0da428debf3039f4ed32b1bb816d806c8 Author: Stefan Wallner <ste...@tu...> Date: 2019-11-20 (Wed, 20 Nov 2019) Changed paths: M storageFormats/eventMetadata.cc Log Message: ----------- storageFormats: Fix minor bug in `merge` function of `eventMetadata` The merge sill expects the branches for vertex positions or recoil kinematics to exist. Now, it checks if they exist in the first input file and if they exists, it requires them for all other input files. Commit: e4129bb0e2b257f2efd556cf34f447bbbabcd396 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/e4129bb0e2b257f2efd556cf34f447bbbabcd396 Author: Stefan Wallner <ste...@tu...> Date: 2019-12-05 (Thu, 05 Dec 2019) Changed paths: M plotting/plotcollection.cc Log Message: ----------- plotting: Fix bug in generation of `negLogLikelihoodDistribution` Commit: 412d3cb02982334733862941884122f5896d6403 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commi... [truncated message content] |
