From: stefan-wallner <no...@gi...> - 2020-05-29 17:42:35
|
Branch: refs/heads/master Home: https://github.com/ROOTPWA-Maintainers/ROOTPWA Commit: f55e7ec257cb8f0ebcf1737473689ecfcd6a937f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/f55e7ec257cb8f0ebcf1737473689ecfcd6a937f Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M CMakeLists.txt Log Message: ----------- buildSystem: fix 'git' invocation during CMake run Obtaining the git hash while running CMake would fail as 'git log' does not accept absolute paths to point to a checkout that is to be used. Instead ensure that 'git' is executed from the source directory. This issue has been fixed for 'utilities/environment.cmake' in b41807515af49d867971369d8ee87532c9f65638. Commit: 7dce8812b448e79b803e87f52ad73043b2799a54 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/7dce8812b448e79b803e87f52ad73043b2799a54 Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M storageFormats/hashCalculator.cc M storageFormats/hashCalculator.h Log Message: ----------- storageFormats: enable strings for hash calculations Enable the usage of 'std::strings' for the calulation of hashes used in various metadata objects. A corresponding function has been added to the 'hashCalculator' class. Commit: cb7c4ff6226a25691c316df8af5efedd3fdd63ae https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/cb7c4ff6226a25691c316df8af5efedd3fdd63ae Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M pyInterface/module/_integrals.py M storageFormats/amplitudeFileWriter.cc M storageFormats/amplitudeMetadata.cc Log Message: ----------- storageFormats: change hash of 'amplitudeMetadata' Use the content hashes of the used event metadata and the wave description when calculating the hashes for amplitude files. The wave descriptions (keyfile contents) are used in order to be able to distinguish between several waves that have equal amplitudes for all events. This might happen, e.g., for waves with the binned mass-dependence if the invariant mass of X for all events is below the lower bound of the bins. This is not sufficient if two event files for which all events have an equal amplitude for each event in both files for one wave, and the two event files have the same number of events, so also use the hash of the event information. Revert 9fce75b9d027c8f575aeec77a0092abb2f6e64d2 now that the hashes are unique. Commit: 093c84a7e37f8a4ee3eafd748aee6ff2796ebfe0 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/093c84a7e37f8a4ee3eafd748aee6ff2796ebfe0 Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M partialWaveFit/pwaLikelihood.cc Log Message: ----------- partialWaveFit: protect 0 diagonal elements of norm. matrix During the normalization of the integral matrix, the diagonal elements of the normalization matrix (without acceptance) are assigned 1. This is not correct, if the element was 0 before, in this case the element should be left untouched. Commit: 0d077d7ff7717c0bc41bfcf10268b13f0cf25b61 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/0d077d7ff7717c0bc41bfcf10268b13f0cf25b61 Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M partialWaveFit/pwaLikelihood.cc M partialWaveFit/pwaLikelihood.h Log Message: ----------- partialWaveFit: fix production amplitudes for 'empty' waves If the decay amplitude for a wave is zero for all events, and if the corresponding elements in the normalization matrix with acceptance are also zero, then this wave does not contribute to any quantity calculated during the fit. This might spoil the errors that Minuit calculates, so fix the production amplitudes corresponding to these waves to zero. Commit: 2a5e510f95784193769ef44a3c9c966b3bd35e8c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/2a5e510f95784193769ef44a3c9c966b3bd35e8c Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/isobarDecayTopology.cc M test/testPyRootPwa.py Log Message: ----------- decayAmplitude: normalization of isospin symmetrization Do not ignore the absolute value of the isospin Clebsch-Gordon coefficient. For coupling of only isospin-0 and isospin-1 states ignoring these does not pose a problem, as (apart from the sign) the coefficients are equal. For isospin-2 subsytems the magnitude of the coefficients matters. Adjust the test accordingly. Commit: 17d4002e07acde34df8a41bddd8bbc872e03901d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/17d4002e07acde34df8a41bddd8bbc872e03901d Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/isobarDecayTopology.cc Log Message: ----------- decayAmplitude: more checks for isospin symmetrization When getting the symmetrization maps for isospin symmetrization, check that the to-be-added permutation of the particles adds something new not only beyond the identity permutation, but beyond any permutation accepted so far. Again this seems to not be an issue as long as only considering isospin-0 and isospin-1. Commit: c05d3bf1e43b7270cdb74508cc5105238d6d024d https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c05d3bf1e43b7270cdb74508cc5105238d6d024d Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/ampIntegralMatrix.cc Log Message: ----------- decayAmplitude: cosmetics Only resize the final matrix directly before it is used the first time. This might save some negligible amount of memory while integrating. Commit: 1512ae3d5a76a987dae1e5a2f0185929ac2ffcf9 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/1512ae3d5a76a987dae1e5a2f0185929ac2ffcf9 Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/isobarDecayTopology.cc Log Message: ----------- decayAmplitude: cosmetics Remove one temporary variable that is only used for debugging output, and call the function instead of using the variable when used. Commit: abf38562bda3016b2868776b9387c25938832d8f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/abf38562bda3016b2868776b9387c25938832d8f Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M highLevelInterface/pwaFit.cc Log Message: ----------- highLevelInterface: cosmetics in error message Add 'using default start values.' to an error message in one more place. Commit: 0c63d44ddeeb3ff1e42bf3b6a2cf9e1fa7fa710a https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/0c63d44ddeeb3ff1e42bf3b6a2cf9e1fa7fa710a Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M partialWaveFit/pwaLikelihood.cc Log Message: ----------- partialWaveFit: print binning map Print the binning map while creating the list of events to be used. This ensures that the binning map is printed once while performing the fit. Commit: 421376c40646460cfae7929f6d187e09f1ffd54f https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/421376c40646460cfae7929f6d187e09f1ffd54f Author: Sebastian Uhl <su...@ce...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M pyInterface/scripts/pwaFit.py M pyInterface/scripts/pwaNloptFit.py Log Message: ----------- pyInterface: cosmetics Correct a spelling error. Commit: c6405b1063a771c0327acf11824092ec3229372c https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/c6405b1063a771c0327acf11824092ec3229372c Author: Boris Grube <bg...@tu...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/isobarDecayTopology.cc A test/decayAmplitude/test5pi/1900.1960.genbod.regen.evt A test/decayAmplitude/test5pi/charly/sym/1-1+00+f11285=a11260+=rho770_01_pi+_11_pi-_11_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+f11285=a11260-=rho770_01_pi-_11_pi+_11_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+rho1700=a11260+=rho770_01_pi+_01_pi-_01_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+rho1700=a11260-=rho770_01_pi-_01_pi+_01_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-2-00+f21270=a11260-=rho770_01_pi-_11_pi+_02_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-2-00+f21270=a11260-=rho770_01_pi-_11_pi+_22_pi-.key A test/decayAmplitude/test5pi/oneEvent.evt A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi+_0_rho770_0_pi-.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi+_0_rho770_0_pi-_noBose.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi-_0_rho770_0_pi+.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi-_0_rho770_0_pi+_noBose.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_11_f11285=pi+_11_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_11_f11285=pi-_11_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_02_f21270=pi+_1_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_02_f21270=pi-_1_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_22_f21270=pi+_1_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_22_f21270=pi-_1_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/b1list.dat A test/decayAmplitude/test5pi/sebastian/sym/b1list2.dat A test/decayAmplitude/test5pi/sebastian/sym/eta1440list.dat A test/decayAmplitude/test5pi/sebastian/sym/eta2list.dat A test/decayAmplitude/test5pi/sebastian/sym/exoticlist.dat A test/decayAmplitude/test5pi/sebastian/sym/f0list.dat A test/decayAmplitude/test5pi/sebastian/sym/f1list.dat A test/decayAmplitude/test5pi/sebastian/sym/f1plist.dat A test/decayAmplitude/test5pi/sebastian/sym/f21270list.dat A test/decayAmplitude/test5pi/sebastian/sym/f21565list.dat A test/decayAmplitude/test5pi/sebastian/sym/f2list.dat A test/decayAmplitude/test5pi/sebastian/sym/rho3list.dat A test/decayAmplitude/test5pi/sebastian/sym/rhoprime2list.dat A test/decayAmplitude/test5pi/sebastian/sym/rhoprimelist.dat M test/decayAmplitude/testIsospinSym.cc Log Message: ----------- decayAmplitude: improve code readability and add test case for isospin symmetrization Improve naming and debug output. Move code parts into separate functions. Add 5pi test case used in testIsospinSym. Commit: 57acd89f92f247ad0c6a9a6d13ff291f1c1f9959 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/57acd89f92f247ad0c6a9a6d13ff291f1c1f9959 Author: Boris Grube <bg...@tu...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M partialWaveFit/pwaLikelihood.cc M storageFormats/amplitudeFileWriter.cc M storageFormats/amplitudeFileWriter.h M storageFormats/hashCalculator.cc M storageFormats/hashCalculator.h Log Message: ----------- partialWaveFit and storageFormats: improve code readability Commit: 1366ca0c39af66b8fe4597baa140f2f0b8ba89e9 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/1366ca0c39af66b8fe4597baa140f2f0b8ba89e9 Author: Boris Grube <bg...@tu...> Date: 2020-05-20 (Wed, 20 May 2020) Changed paths: M decayAmplitude/isobarDecayTopology.cc Log Message: ----------- decayAmplitude: minor readability enhancement Commit: 64907eaaf2533e4f412e7c295faceaa5e5ed8066 https://github.com/ROOTPWA-Maintainers/ROOTPWA/commit/64907eaaf2533e4f412e7c295faceaa5e5ed8066 Author: stefan-wallner <ste...@tu...> Date: 2020-05-29 (Fri, 29 May 2020) Changed paths: M CMakeLists.txt M decayAmplitude/ampIntegralMatrix.cc M decayAmplitude/isobarDecayTopology.cc M highLevelInterface/pwaFit.cc M partialWaveFit/pwaLikelihood.cc M partialWaveFit/pwaLikelihood.h M pyInterface/module/_integrals.py M pyInterface/scripts/pwaFit.py M pyInterface/scripts/pwaNloptFit.py M storageFormats/amplitudeFileWriter.cc M storageFormats/amplitudeFileWriter.h M storageFormats/amplitudeMetadata.cc M storageFormats/hashCalculator.cc M storageFormats/hashCalculator.h A test/decayAmplitude/test5pi/1900.1960.genbod.regen.evt A test/decayAmplitude/test5pi/charly/sym/1-1+00+f11285=a11260+=rho770_01_pi+_11_pi-_11_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+f11285=a11260-=rho770_01_pi-_11_pi+_11_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+rho1700=a11260+=rho770_01_pi+_01_pi-_01_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-1+00+rho1700=a11260-=rho770_01_pi-_01_pi+_01_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-2-00+f21270=a11260-=rho770_01_pi-_11_pi+_02_pi-.key A test/decayAmplitude/test5pi/charly/sym/1-2-00+f21270=a11260-=rho770_01_pi-_11_pi+_22_pi-.key A test/decayAmplitude/test5pi/oneEvent.evt A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi+_0_rho770_0_pi-.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi+_0_rho770_0_pi-_noBose.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi-_0_rho770_0_pi+.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_01_rho1700=a11269=pi-_0_rho770_0_pi+_noBose.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_11_f11285=pi+_11_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-1++0+pi-_11_f11285=pi-_11_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_02_f21270=pi+_1_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_02_f21270=pi-_1_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_22_f21270=pi+_1_a11269=pi-_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/1-2-+0+pi-_22_f21270=pi-_1_a11269=pi+_0_rho770.key A test/decayAmplitude/test5pi/sebastian/sym/b1list.dat A test/decayAmplitude/test5pi/sebastian/sym/b1list2.dat A test/decayAmplitude/test5pi/sebastian/sym/eta1440list.dat A test/decayAmplitude/test5pi/sebastian/sym/eta2list.dat A test/decayAmplitude/test5pi/sebastian/sym/exoticlist.dat A test/decayAmplitude/test5pi/sebastian/sym/f0list.dat A test/decayAmplitude/test5pi/sebastian/sym/f1list.dat A test/decayAmplitude/test5pi/sebastian/sym/f1plist.dat A test/decayAmplitude/test5pi/sebastian/sym/f21270list.dat A test/decayAmplitude/test5pi/sebastian/sym/f21565list.dat A test/decayAmplitude/test5pi/sebastian/sym/f2list.dat A test/decayAmplitude/test5pi/sebastian/sym/rho3list.dat A test/decayAmplitude/test5pi/sebastian/sym/rhoprime2list.dat A test/decayAmplitude/test5pi/sebastian/sym/rhoprimelist.dat M test/decayAmplitude/testIsospinSym.cc M test/testPyRootPwa.py Log Message: ----------- Merge pull request #250 from ROOTPWA-Maintainers/misc Various fixes Compare: https://github.com/ROOTPWA-Maintainers/ROOTPWA/compare/cf3601654292...64907eaaf253 |