Add new massDependences and expansions #171

fkrinner · 2016-06-03T09:24:54Z

Mass dependences:

Polynomial
Fourier mode
Sawtooth
Arbitrary TFormula

Expansions:

Taylor
Fourier
Chebyshev
Sawtooth (no extra code was necessary for this, works automatically with the new sawtooth mass-dependence and the old bin-expansion)

legordian · 2016-06-06T12:14:16Z

decayAmplitude/massDependence.cc

+
+	const double M = parent->lzVec().M();
+
+	if (_mMin <= M && M < _mMax) {


&& -> and please (you could also change it in the binnedMassDependence while you are at it).

Add a polynomial mass dependece with arbitrary complex coefficients Add a complex exponential mass dependence (fourier mode) Add an arbitrary mass dependence, that uses two TFormulae as real and imag part

Add a sawtooth mass dependence to allow not only zeroth but also first order extractions in freed isobar fits

Remove some 'std::' despite a 'using namespace std'.

Add the new mass dependencies to the python interface.

suhlatwork · 2016-06-17T07:26:37Z

Could you please check suhlatwork/ROOTPWA@d9728c1? Mostly my changes are cosmetic, but:

classes from boost that have a C++11 counterpart need the explicit boost:: namespace (shared_ptr, tuples, ...)
the mMin and mMax parameters have been moved out of the fourier and chebyshev expansions as they are not used in the expansion itself

I still see potential issues with

the arbitrary mass dependence has a non working example. Formulas may not contain the / character (and probably others) as they are interpreted as a directory. I think this should be removed entirely
the three new expansions: If I remember correctly we decided at the time of adding the expansions that the name variable inside the expansion was supposed to be the variable that is added instead of the expand.

suhlatwork · 2016-07-11T11:51:14Z

The commit you just added (5701792) is already included in master.

fkrinner · 2016-07-11T12:37:32Z

Did not intend to, sorry.
Thanks for noticing.

bgrube · 2016-08-01T13:21:05Z

decayAmplitude/massDependence.h

@@ -142,6 +144,7 @@ namespace rpwa {
 		double getMassMax() const { return _mMax; }

 	private:
+


doxygen comment for class:
trivial flat mass dependence over a range
->
flat mass dependence over given mass range; zero amplitude outside (rectangle function)

bgrube · 2016-08-01T14:49:03Z

decayAmplitude/waveDescription.cc

 		if (not setting->lookupValue(expandTypeName, expandType)) {
-			printErr << "no expand type given." << std::endl;
+			printErr << "no expand type given." << endl;


expand -> expansion (everywhere)
if it is not fatal, it should be printWarn (everywhere)

legordian reviewed Jun 6, 2016
View reviewed changes

fkrinner force-pushed the masterMaster branch from f9e70df to c10f14e Compare June 6, 2016 12:51

fkrinner force-pushed the masterMaster branch from c10f14e to 84c3626 Compare June 14, 2016 12:52

fkrinner and others added 8 commits June 17, 2016 08:53

Add three new mass dependences

42fc2c5

Add a polynomial mass dependece with arbitrary complex coefficients Add a complex exponential mass dependence (fourier mode) Add an arbitrary mass dependence, that uses two TFormulae as real and imag part

Add automatic taylor expansion of isobarShape

1dadb85

Add automatic fourier expansion of isobarShape

c29e8cb

Add automatic Chebyshev expansion of isobarShape

675aa9d

Add sawtooth mass dependence

708f1bb

Add a sawtooth mass dependence to allow not only zeroth but also first order extractions in freed isobar fits

Add example keyfiles for new massDependencies

4be3d0f

decayAmplitude: cosmetics

f7bfd9a

Remove some 'std::' despite a 'using namespace std'.

pyInterface: add new mass dependencies

d9728c1

Add the new mass dependencies to the python interface.

arbitraryMassDependence: change naming

f5aac2e

fkrinner force-pushed the masterMaster branch from 84c3626 to f5aac2e Compare June 17, 2016 09:14

fkrinner force-pushed the masterMaster branch from 5701792 to f5aac2e Compare July 11, 2016 12:31

suhlatwork mentioned this pull request Aug 1, 2016

Mass dependencies in wave set generator #183

Merged

bgrube reviewed Aug 1, 2016
View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new massDependences and expansions #171

Add new massDependences and expansions #171

fkrinner commented Jun 3, 2016 •

edited

Loading

legordian Jun 6, 2016

suhlatwork commented Jun 17, 2016

suhlatwork commented Jul 11, 2016

fkrinner commented Jul 11, 2016

bgrube Aug 1, 2016 •

edited

Loading

bgrube Aug 1, 2016 •

edited

Loading


		const double M = parent->lzVec().M();

		if (_mMin <= M && M < _mMax) {

		@@ -142,6 +144,7 @@ namespace rpwa {
		double getMassMax() const { return _mMax; }

		private:

Add new massDependences and expansions #171

Are you sure you want to change the base?

Add new massDependences and expansions #171

Conversation

fkrinner commented Jun 3, 2016 • edited Loading

legordian Jun 6, 2016

Choose a reason for hiding this comment

suhlatwork commented Jun 17, 2016

suhlatwork commented Jul 11, 2016

fkrinner commented Jul 11, 2016

bgrube Aug 1, 2016 • edited Loading

Choose a reason for hiding this comment

bgrube Aug 1, 2016 • edited Loading

Choose a reason for hiding this comment

fkrinner commented Jun 3, 2016 •

edited

Loading

bgrube Aug 1, 2016 •

edited

Loading

bgrube Aug 1, 2016 •

edited

Loading