diff --git a/DaVinciTests/tests/options/fsrs/test-genfsr.py b/DaVinciTests/tests/options/fsrs/test-genfsr.py
index c46d91c16e36e065f12a8e55280e82d5c1d10786..1690ae4a50a3c98e9df5e7fc04d5c5e0b55ac6c1 100644
--- a/DaVinciTests/tests/options/fsrs/test-genfsr.py
+++ b/DaVinciTests/tests/options/fsrs/test-genfsr.py
@@ -15,15 +15,17 @@ seqGenFSR = GaudiSequencer("GenFSRSeq")
 seqGenFSR.Members += [ "GenFSRMerge" ]
 seqGenFSR.Members += [ "GenFSRLog" ]
 
-from Configurables import LHCbApp
-LHCbApp().DDDBtag   = "dddb-20130929-1"
-LHCbApp().CondDBtag = "sim-20130522-1-vc-md100"
-
 from Configurables import DaVinci
-DaVinci().InputType = "DST"
-DaVinci().DataType  = "2012"
+DaVinci().DataType  = "Upgrade"
 DaVinci().Simulation   = True
+DaVinci().InputType = "LDST"
+DaVinci().Lumi = False
 DaVinci().UserAlgorithms = [seqGenFSR]
 
+from Configurables import LHCbApp, CondDB
+CondDB().Upgrade    = True
+LHCbApp().DDDBtag   = "dddb-20171126"
+LHCbApp().CondDBtag = "sim-20171127-vc-md100"
+
 from PRConfig import TestFileDB
-TestFileDB.test_file_db["genFSR_2012_dst"].run(configurable=DaVinci())
+TestFileDB.test_file_db["genFSR_upgrade_ldst"].run(configurable=DaVinci())
diff --git a/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml b/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
index a8dff5c2763e2625e93f584f7b01b2ebc942794a..ccc1183c8d44898bd19897118fbedec3d5a1e105 100644
--- a/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
+++ b/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
@@ -1,58 +1,48 @@
 <?xml version="1.0"?>
-<!--
-    (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
 <generatorCounters>
   <version>1.1</version>
-  <eventType> 13114005 </eventType>
+  <eventType> 12143001 </eventType>
   <counter name = "all events (including empty events)">
-    <value> 21116 </value>
+    <value> 2206 </value>
   </counter>
   <counter name = "events with 0 interactions">
-    <value> 1702 </value>
+    <value> 1 </value>
   </counter>
   <counter name = "generated events">
-    <value> 19414 </value>
+    <value> 2205 </value>
   </counter>
   <counter name = "generated interactions">
-    <value> 53016 </value>
+    <value> 17000 </value>
   </counter>
   <counter name = "accepted events">
-    <value> 40 </value>
+    <value> 20 </value>
   </counter>
   <counter name = "interactions in accepted events">
-    <value> 120 </value>
+    <value> 196 </value>
   </counter>
   <counter name = "generated interactions with >= 1b">
-    <value> 304 </value>
+    <value> 167 </value>
   </counter>
   <counter name = "generated interactions with >= 3b">
-    <value> 0 </value>
+    <value> 1 </value>
   </counter>
   <counter name = "generated interactions with 1 prompt B">
-    <value> 2 </value>
+    <value> 3 </value>
   </counter>
   <counter name = "generated interactions with >= 1c">
-    <value> 3186 </value>
+    <value> 1625 </value>
   </counter>
   <counter name = "generated interactions with >= 3c">
-    <value> 294 </value>
+    <value> 229 </value>
   </counter>
   <counter name = "generated interactions with 1 prompt C">
-    <value> 246 </value>
+    <value> 40 </value>
   </counter>
   <counter name = "generated interactions with b and c">
-    <value> 50 </value>
+    <value> 46 </value>
   </counter>
   <counter name = "accepted interactions with >= 1b">
-    <value> 42 </value>
+    <value> 21 </value>
   </counter>
   <counter name = "accepted interactions with >= 3b">
     <value> 0 </value>
@@ -61,468 +51,228 @@
     <value> 0 </value>
   </counter>
   <counter name = "accepted  interactions with >= 1c">
-    <value> 12 </value>
+    <value> 24 </value>
   </counter>
   <counter name = "accepted interactions with >= 3c">
-    <value> 0 </value>
+    <value> 4 </value>
   </counter>
   <counter name = "accepted interactions with 1 prompt C">
     <value> 0 </value>
   </counter>
   <counter name = "accepted interactions with b and c">
-    <value> 8 </value>
+    <value> 7 </value>
   </counter>
   <efficiency name = "generator level cut">
-    <after> 20 </after>
-    <before> 170 </before>
-    <value> 0.117647 </value>
-    <error> 0.0247108 </error>
+    <after> 9 </after>
+    <before> 68 </before>
+    <value> 0.132353 </value>
+    <error> 0.0410945 </error>
   </efficiency>
   <counter name = "z-inverted events">
-    <value> 20 </value>
+    <value> 11 </value>
   </counter>
   <efficiency name = "generator particle level cut">
-    <after> 12 </after>
-    <before> 82 </before>
-    <value> 0.146341 </value>
-    <error> 0.0390318 </error>
+    <after> 3 </after>
+    <before> 37 </before>
+    <value> 0.0810811 </value>
+    <error> 0.0448743 </error>
   </efficiency>
   <efficiency name = "generator anti-particle level cut">
-    <after> 8 </after>
-    <before> 88 </before>
-    <value> 0.0909091 </value>
-    <error> 0.0306454 </error>
+    <after> 6 </after>
+    <before> 31 </before>
+    <value> 0.193548 </value>
+    <error> 0.0709583 </error>
   </efficiency>
   <fraction name = "accepted B0">
-    <number> 6 </number>
-    <value> 0.428571 </value>
-    <error> 0.13226 </error>
+    <number> 5 </number>
+    <value> 0.555556 </value>
+    <error> 0.165635 </error>
   </fraction>
   <fraction name = "accepted B0bar">
-    <number> 8 </number>
-    <value> 0.307692 </value>
-    <error> 0.0905151 </error>
+    <number> 5 </number>
+    <value> 0.454545 </value>
+    <error> 0.150131 </error>
   </fraction>
   <fraction name = "accepted B+">
-    <number> 6 </number>
-    <value> 0.428571 </value>
-    <error> 0.13226 </error>
+    <number> 4 </number>
+    <value> 0.444444 </value>
+    <error> 0.165635 </error>
   </fraction>
   <fraction name = "accepted B-">
-    <number> 12 </number>
-    <value> 0.461538 </value>
-    <error> 0.0977675 </error>
-  </fraction>
-  <fraction name = "accepted Bs0">
-    <number> 2 </number>
-    <value> 0.142857 </value>
-    <error> 0.093522 </error>
-  </fraction>
-  <fraction name = "accepted anti-Bs0s">
     <number> 4 </number>
-    <value> 0.153846 </value>
-    <error> 0.0707589 </error>
+    <value> 0.363636 </value>
+    <error> 0.145041 </error>
   </fraction>
-  <fraction name = "accepted anti-b-Baryon">
+  <fraction name = "accepted anti-Bs0s">
     <number> 2 </number>
-    <value> 0.0769231 </value>
-    <error> 0.0522589 </error>
+    <value> 0.181818 </value>
+    <error> 0.116291 </error>
   </fraction>
   <fraction name = "accepted D0">
-    <number> 24 </number>
-    <value> 0.631579 </value>
-    <error> 0.0782518 </error>
+    <number> 9 </number>
+    <value> 0.473684 </value>
+    <error> 0.114549 </error>
   </fraction>
   <fraction name = "accepted D0bar">
-    <number> 10 </number>
-    <value> 0.416667 </value>
-    <error> 0.100635 </error>
+    <number> 7 </number>
+    <value> 0.4375 </value>
+    <error> 0.12402 </error>
   </fraction>
   <fraction name = "accepted D+">
-    <number> 10 </number>
-    <value> 0.263158 </value>
-    <error> 0.0714338 </error>
+    <number> 9 </number>
+    <value> 0.473684 </value>
+    <error> 0.114549 </error>
   </fraction>
   <fraction name = "acceptedD-">
     <number> 8 </number>
-    <value> 0.333333 </value>
-    <error> 0.096225 </error>
+    <value> 0.5 </value>
+    <error> 0.125 </error>
   </fraction>
   <fraction name = "accepted Ds+">
-    <number> 2 </number>
+    <number> 1 </number>
     <value> 0.0526316 </value>
-    <error> 0.0362235 </error>
+    <error> 0.0512278 </error>
   </fraction>
   <fraction name = "">
-    <number> 6 </number>
-    <value> 0.25 </value>
-    <error> 0.0883883 </error>
-  </fraction>
-  <fraction name = "accepted c-Baryon">
-    <number> 2 </number>
-    <value> 0.0526316 </value>
-    <error> 0.0362235 </error>
+    <number> 1 </number>
+    <value> 0.0625 </value>
+    <error> 0.0605154 </error>
   </fraction>
   <fraction name = "accepted B* (L=0, J=1)">
-    <number> 32 </number>
-    <value> 0.842105 </value>
-    <error> 0.0591528 </error>
+    <number> 12 </number>
+    <value> 0.666667 </value>
+    <error> 0.111111 </error>
+  </fraction>
+  <fraction name = "accepted B** (L=1, J=0,1,2)">
+    <number> 1 </number>
+    <value> 0.0555556 </value>
+    <error> 0.0539903 </error>
+  </fraction>
+  <fraction name = "accepted D* (L=0, J=1)">
+    <number> 20 </number>
+    <value> 1 </value>
+    <error> 0 </error>
   </fraction>
   <fraction name = "generated signal events">
-    <number> 26 </number>
-    <value> 0.65 </value>
-    <error> 0.0754155 </error>
+    <number> 11 </number>
+    <value> 0.55 </value>
+    <error> 0.111243 </error>
   </fraction>
   <fraction name = "generated anti-signal events">
-    <number> 14 </number>
-    <value> 0.35 </value>
-    <error> 0.0754155 </error>
+    <number> 9 </number>
+    <value> 0.45 </value>
+    <error> 0.111243 </error>
   </fraction>
   <fraction name = "generator particle level cut">
-    <number> 12 </number>
-    <value> 0.146341 </value>
-    <error> 0.0390318 </error>
+    <number> 3 </number>
+    <value> 0.0810811 </value>
+    <error> 0.0448743 </error>
   </fraction>
   <fraction name = "generator anti-particle level cut">
-    <number> 8 </number>
-    <value> 0.0909091 </value>
-    <error> 0.0306454 </error>
+    <number> 6 </number>
+    <value> 0.193548 </value>
+    <error> 0.0709583 </error>
   </fraction>
   <crosssection name = "generated events">
-    <generated> 53016 </generated>
-    <value> 2.73081 </value>
-    <error> 0.0229082 </error>
+    <generated> 17000 </generated>
+    <value> 7.70975 </value>
+    <error> 0.174509 </error>
   </crosssection>
   <crosssection name = "generated interactions">
-    <generated> 53016 </generated>
-    <value> 2.5107 </value>
-    <error> 0.020431 </error>
+    <generated> 17000 </generated>
+    <value> 7.70626 </value>
+    <error> 0.174395 </error>
   </crosssection>
   <crosssection name = "interactions in accepted events">
-    <generated> 120 </generated>
-    <value> 3 </value>
-    <error> 0.547723 </error>
+    <generated> 196 </generated>
+    <value> 9.8 </value>
+    <error> 2.30043 </error>
   </crosssection>
   <crosssection name = "generated interactions with >= 1b">
-    <generated> 304 </generated>
-    <value> 0.534211 </value>
-    <error> 0.0305511 </error>
+    <generated> 167 </generated>
+    <value> 0.997204 </value>
+    <error> 0.076786 </error>
+  </crosssection>
+  <crosssection name = "generated interactions with >= 3b">
+    <generated> 1 </generated>
+    <value> 0.00597128 </value>
+    <error> 0.00597111 </error>
   </crosssection>
   <crosssection name = "generated interactions with 1 prompt B">
-    <generated> 2 </generated>
-    <value> 0.00351454 </value>
-    <error> 0.00248511 </error>
+    <generated> 3 </generated>
+    <value> 0.0179138 </value>
+    <error> 0.0103417 </error>
   </crosssection>
   <crosssection name = "generated interactions with >= 1c">
-    <generated> 3186 </generated>
-    <value> 5.59867 </value>
-    <error> 0.096162 </error>
+    <generated> 1625 </generated>
+    <value> 9.70333 </value>
+    <error> 0.228917 </error>
   </crosssection>
   <crosssection name = "generated interactions with >= 3c">
-    <generated> 294 </generated>
-    <value> 0.516638 </value>
-    <error> 0.0300473 </error>
+    <generated> 229 </generated>
+    <value> 1.36742 </value>
+    <error> 0.0897512 </error>
   </crosssection>
   <crosssection name = "generated interactions with 1 prompt C">
-    <generated> 246 </generated>
-    <value> 0.432289 </value>
-    <error> 0.0274977 </error>
+    <generated> 40 </generated>
+    <value> 0.238851 </value>
+    <error> 0.0377212 </error>
   </crosssection>
   <crosssection name = "generated interactions with b and c">
-    <generated> 50 </generated>
-    <value> 0.0878636 </value>
-    <error> 0.0124199 </error>
+    <generated> 46 </generated>
+    <value> 0.274679 </value>
+    <error> 0.0404444 </error>
   </crosssection>
   <crosssection name = "accepted interactions with >= 1b">
-    <generated> 42 </generated>
-    <value> 32.6072 </value>
-    <error> 4.05645 </error>
+    <generated> 21 </generated>
+    <value> 10.8763 </value>
+    <error> 2.24265 </error>
   </crosssection>
   <crosssection name = "accepted  interactions with >= 1c">
-    <generated> 12 </generated>
-    <value> 9.31635 </value>
-    <error> 2.55139 </error>
+    <generated> 24 </generated>
+    <value> 12.43 </value>
+    <error> 2.37685 </error>
+  </crosssection>
+  <crosssection name = "accepted interactions with >= 3c">
+    <generated> 4 </generated>
+    <value> 2.07167 </value>
+    <error> 1.02521 </error>
   </crosssection>
   <crosssection name = "accepted interactions with b and c">
-    <generated> 8 </generated>
-    <value> 6.2109 </value>
-    <error> 2.12143 </error>
+    <generated> 7 </generated>
+    <value> 3.62542 </value>
+    <error> 1.34559 </error>
   </crosssection>
   <method> Generation.SignalRepeatedHadronization </method>
-  <generator> Pythia </generator>
+  <generator> Pythia8 </generator>
   <crosssection id = "0">
-    <description> "All included subprocesses   " </description>
-    <generated> 53016 </generated>
-    <value> 93.1635 </value>
-  </crosssection>
-  <crosssection id = "11">
-    <description> "f + f' -> f + f' (QCD)      m" </description>
-    <generated> 6770 </generated>
-    <value> 11.8297 </value>
-  </crosssection>
-  <crosssection id = "12">
-    <description> "f + fbar -> f' + fbar'      m" </description>
-    <generated> 8 </generated>
-    <value> 0.0150626 </value>
-  </crosssection>
-  <crosssection id = "13">
-    <description> "f + fbar -> g + g           m" </description>
-    <generated> 8 </generated>
-    <value> 0.0150626 </value>
-  </crosssection>
-  <crosssection id = "28">
-    <description> "f + g -> f + g              m" </description>
-    <generated> 5996 </generated>
-    <value> 10.4759 </value>
-  </crosssection>
-  <crosssection id = "53">
-    <description> "g + g -> f + fbar           m" </description>
-    <generated> 376 </generated>
-    <value> 0.671218 </value>
-  </crosssection>
-  <crosssection id = "68">
-    <description> "g + g -> g + g              m" </description>
-    <generated> 15224 </generated>
-    <value> 26.5979 </value>
-  </crosssection>
-  <crosssection id = "91">
-    <description> "Elastic scattering          m" </description>
-    <generated> 11226 </generated>
-    <value> 19.8945 </value>
-  </crosssection>
-  <crosssection id = "92">
-    <description> "Single diffractive (XB)     m" </description>
-    <generated> 3972 </generated>
-    <value> 6.90282 </value>
-  </crosssection>
-  <crosssection id = "93">
-    <description> "Single diffractive (AX)     m" </description>
-    <generated> 3762 </generated>
-    <value> 6.90282 </value>
-  </crosssection>
-  <crosssection id = "94">
-    <description> "Double  diffractive         m" </description>
-    <generated> 5392 </generated>
-    <value> 9.39983 </value>
-  </crosssection>
-  <crosssection id = "95">
-    <description> "Low-pT scattering           m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "421">
-    <description> "g + g  -> cc~[3S1(1)] + g   m" </description>
-    <generated> 4 </generated>
-    <value> 0.00225717 </value>
-  </crosssection>
-  <crosssection id = "422">
-    <description> "g + g  -> cc~[3S1(8)] + g   m" </description>
-    <generated> 10 </generated>
-    <value> 0.00969949 </value>
-  </crosssection>
-  <crosssection id = "423">
-    <description> "g + g  -> cc~[1S0(8)] + g   m" </description>
-    <generated> 6 </generated>
-    <value> 0.00979238 </value>
-  </crosssection>
-  <crosssection id = "424">
-    <description> "g + g  -> cc~[3PJ(8)] + g   m" </description>
-    <generated> 12 </generated>
-    <value> 0.0206582 </value>
-  </crosssection>
-  <crosssection id = "425">
-    <description> "g + q  -> q + cc~[3S1(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "426">
-    <description> "g + q  -> q + cc~[1S0(8)]   m" </description>
-    <generated> 2 </generated>
-    <value> 0.00133416 </value>
-  </crosssection>
-  <crosssection id = "427">
-    <description> "g + q  -> q + cc~[3PJ(8)]   m" </description>
-    <generated> 8 </generated>
-    <value> 0.00451094 </value>
-  </crosssection>
-  <crosssection id = "428">
-    <description> "q + q~ -> g + cc~[3S1(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "429">
-    <description> "q + q~ -> g + cc~[1S0(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "430">
-    <description> "q + q~ -> g + cc~[3PJ(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "431">
-    <description> "g + g  -> cc~[3P0(1)] + g   m" </description>
-    <generated> 70 </generated>
-    <value> 0.108637 </value>
-  </crosssection>
-  <crosssection id = "432">
-    <description> "g + g  -> cc~[3P1(1)] + g   m" </description>
-    <generated> 38 </generated>
-    <value> 0.0584779 </value>
-  </crosssection>
-  <crosssection id = "433">
-    <description> "g + g  -> cc~[3P2(1)] + g   m" </description>
-    <generated> 64 </generated>
-    <value> 0.126601 </value>
-  </crosssection>
-  <crosssection id = "434">
-    <description> "q + g  -> q + cc~[3P0(1)]   m" </description>
-    <generated> 6 </generated>
-    <value> 0.0171294 </value>
-  </crosssection>
-  <crosssection id = "435">
-    <description> "q + g  -> q + cc~[3P1(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "436">
-    <description> "q + g  -> q + cc~[3P2(1)]   m" </description>
-    <generated> 14 </generated>
-    <value> 0.0233985 </value>
-  </crosssection>
-  <crosssection id = "437">
-    <description> "q + q~ -> g + cc~[3P0(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "438">
-    <description> "q + q~ -> g + cc~[3P1(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "439">
-    <description> "q + q~ -> g + cc~[3P2(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "461">
-    <description> "g + g  -> bb~[3S1(1)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "462">
-    <description> "g + g  -> bb~[3S1(8)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "463">
-    <description> "g + g  -> bb~[1S0(8)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "464">
-    <description> "g + g  -> bb~[3PJ(8)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "465">
-    <description> "g + q  -> q + bb~[3S1(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "466">
-    <description> "g + q  -> q + bb~[1S0(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "467">
-    <description> "g + q  -> q + bb~[3PJ(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "468">
-    <description> "q + q~ -> g + bb~[3S1(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "469">
-    <description> "q + q~ -> g + bb~[1S0(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "470">
-    <description> "q + q~ -> g + bb~[3PJ(8)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "471">
-    <description> "g + g  -> bb~[3P0(1)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "472">
-    <description> "g + g  -> bb~[3P1(1)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "473">
-    <description> "g + g  -> bb~[3P2(1)] + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "474">
-    <description> "q + g  -> q + bb~[3P0(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "475">
-    <description> "q + g  -> q + bb~[3P1(1)]   m" </description>
-    <generated> 2 </generated>
-    <value> 0.000510403 </value>
-  </crosssection>
-  <crosssection id = "476">
-    <description> "q + g  -> q + bb~[3P2(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "477">
-    <description> "q + q~ -> g + bb~[3P0(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "478">
-    <description> "q + q~ -> g + bb~[3P1(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "479">
-    <description> "q + q~ -> g + bb~[3P2(1)]   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "480">
-    <description> "g + g  -> Psi(2S) + g       m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "481">
-    <description> "g + g  -> Upsilon(2S) + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "482">
-    <description> "g + g  -> Upsilon(3S) + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "483">
-    <description> "g + g  -> Upsilon(4S) + g   m" </description>
-    <generated> 0 </generated>
-    <value> 0 </value>
-  </crosssection>
-  <crosssection id = "485">
-    <description> "g + g  -> psi(3770) + g     m" </description>
-    <generated> 46 </generated>
-    <value> 0.0789658 </value>
+    <description> "Total cross-section" </description>
+    <generated> 17000 </generated>
+    <value> 101.512 </value>
+  </crosssection>
+  <crosssection id = "101">
+    <description> "non-diffractive" </description>
+    <generated> 9634 </generated>
+    <value> 57.1656 </value>
+  </crosssection>
+  <crosssection id = "102">
+    <description> "A B -> A B elastic" </description>
+    <generated> 3703 </generated>
+    <value> 22.5806 </value>
+  </crosssection>
+  <crosssection id = "103">
+    <description> "A B -> X B single diffractive" </description>
+    <generated> 1073 </generated>
+    <value> 6.44236 </value>
+  </crosssection>
+  <crosssection id = "104">
+    <description> "A B -> A X single diffractive" </description>
+    <generated> 1063 </generated>
+    <value> 6.44236 </value>
+  </crosssection>
+  <crosssection id = "105">
+    <description> "A B -> X X double diffractive" </description>
+    <generated> 1527 </generated>
+    <value> 8.88086 </value>
   </crosssection>
 </generatorCounters>