diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
 # OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
\ No newline at end of file
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
\ No newline at end of file
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
 # OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
 # OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE/EE-10.00.in b/Tests/Rivet/EE/EE-10.00.in
--- a/Tests/Rivet/EE/EE-10.00.in
+++ b/Tests/Rivet/EE/EE-10.00.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.0
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # argus eta pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
 # argus phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
diff --git a/Tests/Rivet/EE/EE-10.52-sym.in b/Tests/Rivet/EE/EE-10.52-sym.in
--- a/Tests/Rivet/EE/EE-10.52-sym.in
+++ b/Tests/Rivet/EE/EE-10.52-sym.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.26*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.26*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # CLEO charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2004_S5809304
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I526554
-# CEOL baryon assymetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I552541
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I526554
+# CLEO baryon assymetry
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I552541
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1606201
diff --git a/Tests/Rivet/EE/EE-12.in b/Tests/Rivet/EE/EE-12.in
--- a/Tests/Rivet/EE/EE-12.in
+++ b/Tests/Rivet/EE/EE-12.in
@@ -1,20 +1,20 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
diff --git a/Tests/Rivet/EE/EE-13.in b/Tests/Rivet/EE/EE-13.in
--- a/Tests/Rivet/EE/EE-13.in
+++ b/Tests/Rivet/EE/EE-13.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 13.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
diff --git a/Tests/Rivet/EE/EE-14.8.in b/Tests/Rivet/EE/EE-14.8.in
--- a/Tests/Rivet/EE/EE-14.8.in
+++ b/Tests/Rivet/EE/EE-14.8.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 14.8
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-14.in b/Tests/Rivet/EE/EE-14.in
--- a/Tests/Rivet/EE/EE-14.in
+++ b/Tests/Rivet/EE/EE-14.in
@@ -1,20 +1,20 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 14.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso event shapes at various low energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_S2148048
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
diff --git a/Tests/Rivet/EE/EE-17.in b/Tests/Rivet/EE/EE-17.in
--- a/Tests/Rivet/EE/EE-17.in
+++ b/Tests/Rivet/EE/EE-17.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 17.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
diff --git a/Tests/Rivet/EE/EE-202.in b/Tests/Rivet/EE/EE-202.in
--- a/Tests/Rivet/EE/EE-202.in
+++ b/Tests/Rivet/EE/EE-202.in
@@ -1,15 +1,15 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 202.
 ##################################################
 # select the analyses
 ##################################################
 # OPAL b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
 # OPAL charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I595335
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I595335
 # delphi event shapes for a wide energy range
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
 
diff --git a/Tests/Rivet/EE/EE-21.5.in b/Tests/Rivet/EE/EE-21.5.in
--- a/Tests/Rivet/EE/EE-21.5.in
+++ b/Tests/Rivet/EE/EE-21.5.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 21.5
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-22.in b/Tests/Rivet/EE/EE-22.in
--- a/Tests/Rivet/EE/EE-22.in
+++ b/Tests/Rivet/EE/EE-22.in
@@ -1,28 +1,28 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 22.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_S3612880
 # tasso event shapes at various low energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_S2148048
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
 
diff --git a/Tests/Rivet/EE/EE-25.in b/Tests/Rivet/EE/EE-25.in
--- a/Tests/Rivet/EE/EE-25.in
+++ b/Tests/Rivet/EE/EE-25.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 25.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
 ##################################################
 # select the analyses 
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
 
diff --git a/Tests/Rivet/EE/EE-27.6.in b/Tests/Rivet/EE/EE-27.6.in
--- a/Tests/Rivet/EE/EE-27.6.in
+++ b/Tests/Rivet/EE/EE-27.6.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 27.6
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
diff --git a/Tests/Rivet/EE/EE-29.in b/Tests/Rivet/EE/EE-29.in
--- a/Tests/Rivet/EE/EE-29.in
+++ b/Tests/Rivet/EE/EE-29.in
@@ -1,24 +1,24 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 29.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1986_I18502
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I250824
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I250824
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1987_I235694
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1985_I205868
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MAC_1985_I202924
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1992_I339573
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I205869
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1986_I217416
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1990_I280958
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1988_I262143
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1985_I201482
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I200105
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I23360
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1985_I205868
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MAC_1985_I202924
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1992_I339573
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I205869
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1986_I217416
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1990_I280958
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1988_I262143
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1985_I201482
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I200105
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I23360
diff --git a/Tests/Rivet/EE/EE-3.63.in b/Tests/Rivet/EE/EE-3.63.in
--- a/Tests/Rivet/EE/EE-3.63.in
+++ b/Tests/Rivet/EE/EE-3.63.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.63
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
diff --git a/Tests/Rivet/EE/EE-30.2.in b/Tests/Rivet/EE/EE-30.2.in
--- a/Tests/Rivet/EE/EE-30.2.in
+++ b/Tests/Rivet/EE/EE-30.2.in
@@ -1,15 +1,15 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.2
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
 
diff --git a/Tests/Rivet/EE/EE-30.7.in b/Tests/Rivet/EE/EE-30.7.in
--- a/Tests/Rivet/EE/EE-30.7.in
+++ b/Tests/Rivet/EE/EE-30.7.in
@@ -1,14 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.7
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-30.in b/Tests/Rivet/EE/EE-30.in
--- a/Tests/Rivet/EE/EE-30.in
+++ b/Tests/Rivet/EE/EE-30.in
@@ -1,17 +1,17 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153341
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153341
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
 
diff --git a/Tests/Rivet/EE/EE-31.3.in b/Tests/Rivet/EE/EE-31.3.in
--- a/Tests/Rivet/EE/EE-31.3.in
+++ b/Tests/Rivet/EE/EE-31.3.in
@@ -1,14 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.3
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
 
diff --git a/Tests/Rivet/EE/EE-34.5.in b/Tests/Rivet/EE/EE-34.5.in
--- a/Tests/Rivet/EE/EE-34.5.in
+++ b/Tests/Rivet/EE/EE-34.5.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.5
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-34.8.in b/Tests/Rivet/EE/EE-34.8.in
--- a/Tests/Rivet/EE/EE-34.8.in
+++ b/Tests/Rivet/EE/EE-34.8.in
@@ -1,17 +1,17 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.8
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso charged mult
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202785
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1986_I230950
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1985_I215869
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202785
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1986_I230950
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1985_I215869
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
 # TASSO strange baryons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
diff --git a/Tests/Rivet/EE/EE-34.in b/Tests/Rivet/EE/EE-34.in
--- a/Tests/Rivet/EE/EE-34.in
+++ b/Tests/Rivet/EE/EE-34.in
@@ -1,22 +1,22 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # CELLO EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I179022
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1981_I166363
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I192072
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I179022
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1981_I166363
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I192072
 # tasso pi, K and p spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
diff --git a/Tests/Rivet/EE/EE-35.in b/Tests/Rivet/EE/EE-35.in
--- a/Tests/Rivet/EE/EE-35.in
+++ b/Tests/Rivet/EE/EE-35.in
@@ -1,30 +1,28 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 35.
 ##################################################
 # select the analyses 
 ##################################################
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_S3612880
 # tasso event shapes at various low energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_S2148048
 # PDG hadron multiplicities and ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1990_I283026
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1989_I276764
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I203145
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
-# jade gamma,pi0 and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
-# TASSO event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1988_I263859
-
-
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1990_I283026
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1989_I276764
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I203145
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+## jade gamma,pi0 and eta spectra
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
+## TASSO event shapes
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1988_I263859
diff --git a/Tests/Rivet/EE/EE-36.2.in b/Tests/Rivet/EE/EE-36.2.in
--- a/Tests/Rivet/EE/EE-36.2.in
+++ b/Tests/Rivet/EE/EE-36.2.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 36.2
 ##################################################
 # select the analyses 
 ##################################################
 # TASSO D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I278856
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I278856
diff --git a/Tests/Rivet/EE/EE-4.03.in b/Tests/Rivet/EE/EE-4.03.in
--- a/Tests/Rivet/EE/EE-4.03.in
+++ b/Tests/Rivet/EE/EE-4.03.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.03
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 4.00
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
diff --git a/Tests/Rivet/EE/EE-4.5.in b/Tests/Rivet/EE/EE-4.5.in
--- a/Tests/Rivet/EE/EE-4.5.in
+++ b/Tests/Rivet/EE/EE-4.5.in
@@ -1,12 +1,12 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.5
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 4.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
diff --git a/Tests/Rivet/EE/EE-42.1.in b/Tests/Rivet/EE/EE-42.1.in
--- a/Tests/Rivet/EE/EE-42.1.in
+++ b/Tests/Rivet/EE/EE-42.1.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 42.1
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # TASSO strange baryons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
diff --git a/Tests/Rivet/EE/EE-42.6.in b/Tests/Rivet/EE/EE-42.6.in
--- a/Tests/Rivet/EE/EE-42.6.in
+++ b/Tests/Rivet/EE/EE-42.6.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 42.6
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-43.6.in b/Tests/Rivet/EE/EE-43.6.in
--- a/Tests/Rivet/EE/EE-43.6.in
+++ b/Tests/Rivet/EE/EE-43.6.in
@@ -1,14 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.6
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # tasso charged mult
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
 
diff --git a/Tests/Rivet/EE/EE-44.in b/Tests/Rivet/EE/EE-44.in
--- a/Tests/Rivet/EE/EE-44.in
+++ b/Tests/Rivet/EE/EE-44.in
@@ -1,19 +1,19 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 44.
 ##################################################
 # select the analyses
 ##################################################
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_S3612880
 # tasso event shapes at various low energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_S2148048
 # jade gamma,pi0 and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
 # tasso pi, K and p spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
 
diff --git a/Tests/Rivet/EE/EE-53.3.in b/Tests/Rivet/EE/EE-53.3.in
--- a/Tests/Rivet/EE/EE-53.3.in
+++ b/Tests/Rivet/EE/EE-53.3.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 53.3
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
diff --git a/Tests/Rivet/EE/EE-55.in b/Tests/Rivet/EE/EE-55.in
--- a/Tests/Rivet/EE/EE-55.in
+++ b/Tests/Rivet/EE/EE-55.in
@@ -1,15 +1,15 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # AMY charged mult
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
 # L3 event shapes etc for a wide range of CMS energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
 # AMY event shapes 
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I283337
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I283337
diff --git a/Tests/Rivet/EE/EE-57.in b/Tests/Rivet/EE/EE-57.in
--- a/Tests/Rivet/EE/EE-57.in
+++ b/Tests/Rivet/EE/EE-57.in
@@ -1,13 +1,13 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 57.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # AMY charged mult
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
 # TOPAZ event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1993_I361661
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1993_I361661
diff --git a/Tests/Rivet/EE/EE-58.in b/Tests/Rivet/EE/EE-58.in
--- a/Tests/Rivet/EE/EE-58.in
+++ b/Tests/Rivet/EE/EE-58.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 58.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1995_I381900
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1995_I406129
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1995_I381900
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1995_I406129
diff --git a/Tests/Rivet/EE/EE-59.5.in b/Tests/Rivet/EE/EE-59.5.in
--- a/Tests/Rivet/EE/EE-59.5.in
+++ b/Tests/Rivet/EE/EE-59.5.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 59.5
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
diff --git a/Tests/Rivet/EE/EE-7.7.in b/Tests/Rivet/EE/EE-7.7.in
--- a/Tests/Rivet/EE/EE-7.7.in
+++ b/Tests/Rivet/EE/EE-7.7.in
@@ -1,13 +1,13 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.7
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 7.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-9.4.in b/Tests/Rivet/EE/EE-9.4.in
--- a/Tests/Rivet/EE/EE-9.4.in
+++ b/Tests/Rivet/EE/EE-9.4.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.4
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
 
diff --git a/Tests/Rivet/EE/EE-9.46.in b/Tests/Rivet/EE/EE-9.46.in
--- a/Tests/Rivet/EE/EE-9.46.in
+++ b/Tests/Rivet/EE/EE-9.46.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
diff --git a/Tests/Rivet/EE/EE-91.in b/Tests/Rivet/EE/EE-91.in
--- a/Tests/Rivet/EE/EE-91.in
+++ b/Tests/Rivet/EE/EE-91.in
@@ -1,115 +1,115 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 # ALEPH charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_S2435284
 # OPAL charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1992_I321190
 # DELPHI charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I301657
 # ALEPH main LEP I QCD summary paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3486095
 # ALEPH D*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1999_S4193598
 # OPAL D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I382219
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I382219
 # OPAL charged hadron analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1994_S2927284
 # OPAL Delta++ analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_S3198391
 # OPAL J/Psi analysis analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_S3257789
 # ALEPH eta/omega analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2002_S4823664
 # OPAL K*0 analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3608263
 # OPAL flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3780481
 # OPAL f_0,f_2 and phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3702294
 # OPAL gamma,pi0,eta,eta',rho+/-,a0+/- 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3749908
 # OPAL K0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_S4418603
 # OPAL K* +/-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_I342766
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1996_S3398250
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1999_S3743934
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2004_S5693039
 # OPAL event shapes and multiplicities at different energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # DELPHI strange baryon production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_S3137023
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2006_I719387
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2006_I719387
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524694
 # DELPHI f_0, rho_0 and f_2 production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_S3960137
 # DELPHI K*0 and phi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I420528
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I420528
 # DELPHI f'_2 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I416741
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I416741
 # DELPHI pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I401100
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I401100
 # DELPHI K- K*+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I377487
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I377487
 # DELPHI K+/-, p pbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394052
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394052
 # DELPHI Delta++
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I399737
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I399737
 # DELPHI pi, K p, flavour seperated
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1998_I473409
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1998_I473409
 # OPAL strange baryon production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3396100
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I421977
 # DELPHI tuning paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_S3430090
 # DELPHI b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2011_I890503
 # ALEPH b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2001_S4656318
 # SLD b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2002_S4869273
 # OPAL b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I599181
 # PDG hadron multiplicities and ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
 # OPAL from gluon paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361:PROCESS=QQ
 # L3 eta
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1992_I336180
 # L3 jet rates
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
 # ALEPH pi+-, K+- and (p, anti-p) 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I382179
 # L3 eta' and omega specta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1997_I427107
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1997_I472107
 # charged mult, different # of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1992_I334948
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1992_I334948
 # charged mult, different rapidity regions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I324035
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I324035
 # lambda, lambdabar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I360638
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I360638
 # delphi flavour sep charged
 # lambda, lambdabar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1997_I428178
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1997_I428178
 ##################################################
 # unvalidated 
 ##################################################
 # OPAL 4 jet angles 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_S4553896
diff --git a/Tests/Rivet/EE/EE-JPsi.in b/Tests/Rivet/EE/EE-JPsi.in
--- a/Tests/Rivet/EE/EE-JPsi.in
+++ b/Tests/Rivet/EE/EE-JPsi.in
@@ -1,21 +1,21 @@
 # -*- ThePEG-repository -*-
 # e+ e- -> J/Psi
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEJpsi HwMELepton.so
 set /Herwig/MatrixElements/MEJpsi:VectorMeson /Herwig/Particles/Jpsi
 set /Herwig/MatrixElements/MEJpsi:Coupling  13.60507
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEJpsi
 set EventGenerator:EventHandler:LuminosityFunction:Energy 3.096916
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 do /Herwig/Particles/Jpsi:SelectDecayModes /Herwig/Particles/Jpsi/Jpsi->n0,nbar0; /Herwig/Particles/Jpsi/Jpsi->p+,pbar-; /Herwig/Particles/Jpsi/Jpsi->Sigma0,Sigmabar0; /Herwig/Particles/Jpsi/Jpsi->Lambda0,Lambdabar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*-,Sigma*bar+;  /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*+,Sigma*bar-; /Herwig/Particles/Jpsi/Jpsi->Xi-,Xibar+; /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Xi0,Xibar0; 
 # J/psi-> lambda anti-lambda and sigma anti-sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
 # J/psi -> p pbar and n nbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1113599
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1113599
 # J/Psi -> xi- and Sigma*+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
 # J/Psi -> xi0 and Sigma*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
 # J/psi-> lambda anti-lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1691850
\ No newline at end of file
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1691850
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-Lambdac.in b/Tests/Rivet/EE/EE-Lambdac.in
--- a/Tests/Rivet/EE/EE-Lambdac.in
+++ b/Tests/Rivet/EE/EE-Lambdac.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Lambda_c+,Lambdabar_c-; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Lambda_c+,Lambdabar_c-;
 # Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2006_I693639
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2006_I693639
diff --git a/Tests/Rivet/EE/EE-Omega.in b/Tests/Rivet/EE/EE-Omega.in
--- a/Tests/Rivet/EE/EE-Omega.in
+++ b/Tests/Rivet/EE/EE-Omega.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Omega-,Omegabar+; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Omega-,Omegabar+;
 # Omega decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HyperCP_2005_I677384
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HyperCP_2005_I677384
diff --git a/Tests/Rivet/EE/EE-Phi.in b/Tests/Rivet/EE/EE-Phi.in
--- a/Tests/Rivet/EE/EE-Phi.in
+++ b/Tests/Rivet/EE/EE-Phi.in
@@ -1,22 +1,22 @@
 # -*- ThePEG-repository -*-
 # e+ e- -> phi
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEPhi HwMELepton.so
 set /Herwig/MatrixElements/MEPhi:VectorMeson /Herwig/Particles/phi
 set /Herwig/MatrixElements/MEPhi:Coupling  13.60507
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPhi
 set EventGenerator:EventHandler:LuminosityFunction:Energy 1.019461
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 # phi -> eta pi0 gamma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2009_I818106
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I525398
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I525398
 # phi -> pi0 pi0 gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2002_I585183
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I527094
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2002_I585183
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I527094
 # KLOE phi -> pi0 dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416825
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416825
 # KLOE phi -> eta dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2014_I1317236
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2014_I1317236
 # phi -> pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2001_I558279
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2001_I558279
diff --git a/Tests/Rivet/EE/EE-Psi2S.in b/Tests/Rivet/EE/EE-Psi2S.in
--- a/Tests/Rivet/EE/EE-Psi2S.in
+++ b/Tests/Rivet/EE/EE-Psi2S.in
@@ -1,19 +1,19 @@
 # -*- ThePEG-repository -*-
 # e+ e- -> psi(2S)
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEPsi2S HwMELepton.so
 set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
 set /Herwig/MatrixElements/MEPsi2S:Coupling  13.60507
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
 set EventGenerator:EventHandler:LuminosityFunction:Energy 3.77
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 do /Herwig/Particles/psi(2S):SelectDecayModes /Herwig/Particles/psi(2S)/psi(2S)->n0,nbar0; /Herwig/Particles/psi(2S)/psi(2S)->p+,pbar-; /Herwig/Particles/psi(2S)/psi(2S)->Sigma0,Sigmabar0; /Herwig/Particles/psi(2S)/psi(2S)->Lambda0,Lambdabar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*-,Sigma*bar+;  /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*+,Sigma*bar-; /Herwig/Particles/psi(2S)/psi(2S)->Xi-,Xibar+; /Herwig/Particles/psi(2S)/psi(2S)->Xi0,Xibar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0;
 # psi(2S) -> lambda anti-lambda and sigma anti-sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
 # psi(2S) -> p pbar and n nbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762
 # psi(2S) -> xi- and Sigma+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
 # psi(2S) -> xi0 and Sigma*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
diff --git a/Tests/Rivet/EE/EE-Upsilon.in b/Tests/Rivet/EE/EE-Upsilon.in
--- a/Tests/Rivet/EE/EE-Upsilon.in
+++ b/Tests/Rivet/EE/EE-Upsilon.in
@@ -1,22 +1,22 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73015*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73015*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.45
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 # set hard process
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon
 set /Herwig/MatrixElements/MEUpsilon:Coupling 41.15810
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2669951
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/EE/EE-Upsilon2.in b/Tests/Rivet/EE/EE-Upsilon2.in
--- a/Tests/Rivet/EE/EE-Upsilon2.in
+++ b/Tests/Rivet/EE/EE-Upsilon2.in
@@ -1,17 +1,17 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.01163*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.01163*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(2S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 62.7291136761
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2669951
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
diff --git a/Tests/Rivet/EE/EE-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in
--- a/Tests/Rivet/EE/EE-Upsilon4.in
+++ b/Tests/Rivet/EE/EE-Upsilon4.in
@@ -1,50 +1,50 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # ARGUS pi,K, proton
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2653028
 # ARGUS K*, rho, omega
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 # various semileptonic decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632
 # BELLE b->s gamma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289
 # BES D -> K, pi semi-leptonic
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425
 # eta/omega dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
 # BES eta' dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1364494
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1641075
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1641075
 # BES J/psi dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
 # multiplicities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES
 # BES multiplicty in eta_c decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880
 # eta -> pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
 # kaons in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
 # # MC analyses based on old internal ones
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Meson_Meson_Leptons_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_OmegaPhia1_3Pion_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_D_Dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Eta_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Onium_PiPi_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Semi_Leptonic_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102
diff --git a/Tests/Rivet/EE/EE-Xi0.in b/Tests/Rivet/EE/EE-Xi0.in
--- a/Tests/Rivet/EE/EE-Xi0.in
+++ b/Tests/Rivet/EE/EE-Xi0.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Xi0,Xibar0; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi0,Xibar0;
 # Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA48_2010_I868871
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA48_2010_I868871
diff --git a/Tests/Rivet/EE/EE-Xic0.in b/Tests/Rivet/EE/EE-Xic0.in
--- a/Tests/Rivet/EE/EE-Xic0.in
+++ b/Tests/Rivet/EE/EE-Xic0.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Xi_c0,Xi_cbar0; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi_c0,Xi_cbar0;
 # Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I537236
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I537236
diff --git a/Tests/Rivet/EE/EE-Xim.in b/Tests/Rivet/EE/EE-Xim.in
--- a/Tests/Rivet/EE/EE-Xim.in
+++ b/Tests/Rivet/EE/EE-Xim.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Xi-,Xibar+; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi-,Xibar+;
 # Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E756_2000_I530367
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E756_2000_I530367
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 17.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.5
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
@@ -1,10 +1,10 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.0
 ##################################################
 # select the analyses 
 ##################################################
 # L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/python/rivet_check.script b/Tests/python/rivet_check.script
--- a/Tests/python/rivet_check.script
+++ b/Tests/python/rivet_check.script
@@ -1,99 +1,106 @@
 #!/usr/bin/python
 import glob,subprocess,os,optparse
 
 op = optparse.OptionParser(usage=__doc__)
 op.add_option("--obsolete", dest="obsolete" , default=False, action="store_true" , help="Warn if obsolete analyses not included")
 op.add_option("--search", dest="search" , default=False, action="store_true" , help="Warn if search analyses not included")
 op.add_option("--heavy-ion", dest="heavy_ion" , default=False, action="store_true" , help="Warn if heavy ion analyses not included")
 op.add_option("--MC", dest="MC" , default=False, action="store_true" , help="Warn if MC analyses not included")
 op.add_option("--print-descriptions", dest="output" , default=False, action="store_true" , help="Print analysis descriptions")
 opts, args = op.parse_args()
 
 # analyses to skip
 skip = [ "ATLAS_2010_I849050", # alias
          "TOTEM_2012_002"    , # alias
          "TEST"              , # test analysis
         ]
 searches=["ALEPH_2016_I1492968"]
 
 
 p=subprocess.Popen(["rivet","--list"],stdout=subprocess.PIPE)
 analyses={}
 for line in p.communicate()[0].split("\n") :
     line=line.strip()
     if(line=="") : continue
     temp =  line.split(None,1)
     if(len(temp)==2) :
         analyses[temp[0].strip()] = temp[1].strip()
     elif(len(temp)==1) :
         analyses[temp[0].strip()] = ""
     else :
         print line
         quit()
 
 # main line hw analyses at high energy
 hw_analyses={}
 files=[]
 for idir in glob.glob("Rivet/*") :
     if( "Powheg" in idir or "MCatNLO" in idir) : continue
     if ( not os.path.isdir(idir) ) : continue
     if ( "Templates" in idir ) : continue
     for ifile in glob.glob("%s/*.in" % idir) :
         fshort=ifile.split("/")[-1].replace(".in","")
         files.append(fshort)
         file=open(ifile)
         line=file.readline()
         while line:
-            if("RivetAnalysis:Analyses" in line) :
+            if("RivetAnalysis:Analyses" in line and line[0]!="#") :
                 line=line.strip().split()
                 anal = line[-1].strip().split(":")[0]
                 if(anal not in hw_analyses) :
                     hw_analyses[anal] = [fshort]
                 else :
                     hw_analyses[anal].append(fshort)
             line=file.readline()
 
 anatohepmc = open("anatohepmc.txt",'w')
 hepmctoana = open("hepmctoana.txt",'w')
+not_in_rivet=[]
+for val in hw_analyses.keys() : not_in_rivet.append(val) 
 # check the analyses
 for analysis in sorted(analyses.keys()) :
     # we have it high energy
     if(analysis in hw_analyses) :
         anatohepmc.write("%s %s\n" % (analysis,' '.join(sorted(hw_analyses[analysis]))) )
         if("[OBSOLETE]" in analyses[analysis]) :
             print "WARNING Obsolete analysis %s included : %s" % (analysis,analyses[analysis])
+        if(analysis in not_in_rivet) :
+            not_in_rivet.remove(analysis)
     # obsolete
     elif("[OBSOLETE]" in analyses[analysis]) :
         if(opts.obsolete) : print "Obsolete analysis %s not included : %s" % (analysis,analyses[analysis])
     # searches
     elif("Search" in analyses[analysis] or "search" in analyses[analysis] or analysis in searches) :
         if(opts.search) : print "Search   analysis %s not included  : %s" % (analysis,analyses[analysis])
     # mc only
     elif(analysis[0:3]=="MC_") :
         if(opts.MC) : print "MC   analysis %s not included  : %s" % (analysis,analyses[analysis])
     # examples
     elif("[EXAMPLE]" in analyses[analysis]) :
         continue
     # we don't have it
     else :
         p=subprocess.Popen(["rivet","--show-analysis",analysis],stdout=subprocess.PIPE)
         desc=p.communicate()[0]
         beams=[]
         for line in desc.split("\n") :
             if("Beams:" in line) :
                 beams=line.replace("Beams:","").split()
         nHeavy = sum((part=="Pb" or part=="Au") for part in beams)
         if(nHeavy == len(beams) or nHeavy+1 == len(beams)) :
             if(opts.heavy_ion) : print "Heavy Ion analysis %s not included  : %s" % (analysis,analyses[analysis])
         else :
             print "MISSING ANALYSIS",analysis,analyses[analysis]
             if(opts.output) : print desc
+# outout analyses missing from rivet
+for val in not_in_rivet:
+    print "NOT IN RIVET ",val
 # output second file for rivet
 anatohepmc.close()
 for fname in sorted(files) :
     anals=[]
     for anal in hw_analyses :
         if(fname in hw_analyses[anal]) :
             anals.append(anal)
     hepmctoana.write("%s %s\n" % (fname,' '.join(sorted(anals))) )
 hepmctoana.close()