commit SHERPA-MC for openSUSE:Factory

2020-06-03 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2020-06-03 20:31:43

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.3606 (New)


Package is "SHERPA-MC"

Wed Jun  3 20:31:43 2020 rev:15 rq:811083 version:2.2.10

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2020-01-17 
16:03:58.296399867 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.3606/SHERPA-MC.changes
2020-06-03 20:32:33.165179121 +0200
@@ -1,0 +2,29 @@
+Wed Jun  3 10:30:10 UTC 2020 - Atri Bhattacharya 
+
+- Drop post(un) install-info scripts for devel pkg, these are
+  handled by rpm file triggers; also drop the appropriate
+  dependencies.
+
+---
+Sat May 16 01:26:01 UTC 2020 - Atri Bhattacharya 
+
+- Update to version 2.2.10:
+  * Further improvements for Rivet3 and HepMC3 compatibility
+[!321, !314].
+  * Bugfix for crashes with new heavy-flavour shower evolution
+schemes [!313].
+  * Bugfix for crash in ReweightWithoutSubevents [!318].
+  * Bugfix for documentation signal blob with pre-NLO+PS
+kinematics [!320].
+  * Bugfix for crash in setups with neutron beams [!312].
+  * More robust discovery of HZTool and HepMC3 ROOT IO libraries
+[!317, !322, !323].
+- Changes from version 2.2.9: See
+  https://gitlab.com/sherpa-team/sherpa/-/tags/v2.2.9.
+- Build with Rivet support (BuildRequires: Rivet-devel).
+- Fix some incorrect Provides and Obsoletes in subpackages.
+- Execute hashbang cleanup on source files instead of acting on
+  installed files in %{buildroot}.
+- Run spec-cleaner for minor formatting cleanups.
+
+---

Old:

  SHERPA-MC-2.2.8.tar.gz

New:

  SHERPA-MC-2.2.10.tar.gz



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.fvffAS/_old  2020-06-03 20:32:35.121185067 +0200
+++ /var/tmp/diff_new_pack.fvffAS/_new  2020-06-03 20:32:35.121185067 +0200
@@ -20,17 +20,19 @@
 %define _lto_cflags %{nil}
 
 Name:   SHERPA-MC
-Version:2.2.8
+Version:2.2.10
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0-or-later AND GPL-3.0-only
 Group:  Development/Libraries/C and C++
-URL:https://sherpa.hepforge.org/
+URL:https://sherpa-team.gitlab.io/
 Source: 
https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
 Patch0: SHERPA-MC-no-return-in-non-void-function.patch
 BuildRequires:  HepMC-devel >= 3.0
 BuildRequires:  LHAPDF-devel
+BuildRequires:  Rivet-devel
+BuildRequires:  fastjet-contrib-devel
 BuildRequires:  fastjet-devel
 BuildRequires:  fastjet-plugin-siscone-devel
 BuildRequires:  fdupes
@@ -45,8 +47,6 @@
 BuildRequires:  pkgconfig(gsl)
 BuildRequires:  pkgconfig(yaml-cpp)
 BuildRequires:  pkgconfig(zlib)
-Requires(post):  info
-Requires(preun): info
 
 %description
 Sherpa is a Monte Carlo event generator for the Simulation of
@@ -69,14 +69,14 @@
  - in particular, for hadronic interactions as studied at the
Fermilab Tevatron or the CERN LHC.
 
-%package -n %soname
+%package -n %{soname}
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 Group:  System/Libraries
-Obsoletes:  libSHERPA-MC < %version-%release
-Provides:   libSHERPA-MC = %version-%release
 Requires:   libSHERPA-MC-config
+Obsoletes:  libSHERPA-MC < %{version}-%{release}
+Provides:   libSHERPA-MC = %{version}-%{release}
 
-%description -n %soname
+%description -n %{soname}
 Sherpa is a Monte Carlo event generator for the Simulation of
 High-Energy Reactions of PArticles in lepton-lepton, lepton-photon,
 photon-photon, lepton-hadron and hadron-hadron collisions. It provides
@@ -90,9 +90,9 @@
 %package -n %{soname}-config
 Summary:Dynamic linker configuration for the SHERPA-MC libraries
 Group:  System/Base
+Provides:   libSHERPA-MC-config = %{version}
+Obsoletes:  libSHERPA-MC-config < %{version}
 BuildArch:  noarch
-Provides:   libSHERPA-MC-config < %{version}-release
-Obsoletes:  libSHERPA-MC-config = %{version}-release
 
 %description -n %{soname}-config
 Contains the ld.so.conf.d file for the SHERPA-MC libraries.
@@ -100,7 +100,7 @@
 %package devel
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 Group:  Development/Libraries/C

commit SHERPA-MC for openSUSE:Factory

2020-01-17 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2020-01-17 16:03:56

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.26092 (New)


Package is "SHERPA-MC"

Fri Jan 17 16:03:56 2020 rev:14 rq:765276 version:2.2.8

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2019-10-31 
22:44:43.117804451 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.26092/SHERPA-MC.changes   
2020-01-17 16:03:58.296399867 +0100
@@ -1,0 +2,34 @@
+Fri Jan 17 13:18:10 UTC 2020 - Atri Bhattacharya 
+
+- Update source URL.
+
+---
+Fri Jan 17 12:04:31 UTC 2020 - Tomáš Chvátal 
+
+- Make sure to provide/obsolete the python- subpkg to support
+  migration
+
+---
+Wed Jan  8 23:23:35 UTC 2020 - Atri Bhattacharya 
+
+- Update to version 2.2.8:
+  * Phase space biasing with Enhance_Observable re-enabled for
+unweighted events (!193, !209)
+  * Significant reduction of negative weight fraction possible
+with NLO_CSS_PSMODE=1 option for leading-colour S-event
+showering (!200)
+  * Improve safeguarding against large Sudakov reweighting factors
+(!212)
+  * HepMC 3.1 interface added (!196)
+  * Rivet 3.x interface added (!192)
+  * Make OpenLoops library finding more robust, e.g. for LCG
+OpenLoops installation (!215)
+  * Crash when soft spin correlations and neutral meson mixing
+were enabled (#53) -- thanks for the report from ATLAS
+  * Widths updated in hard decay handler not used by ME generators
+(#182)
+- Build against python3 instead of python(2).
+- Build against HepMC (>=3) instead of HepMC2.
+- Remove some hasbangs for non-exec files.
+
+---

Old:

  SHERPA-MC-2.2.6.tar.gz

New:

  SHERPA-MC-2.2.8.tar.gz



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.DB4jqv/_old  2020-01-17 16:03:59.408400393 +0100
+++ /var/tmp/diff_new_pack.DB4jqv/_new  2020-01-17 16:03:59.412400394 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,32 +20,26 @@
 %define _lto_cflags %{nil}
 
 Name:   SHERPA-MC
-Version:2.2.6
+Version:2.2.8
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0-or-later AND GPL-3.0-only
 Group:  Development/Libraries/C and C++
-Url:https://sherpa.hepforge.org/
-Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
+URL:https://sherpa.hepforge.org/
+Source: 
https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
 Patch0: SHERPA-MC-no-return-in-non-void-function.patch
-BuildRequires:  HepMC2-devel
+BuildRequires:  HepMC-devel >= 3.0
 BuildRequires:  LHAPDF-devel
-BuildRequires:  Rivet-devel
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  fastjet-devel
 BuildRequires:  fastjet-plugin-siscone-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++ >= 6
 BuildRequires:  gcc-fortran >= 6
+BuildRequires:  libboost_headers-devel
 BuildRequires:  pkg-config
 BuildRequires:  pythia-devel
-BuildRequires:  python-devel
-BuildRequires:  scons
+BuildRequires:  python3-devel
 BuildRequires:  sqlite3-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig(gsl)
@@ -120,11 +114,13 @@
 This package provides the source and header files for development with
 Sherpa.
 
-%package -n python-%{name}
+%package -n python3-%{name}
 Summary:Python extensions for SHERPA-MC
 Group:  Development/Languages/Python
+Provides:   python-%{name}
+Obsoletes:  python-%{name}
 
-%description -n python-%{name}
+%description -n python3-%{name}
 Sherpa is a Monte Carlo event generator for the Simulation of
 High-Energy Reactions of PArticles in lepton-lepton, lepton-photon,
 photon-photon, lepton-hadron and hadron-hadron collisions. It provides
@@ -140,6 +136,8 @@
 %patch0 -p1
 
 %build
+export PYTHON=python3
+export PYTHON_VERSION=%{py3_ver}
 %configure \
   --docdir=%{_docdir}/%{name}  \
   --enable-ufo \
@@ -147,12 +145,13

commit SHERPA-MC for openSUSE:Factory

2019-10-31 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2019-10-31 22:44:41

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.2990 (New)


Package is "SHERPA-MC"

Thu Oct 31 22:44:41 2019 rev:13 rq:744499 version:2.2.6

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2019-09-09 
12:34:50.793477607 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.2990/SHERPA-MC.changes
2019-10-31 22:44:43.117804451 +0100
@@ -1,0 +2,5 @@
+Thu Oct 10 07:16:23 UTC 2019 - Nicolas Morey-Chaisemartin 

+
+- Remove unused BuildRequires to openmpi
+
+---



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.fL0rp0/_old  2019-10-31 22:44:45.061806867 +0100
+++ /var/tmp/diff_new_pack.fL0rp0/_new  2019-10-31 22:44:45.077806886 +0100
@@ -42,7 +42,6 @@
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++ >= 6
 BuildRequires:  gcc-fortran >= 6
-BuildRequires:  openmpi-devel
 BuildRequires:  pkg-config
 BuildRequires:  pythia-devel
 BuildRequires:  python-devel




commit SHERPA-MC for openSUSE:Factory

2019-09-09 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2019-09-09 12:34:48

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.7948 (New)


Package is "SHERPA-MC"

Mon Sep  9 12:34:48 2019 rev:12 rq:729122 version:2.2.6

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2019-06-17 
21:33:44.467019036 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.7948/SHERPA-MC.changes
2019-09-09 12:34:50.793477607 +0200
@@ -1,0 +2,5 @@
+Thu Sep  5 13:07:17 UTC 2019 - Atri Bhattacharya 
+
+- Disable link-time-optimization to prevent build failures.
+
+---



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.shW0DM/_old  2019-09-09 12:34:51.589477477 +0200
+++ /var/tmp/diff_new_pack.shW0DM/_new  2019-09-09 12:34:51.593477477 +0200
@@ -17,6 +17,7 @@
 
 
 %define soname lib%{name}0
+%define _lto_cflags %{nil}
 
 Name:   SHERPA-MC
 Version:2.2.6




commit SHERPA-MC for openSUSE:Factory

2019-06-17 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2019-06-17 21:33:40

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.4811 (New)


Package is "SHERPA-MC"

Mon Jun 17 21:33:40 2019 rev:11 rq:705775 version:2.2.6

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2019-02-11 
21:25:55.143063328 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.4811/SHERPA-MC.changes
2019-06-17 21:33:44.467019036 +0200
@@ -1,0 +2,6 @@
+Thu May 23 00:08:54 UTC 2019 - Atri Bhattacharya 
+
+- Enable ufo-interface and package it as part of python-%{name}
+  package. Requires scons for building.
+
+---



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.42G6hp/_old  2019-06-17 21:33:45.299018844 +0200
+++ /var/tmp/diff_new_pack.42G6hp/_new  2019-06-17 21:33:45.303018843 +0200
@@ -45,6 +45,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  pythia-devel
 BuildRequires:  python-devel
+BuildRequires:  scons
 BuildRequires:  sqlite3-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig(gsl)
@@ -141,6 +142,7 @@
 %build
 %configure \
   --docdir=%{_docdir}/%{name}  \
+  --enable-ufo \
   --enable-pyext   \
   --enable-analysis\
   --enable-multithread \
@@ -206,7 +208,9 @@
 %{_infodir}/Sherpa.*.gz
 
 %files -n python-%{name}
+%{_bindir}/Sherpa-generate-model
 %{python_sitelib}/Sherpa.py*
+%{python_sitelib}/ufo_interface/
 %{python_sitelib}/_Sherpa.*
 
 %changelog




commit SHERPA-MC for openSUSE:Factory

2019-02-11 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2019-02-11 21:25:49

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new.28833 (New)


Package is "SHERPA-MC"

Mon Feb 11 21:25:49 2019 rev:10 rq:673053 version:2.2.6

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2018-04-27 
16:08:42.595638438 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.28833/SHERPA-MC.changes   
2019-02-11 21:25:55.143063328 +0100
@@ -1,0 +2,55 @@
+Tue Feb  5 13:16:04 UTC 2019 - Atri Bhattacharya 
+
+- Refresh source tarball: updated by upstream without version
+  change or listing changes.
+- Use %%license to install COPYING file.
+- Minor specfile cleanups.
+
+---
+Thu Jan 24 15:38:24 UTC 2019 - badshah...@gmail.com
+
+- Update to version 2.2.6:
+  * Add initial-state p_z and inelasticity selectors for DIS (#80)
+  * Improve the reweighting to include the local K=BBar/B factor
+in MEPS@NLO runs (#73)
+  * Improve treatment of the shower reweighting scale cut-off, it
+is now applied also when reweighting AlphaS and the PDFs in
+the CKKW clustering sequence (also mentioned in #73)
+  * Adapt status=4 convention in the short HepMC output (#79)
+  * Compute approximate NLO EW corrections (and subleading orders)
+as on-the-fly alternative event weights (#41). See Example in
+Manual for details. Currently only works with a
+soon-to-be-released version of OpenLoops.
+  * Add a filter between the perturbative and the non-perturbative
+event phase, which can be used to reject events with
+parton-level cuts (!94)
+  * Bug fixes:
+- Fix NLO and Variable Selector routines (#70, #88)
+- Fix unweighting treatment for the LocalKFactor (and its
+  on-the-fly variations) in negative events (#94)
+- Fix argument validation in
+  GGH_KFactor_Setter::ClusterMassCorrectionFactor
+- Fix core scale setter for DIS when the incoming particles
+  are ordered ep instead of pe and adapt it for ee->xy (where
+  xy is not a quark pair) (!81)
+- Fix strong coupling reweighting in merging runs in cases
+  where nothing was clustered (#66)
+- Fix beam remnants for DIS setups
+- Fix rejection of rare negative-energy configurations in the
+  shower (#44)
+- Fix treatment of negative UserHook weights in HepMC
+  interface (#100)
+- Fix a mapping in the OpenLoops parameter-setting interface
+  (#87)
+- Fix HEFT Higgs production with COMIX (#114)
+- Fix compatibility issues with recent versions of Rivet
+- Fix error when compiling with MCFM support
+- Fix compilation on ARM/PowerPC architectures
+- Make environment importing when building scons scripts more
+  bullet-proof
+- Fix compilation of the HZTool interface add-on
+- Drop SHERPA-MC-fix_arm_build.patch: fixed upstream.
+- Rebase SHERPA-MC-no-return-in-non-void-function.patch: partially
+  upstreamed; fix new error introduced.
+
+---

Old:

  SHERPA-MC-2.2.5.tar.gz
  SHERPA-MC-fix_arm_build.patch

New:

  SHERPA-MC-2.2.6.tar.gz



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.oJGxj3/_old  2019-02-11 21:25:55.835062955 +0100
+++ /var/tmp/diff_new_pack.oJGxj3/_new  2019-02-11 21:25:55.839062952 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define soname lib%{name}0
 
 Name:   SHERPA-MC
-Version:2.2.5
+Version:2.2.6
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0-or-later AND GPL-3.0-only
@@ -28,8 +28,6 @@
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
 Patch0: SHERPA-MC-no-return-in-non-void-function.patch
-# PATCH-FIX-UPSTREAM SHERPA-MC-fix_arm_build.patch guilla...@ope

commit SHERPA-MC for openSUSE:Factory

2018-04-27 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2018-04-27 16:08:40

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Fri Apr 27 16:08:40 2018 rev:9 rq:601537 version:2.2.5

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2017-09-15 
21:03:40.507978692 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2018-04-27 
16:08:42.595638438 +0200
@@ -1,0 +2,55 @@
+Wed Apr 25 07:02:18 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2.2.5:
+  * Interface changes
+- Add preliminary support for HepMC3 (this interface is still
+  being tested) 
+  * New features
+- Improve decay showering off top quarks
+- Improve single-top support and add examples and documentation 
+  for its production channels
+- Improve hadronisation and hadron decays for heavy flavour 
+  production
+- Introduce a user hook framework which allows users to easily 
+  implement 
+  event generation afterburners, see Examples/Userhook
+- Add settings to output ME-only on-the-fly variations (along with 
+  the full ones): 
+HEPMC_INCLUDE_ME_ONLY_VARIATIONS=1 (HepMC interface)
+- New cut-off for parton-shower reweighting: 
+CSS_REWEIGHT_SCALE_CUTOFF=, default: 5 GeV2
+this is more generally applicable than using a cut-off on the 
+   number of reweighted emissions
+- Improve support for on-the-fly variations of clustering steps 
+  (reweight each step locally instead of doing it globally)
+  * Bugfixes
+- Fix issue with the overweight treatment for negative weights
+- Add missing shower weight in some event outputs, e.g. when using 
+  `OUTPUT HepMC...[]`
+- Fix issue with the overweight threshold for on-the-fly variations
+- Fix issue with non-trivial beam spectra handling
+- Fix possible issues with electron-"PDF" initialization
+- Fix issue with the ISR-channel threshold for leptonic collider
+- Fix X/Y functions in METOOLS (this is relevant for hadron decays)
+- Fix crash in decay-channel sorting
+- Fix crash when using EVENT_TYPE=HadronDecay
+- Fix issue with CSS strong coupling values when using non-trivial 
+  scale factors
+- Fix issue with QSF variations for real emission calculations with 
+  COMIX
+- Fix crash when doing on-the-fly variations and invalid dipole 
+  kinematics occur
+- Fix issue in the interplay of the flux and the BIWeight for 1 -> n 
+  processes
+- Fix issue when using vertices with a vanishing coupling
+- Fix rare "invalid amplitude" crashes
+- Fix issues when adding limits for the number of t-channel propagators
+  in matrix elements
+- Fix issue with checking PDF availability when enforcing jet vetoes
+- Fix several compilation issues 
+- Add patch to fix ARM (and PPC) builds:
+  * SHERPA-MC-fix_arm_build.patch
+- Refresh partially upstreamed patch:
+  * SHERPA-MC-no-return-in-non-void-function.patch
+
+---

Old:

  SHERPA-MC-2.2.4.tar.gz

New:

  SHERPA-MC-2.2.5.tar.gz
  SHERPA-MC-fix_arm_build.patch



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.0HVN2L/_old  2018-04-27 16:08:43.499605282 +0200
+++ /var/tmp/diff_new_pack.0HVN2L/_new  2018-04-27 16:08:43.499605282 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,17 @@
 %define soname lib%{name}0
 
 Name:   SHERPA-MC
-Version:2.2.4
+Version:2.2.5
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
-License:GPL-2.0+ and GPL-3.0
+License:GPL-2.0-or-later AND GPL-3.0-only
 Group:  Development/Libraries/C and C++
 Url:https://sherpa.hepforge.org/
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
 Patch0: SHERPA-MC-no-return-in-non-void-function.patch
+# PATCH-FIX-UPSTREAM SHERPA-MC-fix_arm_build.patch guilla...@opensuse.org -- 
char are not signed on ARM, so explicitly declare them signed
+Patch1: SHERPA-MC-fix_arm_build.patch
 B

commit SHERPA-MC for openSUSE:Factory

2017-09-15 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2017-09-15 21:03:36

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Fri Sep 15 21:03:36 2017 rev:8 rq:522778 version:2.2.4

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2017-04-29 
10:54:10.670688438 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2017-09-15 
21:03:40.507978692 +0200
@@ -1,0 +2,61 @@
+Fri Sep  8 11:29:07 UTC 2017 - badshah...@gmail.com
+
+- Upstream released a new 2.2.4 tarball, so refresh sources.
+
+---
+Sat Sep  2 14:19:14 UTC 2017 - badshah...@gmail.com
+
+- Update to version 2.2.4:
+  * Interface Changes:
+- New default parameters for hadronisation model to improve
+  heavy flavour production fractions and meson/baryon ratios.
+- Updates to Recola interface with some new parameter (names),
+  please refer to the manual.
+- Make STRICT_METS the default scale setter to guarantee full
+  scale setting accuracy for unweighted events. 
+  * New features
+- Availability of DIRE NLO parton shower (cf.
+  arXiv:1705.00742). This is not (yet) the default shower, in
+  particular not in NLO-merged configurations.
+- Higher numerical stability in parton shower kinematics
+  (re)construction.
+- Add OVERWEIGHT_THRESHOLD allowing user to cap maximal weight
+  during event generation (cf. manual).
+- Avoid spuriously large weights in NLO-merged samples due to
+  instable PDF ratios.
+- Add interface for hadron-level selectors.
+- Add Max_N_TChannels option in Amegic.
+- Add possibility to identify partons which originate in the
+  hard decay handler.
+- Restructure gzip support such that it can be switched off at
+  runtime (USE_GZIP).
+- Enable on-the-fly reweighting for calculations with the
+  Higgs (Interference) add-on for HIGGS_INTERERENCE_MODE 1, 2,
+  3 or 4. 
+  * Bugfixes
+- Bugfix in NLO-matched parton shower emission for non-trivial
+  colour structures like in V+2j@NLO. This fixes an eta
+  asymmetry which was visible at the ~2% level in such
+  samples.
+- BSM models through UFO: fix running coupling behaviour and
+  treatment of exotic color octets.
+- Bugfix in random generator for Poisson distributions with
+  large mean values.
+- Bugfixes for segfaults and compiler warnings with gcc 7.1.
+- Bugfix for colour assignment in clustering for loop-induced
+  merged processes.
+- Bugfix for decay showering in conjunction with NLO+PS
+  matching. 
+- Change BuildRequires HepMC-devel to HepMC2-devel: not compatible
+  with HepMC >= 3.0.
+- Rename libSHERPA-MC-config to libSHERPA-MC0-config that follows
+  the shared lib versioning. In addition the ld.so.conf.d file is
+  also renamed to follow the shared lib version to make it
+  possible to install multiple versions of the shared lib.
+- Rebase SHERPA-MC-no-return-in-non-void-function.patch and add
+  fixes for one more function showing the same issue in version
+  2.2.4.
+- GCC >= 6.0 required, build fails with older GCC for openSUSE <=
+  1320.
+
+---

Old:

  SHERPA-MC-2.2.3.tar.gz

New:

  SHERPA-MC-2.2.4.tar.gz



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.dxcOKm/_old  2017-09-15 21:03:42.551691799 +0200
+++ /var/tmp/diff_new_pack.dxcOKm/_new  2017-09-15 21:03:42.555691238 +0200
@@ -19,7 +19,7 @@
 %define soname lib%{name}0
 
 Name:   SHERPA-MC
-Version:2.2.3
+Version:2.2.4
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0+ and GPL-3.0
@@ -28,7 +28,7 @@
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
 Patch0: SHERPA-MC-no-return-in-non-void-function.patch
-BuildRequires:  HepMC-devel
+BuildRequires:  HepMC2-devel
 BuildRequires:  LHAPDF-devel
 BuildRequires:  Rivet-devel
 %if 0%{?suse_version} > 1325
@@ -39,8 +39,8 @@
 BuildRequires:  fastjet-devel
 BuildRequires:  fastjet-plugin-siscone-devel
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  gcc-fortran
+BuildRequires:  gcc-c++ >= 6
+BuildRequires:  gcc-fortran >= 6
 BuildRequires:  openmpi-devel
 BuildRequires:  pkg-config
 BuildRequires:  pythia-devel
@

commit SHERPA-MC for openSUSE:Factory

2017-04-29 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2017-04-29 10:53:42

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Sat Apr 29 10:53:42 2017 rev:7 rq:491828 version:2.2.3

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2017-03-12 
20:02:29.850513231 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2017-04-29 
10:54:10.670688438 +0200
@@ -1,0 +2,9 @@
+Fri Apr 28 06:47:09 UTC 2017 - badshah...@gmail.com
+
+- Update to version 2.2.3:
+  * Support for the Recola one-loop generator for QCD corrections.
+- Add SHERPA-MC-no-return-in-non-void-function.patch -- Fix a
+  non-void (bool) function that was not returning any data to
+  return "true".
+
+---

Old:

  SHERPA-MC-2.2.1.tar.gz

New:

  SHERPA-MC-2.2.3.tar.gz
  SHERPA-MC-no-return-in-non-void-function.patch



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.3WuKgu/_old  2017-04-29 10:54:11.838523461 +0200
+++ /var/tmp/diff_new_pack.3WuKgu/_new  2017-04-29 10:54:11.842522896 +0200
@@ -19,13 +19,15 @@
 %define soname lib%{name}0
 
 Name:   SHERPA-MC
-Version:2.2.1
+Version:2.2.3
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0+ and GPL-3.0
 Group:  Development/Libraries/C and C++
 Url:https://sherpa.hepforge.org/
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch 
badshah...@gmail.com -- Fix a non-void (bool) function that was not returning 
any data to return "true"
+Patch0: SHERPA-MC-no-return-in-non-void-function.patch
 BuildRequires:  HepMC-devel
 BuildRequires:  LHAPDF-devel
 BuildRequires:  Rivet-devel
@@ -132,6 +134,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \

++ SHERPA-MC-2.2.1.tar.gz -> SHERPA-MC-2.2.3.tar.gz ++
/work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC-2.2.1.tar.gz 
/work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC-2.2.3.tar.gz differ: char 
5, line 1

++ SHERPA-MC-no-return-in-non-void-function.patch ++
Index: SHERPA-MC-2.2.3/SHERPA/Tools/HepMC2_Interface.C
===
--- SHERPA-MC-2.2.3.orig/SHERPA/Tools/HepMC2_Interface.C
+++ SHERPA-MC-2.2.3/SHERPA/Tools/HepMC2_Interface.C
@@ -647,6 +647,7 @@ bool HepMC2_Interface::AddCrossSection(H
 #else
   msg_Info()<

commit SHERPA-MC for openSUSE:Factory

2017-03-12 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2017-03-12 20:02:29

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Sun Mar 12 20:02:29 2017 rev:6 rq:477368 version:2.2.1

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2017-02-07 
12:05:19.765816998 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2017-03-12 
20:02:29.850513231 +0100
@@ -1,0 +2,6 @@
+Mon Feb 13 17:55:08 UTC 2017 - jeng...@inai.de
+
+- Shared library package must only contain time-unique names;
+  split off libSHERPA-MC-config.
+
+---



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.6iiPjj/_old  2017-03-12 20:02:30.766383636 +0100
+++ /var/tmp/diff_new_pack.6iiPjj/_new  2017-03-12 20:02:30.770383070 +0100
@@ -77,6 +77,7 @@
 Group:  System/Libraries
 Obsoletes:  libSHERPA-MC < %version-%release
 Provides:   libSHERPA-MC = %version-%release
+Requires:   libSHERPA-MC-config
 
 %description -n %soname
 Sherpa is a Monte Carlo event generator for the Simulation of
@@ -89,6 +90,14 @@
 
 This package provides the shared libraries for Sherpa.
 
+%package -n libSHERPA-MC-config
+Summary:Dynamic linker configuration for the SHERPA-MC libraries
+Group:  System/Base
+BuildArch:  noarch
+
+%description -n libSHERPA-MC-config
+Contains the ld.so.conf.d file for the SHERPA-MC libraries.
+
 %package devel
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 Group:  Development/Libraries/C and C++
@@ -167,6 +176,9 @@
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/*.so.*
+
+%files -n libSHERPA-MC-config
+%defattr(-,root,root)
 %config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
 
 %files devel




commit SHERPA-MC for openSUSE:Factory

2017-02-07 Thread root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2017-02-07 12:05:18

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2016-11-14 
20:16:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2017-02-07 
12:05:19.765816998 +0100
@@ -1,0 +2,5 @@
+Thu Feb  2 12:48:11 UTC 2017 - adam.ma...@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+---



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.57mdDK/_old  2017-02-07 12:05:20.717682330 +0100
+++ /var/tmp/diff_new_pack.57mdDK/_new  2017-02-07 12:05:20.717682330 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,11 @@
 BuildRequires:  HepMC-devel
 BuildRequires:  LHAPDF-devel
 BuildRequires:  Rivet-devel
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_headers-devel
+%else
 BuildRequires:  boost-devel
+%endif
 BuildRequires:  fastjet-devel
 BuildRequires:  fastjet-plugin-siscone-devel
 BuildRequires:  fdupes




commit SHERPA-MC for openSUSE:Factory

2016-11-14 Thread h_root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2016-11-14 20:16:36

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2016-06-21 
12:29:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2016-11-14 
20:16:38.0 +0100
@@ -1,0 +2,14 @@
+Thu Nov 10 21:38:03 UTC 2016 - badshah...@gmail.com
+
+- Update to version 2.2.1:
+  * Incoporation of approximate NLO EW corrections in MEPS@NLO
+simulation as described in arXiv:1511.08692
+  * On-the-fly renormalisation and factorisation scale, PDF and
+alpha_s variations in the matrix elements for LO, LOPS, NLOPS,
+MEPS, MENLOPS and MEPS@NLO simulations as described in
+arXiv:1606.08753 
+- Changes from version 2.2.0: See
+  https://sherpa.hepforge.org/trac/wiki/SherpaDownloads/Sherpa-2.2.0.
+- Drop gcc6_char_cast.patch; incorporated upstream.
+
+---

Old:

  SHERPA-MC-2.1.1.tar.gz
  gcc6_char_cast.patch

New:

  SHERPA-MC-2.2.1.tar.gz



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.i2mT45/_old  2016-11-14 20:16:39.0 +0100
+++ /var/tmp/diff_new_pack.i2mT45/_new  2016-11-14 20:16:39.0 +0100
@@ -19,14 +19,13 @@
 %define soname lib%{name}0
 
 Name:   SHERPA-MC
-Version:2.1.1
+Version:2.2.1
 Release:0
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
 License:GPL-2.0+ and GPL-3.0
 Group:  Development/Libraries/C and C++
 Url:https://sherpa.hepforge.org/
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
-Patch1: gcc6_char_cast.patch
 BuildRequires:  HepMC-devel
 BuildRequires:  LHAPDF-devel
 BuildRequires:  Rivet-devel
@@ -120,7 +119,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure \
@@ -136,7 +134,7 @@
   --enable-pythia=%{_prefix}
 
 # FIXME: Disable rivet bindings until SHERPA-MC builds with latest Rivet >= 
2.1.2
-#  --enable-rivet=%{_prefix}   \
+#  --enable-rivet=%%{_prefix}   \
 
 make %{?_smp_mflags}
 
@@ -177,6 +175,7 @@
 %{_bindir}/init_nlo.sh
 %{_bindir}/make2scons
 %{_bindir}/plot_graphs.sh
+%{_bindir}/plot_stats.sh
 %dir %{_docdir}/%{name}/
 %{_docdir}/%{name}/*.html
 %{_docdir}/%{name}/*.jpg

++ SHERPA-MC-2.1.1.tar.gz -> SHERPA-MC-2.2.1.tar.gz ++
/work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC-2.1.1.tar.gz 
/work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC-2.2.1.tar.gz differ: char 
5, line 1




commit SHERPA-MC for openSUSE:Factory

2016-06-21 Thread h_root
Hello community,

here is the log from the commit of package SHERPA-MC for openSUSE:Factory 
checked in at 2016-06-21 11:30:43

Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
 and  /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New)


Package is "SHERPA-MC"

Changes:

--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes  2014-07-02 
15:04:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2016-06-21 
12:29:17.0 +0200
@@ -1,0 +2,12 @@
+Sun Jun 19 09:30:25 UTC 2016 - jeng...@inai.de
+
+- RPM group classification
+- run install_info in preun to avoid errors of missing files
+- Shared library subpackage is supposed to include the number
+
+---
+Thu Jun 16 12:12:35 UTC 2016 - norm...@linux.vnet.ibm.com
+
+-  new gcc6_char_cast.patch
+
+---

New:

  gcc6_char_cast.patch



Other differences:
--
++ SHERPA-MC.spec ++
--- /var/tmp/diff_new_pack.Wu4lcB/_old  2016-06-21 12:29:18.0 +0200
+++ /var/tmp/diff_new_pack.Wu4lcB/_new  2016-06-21 12:29:18.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define soname lib%{name}
+%define soname lib%{name}0
 
 Name:   SHERPA-MC
 Version:2.1.1
@@ -26,6 +26,7 @@
 Group:  Development/Libraries/C and C++
 Url:https://sherpa.hepforge.org/
 Source: 
http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
+Patch1: gcc6_char_cast.patch
 BuildRequires:  HepMC-devel
 BuildRequires:  LHAPDF-devel
 BuildRequires:  Rivet-devel
@@ -70,7 +71,9 @@
 
 %package -n %soname
 Summary:MC event generator for Simulation of High-Energy Reactions of 
PArticles
-Group:  Development/Libraries/C and C++
+Group:  System/Libraries
+Obsoletes:  libSHERPA-MC < %version-%release
+Provides:   libSHERPA-MC = %version-%release
 
 %description -n %soname
 Sherpa is a Monte Carlo event generator for the Simulation of
@@ -102,7 +105,7 @@
 
 %package -n python-%{name}
 Summary:Python extensions for SHERPA-MC
-Group:  Development/Libraries/C and C++
+Group:  Development/Languages/Python
 
 %description -n python-%{name}
 Sherpa is a Monte Carlo event generator for the Simulation of
@@ -117,6 +120,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure \
@@ -147,16 +151,14 @@
 %fdupes %{buildroot}%{_datadir}/%{name}/
 %fdupes %{buildroot}%{python_sitelib}/
 
-%post -n %soname
-/sbin/ldconfig
+%post -n %soname -p /sbin/ldconfig
 
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz
 
-%postun -n %soname
-/sbin/ldconfig
+%postun -n %soname -p /sbin/ldconfig
 
-%postun devel
+%preun devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz
 
 %files -n %soname

++ gcc6_char_cast.patch ++
---
 MODEL/Interaction_Models/Vertex.C |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: SHERPA-MC-2.1.1/MODEL/Interaction_Models/Vertex.C
===
--- SHERPA-MC-2.1.1.orig/MODEL/Interaction_Models/Vertex.C
+++ SHERPA-MC-2.1.1/MODEL/Interaction_Models/Vertex.C
@@ -444,10 +444,10 @@ int Vertex::SetVertex(Single_Vertex& ori
 void Vertex::ColorExchange(Color_Function* colfunc,int new0,int new1,int 
new2,int new3)
 {
   //T[0,1,2] -> T[new0,new1,new2]
-  int  partarg[3]  ={-1,-1,-1};
-  char strarg[3]   ={-1,-1,-1};
-  int  partargn[3] ={-1,-1,-1};
-  char strargn[3]  ={-1,-1,-1};
+  int  partarg[3]  ={(char)-1,(char)-1,(char)-1};
+  char strarg[3]   ={(char)-1,(char)-1,(char)-1};
+  int  partargn[3] ={(char)-1,(char)-1,(char)-1};
+  char strargn[3]  ={(char)-1,(char)-1,(char)-1};
  
   for (short int i=0;i<3;i++) {
 if (colfunc->Type()==cf::D && i==2) break;