ComPWA / ComPWA-legacy

[deprecated] C++ back-end for the Common Partial Wave Analysis framework
https://compwa.github.io/legacy
Other
9 stars 9 forks source link

DataSet, Intensity and Helicity kinematics rework #290

Closed spflueger closed 4 years ago

spflueger commented 4 years ago

This is not completely finished yet. So some cleanup work has still to be done, but the big changes are finished.

The main parts that changed:

spflueger commented 4 years ago

Ok, the PR is finished now. I apologize for the rather large PR, but the DataSet change basically triggered all of this.

codecov[bot] commented 4 years ago

Codecov Report

Merging #290 into master will increase coverage by 0.23%. The diff coverage is 78.82%.

@@            Coverage Diff             @@
##           master     #290      +/-   ##
==========================================
+ Coverage   36.71%   36.94%   +0.23%     
==========================================
  Files          89       88       -1     
  Lines        7344     7340       -4     
==========================================
+ Hits         2696     2712      +16     
+ Misses       4648     4628      -20
weidenka commented 4 years ago

Furthermore, since there were quite some changes it would be nice if you could post a log file of DalitzAnalysis_D03K before and after your changes.

spflueger commented 4 years ago

Looks good to me. You moved some logic which have been in independend functions back to Kinematics (e.g. Data::reduceToPhsp(data, kin); vs. kin.reduceToPhsp(data)). Since the move was the other way around a while ago, we should agree on some standart here.

When was that the case? I think you are confusing isWithinPhaseSpace() with reduceToPhsp(). Anyways the important difference is that now the Kinematics class processes a list of Events instead of just single Events. Hence the Kinematics interface changed: isWithinPhaseSpace() was removed and replaced with reduceToPhsp().

spflueger commented 4 years ago

Furthermore, since there were quite some changes it would be nice if you could post a log file of DalitzAnalysis_D03K before and after your changes.

Thats a good point. I will do that

spflueger commented 4 years ago

Furthermore, since there were quite some changes it would be nice if you could post a log file of DalitzAnalysis_D03K before and after your changes.

Thats a good point. I will do that

71,76c71,85
< Info in <TH1D::Chi2TestX>: There is a bin in h1 with less than 1 event.
< 
< Info in <TH1D::Chi2TestX>: There is a bin in h1 with less than 1 event.
< 
< Info in <TH1D::Chi2TestX>: There is a bin in h1 with less than 1 event.
< 
---
> Error in <TH1D::Chi2TestX>: one histogram is empty
> Error in <TPad::Range>: illegal world coordinates range: x1=0.869640, y1=0.000000, x2=1.921921, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.974868, ymin=0.000000, xmax=1.869307, ymax=0.000000
> Error in <TH1D::Chi2TestX>: one histogram is empty
> Error in <TPad::Range>: illegal world coordinates range: x1=0.877078, y1=0.000000, x2=1.932878, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.982658, ymin=0.000000, xmax=1.880088, ymax=0.000000
> Error in <TH1D::Chi2TestX>: one histogram is empty
> Error in <TPad::Range>: illegal world coordinates range: x1=0.877078, y1=0.000000, x2=1.932878, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.982658, ymin=0.000000, xmax=1.880088, ymax=0.000000
> Error in <TPad::Range>: illegal world coordinates range: x1=0.869640, y1=0.000000, x2=1.921921, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.974868, ymin=0.000000, xmax=1.869307, ymax=0.000000
> Error in <TPad::Range>: illegal world coordinates range: x1=0.877078, y1=0.000000, x2=1.932878, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.982658, ymin=0.000000, xmax=1.880088, ymax=0.000000
> Error in <TPad::Range>: illegal world coordinates range: x1=0.877078, y1=0.000000, x2=1.932878, y2=0.000000
> Error in <TPad::RangeAxis>: illegal axis coordinates range: xmin=0.982658, ymin=0.000000, xmax=1.880088, ymax=0.000000
80,82c89,91

Seems like I screwed up something with the axis in the DalitzPlot class. But apart from that all is good

spflueger commented 4 years ago

Ok, the fix for the DalitzPlot is also included now.