Skip to content

Fixes for merging

Christian Holm Christensen requested to merge cholmcc/rivet:robust_merging into release-3-1-x
  • Do not add mapping until we are sure that we can read from file
  • Do not add empty Scatter1DPtr for X-section unless equiv is true. Otherwise we will try to merge empty Scatter1D objects causing SIGSEGV (i.e., around line 656 to 681 where - if we add empty Scatter1D there's the access xsecs[i]->point(0) which will cause the SIGSEGV on an empty Scatter1D).
  • Added some debugging information which is useful when we have some trouble merging.

Merge request reports