Merge branch 'v50r1-release' into 'Sim09-upgrade'

Documentation and dependencies for v50r1 release

See merge request !175

CMakeLists.txt

@@ -20,10 +20,10 @@ macro(FindG4libs)
 endmacro()
 
 # Declare project name and version
-gaudi_project(Gauss v49r7
+gaudi_project(Gauss v50r1
               FORTRAN
-              USE LHCb v40r1
-                  Geant4 v96r4p4
+              USE LHCb v40r2
+                  Geant4 v96r4p5
               DATA AppConfig VERSION v3r*
                    BcVegPyData VERSION v2r*
                    Det/GDMLData VERSION v1r*

GaussSys/CMakeLists.txt

 ################################################################################
 # Package: GaussSys
 ################################################################################
-gaudi_subdir(GaussSys v50r0)
+gaudi_subdir(GaussSys v50r1)
 
 gaudi_add_test(QMTest QMTEST)

GaussSys/cmt/requirements

 package GaussSys
-version v50r0
+version v50r1
 
 branches cmt doc
 
@@ -71,9 +71,6 @@ use LbLPair             v*   Gen
 # Generators packages: for prompt nuclei production, e.g. Deuteron
 use LbBound             v*   Gen
 
-# Generators packages: for prompt nuclei production, e.g. Deuteron
-use LbBound             v1r0    Gen
-
 # Simulation basic packages
 use GiGa        	v*    Sim     
 use GiGaCnv     	v*    Sim

GaussSys/doc/release_notes.html

@@ -3,6 +3,20 @@ Package : GaussSys
 Package manager : Gloria Corti
 Purpose: LHCb Simulation program
+<P>
+<b>BEWARE: 
+<ul>
+<li>As from version v50r1 (and v49r8 for Sim09) this file is no longer maintained. 
+ The release notes for each individual release can be found in
+ the ReleaseNotes subdirectory of the project.
+<li>As from this version v50r1, the Sim09-upgrade versions are  maintained only in Git,
+in the corresponding branch.
+<li>The package release notes are no longer maintained, look at the Git Merge 
+ Request (MR) comments.
+<li>The package versions are no longer maintained, use the Git commit IDs.
+</ul>
+</b>
+
 !=======================================================================================
 </PRE><H1><A NAME="v50r0">2016-03-29 - GaussSys v50r0</A></H1><PRE>
 <H2><A NAME="Note"Release for Upgrade production. The generator part is identical to 

ReleaseNotes/v50r1.md

+2017-09-19 Gauss v50r1
+===
+**BEWARE:**
+
++ This version exists only in Git, on Sim09 branch
++ The package release notes are no longer maintained, look at the Git Merge Request (MR) comments
++ The package versions are no longer maintained, use the Git commit IDs
+
+## Release for Sim09 compatible productions for the upgrade
+i.e. same generators and Geant4 as Sim09 but new technical features
+
+This version uses projects LHCb v40r2, Geant4 v96r4p5, Gaudi v27r1, LCG_84
+ (HepMC 2.06.09, Root 6.04.02)  
+and data packages SQLDDDB v7r* , ParamFiles v8r* , FieldMap v5r* ,
+ AppConfig v3r* , Geant4Files v96r* , GDMLData v1r* , __XmlVis v2rX__ , 
+ __DecFiles v30rX__ , LHAPDFSets v2r* , BcVegPyData v2r* , GenXiccData v3r* , 
+ PGunsData v1r* , MIBData v3r*
+
+
+This version uses (via LCG_84/MCGenerators):  
+ pythia8 186 (with LHCb Tune1), lhapdf 6.1.4, photos++ 3.56, 
+ tauola++ 1.1.6b.lhcb, pythia 6.427.2,
+ hijing 1.383bs.2, crmc 1.5.6 (epos), alpgen 2.1.4, powhegbox r2092, 
+ herwig++ 2.7.1, thepeg 1.9.2p1, 
+ rivet 2.4.2, yoda 1.5.9  
+and the internal implementation of:
+ EvtGen with EvtGenExtras, AmpGen, Mint;
+ BcVegPy and GenXicc, SuperChic, LPair, MIB
+
+This version is released on **Sim09-upgrade** branch. 
+
+Due to some changes in physics behaviour for some cases, this release is the
+first of the **Sim08c-Up01** productions.  
+Refer to the release notes of <a href="https://gitlab.cern.ch/lhcb/Gauss/tags/v49r8">Gauss v49r8</a> to find out what are those changes 
+
+## Developemts and fixes merged from Sim09 branch
+
+**[MR !174] Port Sim09 developments as from v49r1 to Sim09-upgrade** 
+It includes the MR listed below applied to Sim09 unless listed explicitely as
+cherry-pick of other MRs. 
+
+### Changes and Updates to Generators
+**The version of the generators is fixed but some bug fixes potentially
+change behavior**
+
+**[MR !156] Change major version of DecFiles for new Sim09c**  
+Cherry-pick of !151. 
+This change prevent Gauss v49r8 to work with DecFiles < v30r0 and 
+database tags < dddb-2017-07-DD.
+
+#### Cuts
+
+**[MR !153]  Gencuts code for Bc_JpsiTauNu and background MC**
+Cherry-pick of !137
+
+**[MR !92] Addition of BeautyTo2CharmTomu3h and BeautyTomuCharmTo3h tools to Gen/GenCuts**  
+See LHCBGAUSS-1081
+
+**[MR !80] LHCBGAUSS-1023: Add filter on PT in Xicc generator cuts** 
+Add property for filtering on daughter PT for Xicc generator level cuts in XiccDaughtersInLHCbAndWithMinPT.cpp
+  
+**[MR !74] LHCBGAUSS-1005: LambdacD cut for GenCuts** 
+The goal is to create the DaughtersInLHCbAndCutsForLambdacD after the DaughtersInLHCbAndCutsForDstarD one.
+
+**[MR !18] New cut for *3pi analysis** 
+Code provided by Guy Wormser, see LHCBGAUSS-844
+
+#### Decay: EvtGen, EvtGenExtras, AmpGen
+
+**[MR !118] Register VTOSLL model.**  
+See LHCBGAUSS-1149
+
+**[MR !99] Generalise and simplify daughter ordering in EvtDDalitz**.  
+This bug fix changes DDalitz model for some event types.
+Fixes LHCBGAUSS-1088
+
+**[MR !98] Fixing bug which fails to recognise Bs --> K*bar mu mu as b --> dll transition**.  
+Different behaviour for this decay. 
+See LHCBGAUSS-1097 
+
+**[MR !97] Added parameter in Evtbs2llGammaISRFSR to cut on dimuon mass**.  
+See LHCBGAUSS-1089
+
+**[MR !88] Update particle properties in Pythia8 - EvtGen**.  
+See LHCBGAUSS-1031
+
+**[MR !53] LHCBGAUSS-937: New Bs to J/psi K K model, EvtBsMuMuKK** 
+This contains the new EvtGen model named EvtBsMuMuKK for generating Bs to J/psi K K decays for Sim09. 
+This will also be suitable for the master branch.
+
+**[MR !45] Updates to the EvtFlatQ2 EvtGen model for B to X lepton lepton decays** 
+See LHCBGAUSS-911 
+The EvtFlatQ2 model has been extended to work for any B to X lepton lepton decays to generate a flat q2 distribution
+
+**[MR !72] LHCBGAUSS-980: fix wrong uncertainty of fit fractions in AmpGen**
+To merge also into Sim09-upgrade as well as master
+
+**[MR !52] LHCBGAUSS-910: Added D02KKpipi model to AmpGen** 
+Add the D02KKpipi model to AmpGen in Sim09 and also into the master branch.
+
+**[MR !44] Fixes in AmpGen**  
+Cherry-pick of !41. See LHCBGAUSS-905:
+
+- Fixes WS normalisation and automatic normalisation of PDFs.
+- Move parameter resolution code into a separate function.
+- Minor code cleanups.
+
+
+**[MR !29]New Amplitude model for D -> pi pi pi**
+Cherry-pick of !26. Details at LHCBGAUSS-838: 
+New Amplitude model from Tim Evans.
+It consist of two package Gen/AmpGen and Gen/LbAmpGen available in EvtGen via EvtGenExtras.
+Changes in requirements and cmake build added (made with Marco Clemencic). 
+
+
+**[MR !28] Modifications to EvtTauolaEngine for the B to tau tau physics analysis**
+Code changes to `EvtTauolaEngine` in EvtGen to allow the B to tau tau physics analysis to move forward:    
+See LHCBGAUSS-841 
+
+1. It uses the updated BaBar hadronic currents by default. An extra decay file keyword `TauolaCurrentOption` can be used to 
+reset the integer value via `Tauola::setNewCurrents()`. This means that if there is a build of Tauola with the intricate CLEO 
+currents enabled, then the code will be able to use that by setting
+    `Define TauolaCurrentOption -1` in the decay file.
+2. The code also allows the option to set the sub-branching fractions of certain modes via `Tauola::setTaukle`, which will
+improve MC generation efficiency by ignoring unneeded modes, using the decay file keywords `TauolaBRx`, where x = 1,2,3 or 4.
+3. It also contains some code to artificially set the PDG ids of the tau parents to vector bosons to use internal Tauola 
+spin matrix weights, but this is not enabled by default, since we believe it doesn't do the right spin physics for B decays (we need 
+further feedback from the Tauola developers).
+4. There is also new code in `EvtParticle` to allow the future storage and retrieval of double quantities, such as amplitude 
+weights, via the `setAttributeDouble(name, value)` and `value = getAttributeDouble(name)` functions, although no decay model is
+using this at the moment and will therefore have zero effect on current MC production.
+5. Uses new tauola 1.1.6b.lhcb to allow access to the Cleo intricate model
+
+**[MR !16] Modified EvtHQET2FF in EvtGen**
+see LHCBGAUSS-814
+
+**[MR !15] Allow setting charmonia polarization**
+Code changes to Gen/Generators/src/component/EvtGenDecay.cpp to allow polarization of any charmonium vector particles for Sim09. 
+Details at LHCBGAUSS-831    
+
+#### Production: Pythia8, Particle Gun, EPOS
+
+*[MR !25] Fix for min/max particle masses* 
+Bug fix that has as effect to truncate mass of Bs excited states 
+See LHCBGAUSS-857
+
+**[MR !161] Add tilt option for particle gun**
+Cherry-pick of !134
+
+**[MR !132] Fix MomentumSpectrum to not generate the same particle twice**.  
+Closes LHCBGAUSS-842
+
+**[MR !128] Fix setting of seed in MomentumSpectrum**  
+
+**[MR !131] Fix pgun energy according to what set in Gauss().Beam**.  
+This bug fix changes behaviour of pgun for beam energies > 3.5 TeV.  
+Fixes LHCBGAUSS-1155
+
+**[MR !93] Fix typo in EPOS.py (LbCRMC package)**.  
+See LHCBGAUSS-1083
+
+**[MR !81] LHCBGAUSS-1021: Improvement of signal embedding** 
+Improve signal embedding by allowing signal particles with displaced vertices with respect to the primary vertex.
+Needed for production of signal with EPOS.
+  
+**[MR !73] LHCBGAUSS-952: Improve EPOS options** 
+Improve the EPOS.py option file to generate charmonium, bottomium, Z , W and Drell Yan
+
+**[MR !57] LHCBGAUSS-772: PbPb peripheral events by default** 
+Generate by default peripheral PbPb events
+
+**[MR !42] Improve ImpactParam_PERIPH.py option file** 
+related to LHCBGAUSS-657 and LHCBGAUSS-894 
+
+ - To be propagated to master and Sim09 branches
+ - Improvements have been made in the ImpactParam_PERIPH.py option files which purpose is to define centrality cuts in EPOS 
+for PbPb.
+ - Those changes have been made to account for all possible configurations of EPOS which have been deployed in the new EPOS.py
+file
+
+**[MR !35] New EPOS option file and code for fixed target configuration** 
+See LHCBGAUSS-894 
+Add new EPOS.py generic option file in Gen/LbCRMC which creates automatically the correct configuration for EPOS based on:
+
+ - beam momentum to define the fixed target or collisionner mode
+ - event type to generated minimum bias events or to embed Pythia8 signal events with EPOS underlying event
+
+**[MR !14] J/Psi with EPOS** 
+New options to produce J/Psi with Pythia8 and merge them in EPOS. Clean up of unused files.
+
+**[MR !13] Avoid crashes in EvtGen with EPOS**
+Fixing the energy of the particle to avoid crash in EvtGen, see LHCBGAUSS-772
+
+**[LHCBGAUSS-683] Imported first version of new Gen/LbBound package for nuclei bound stated from master**
+
+**[LHCBGAUSS-772] Fixes random number seed and options for Pb-Pb test productions with CRMC/EPOS**
+
+**[MR !37] LHCBGAUSS-906: Add BeamSpotMarkovChainSampleVertex**
+Corresponds to cherry-picked !60 in Sim09. 
+Adds a new beamspot smearing tool that implements a fully correlated (x,y,z,t) sampling using a Markov Chain sampler 
+and a full 4D PDF that describes the intersection of two bunches. 
+It can be optionally used.
+
+**[MR !10} Use new version of GenTune requiring Rivet 2. and new dependency on yoda**
+See details also in LHCBGAUSS-598
+
+### New fast Simulation option
+**[MR !85] ReDecay support for SignalRepeatedHadronization**.  
+See LHCBGAUSS-1041
+
+**[MR !58] LHCBGAUSS-955: Re-use of the underlying event** 
+This merge request contains the code for re-using the underlying event and only simulating the signal parts again. 
+The main part of the code exists in its own package `Sim/GaussRedecay` with only minimal changes to existing parts of Gauss except 
+the main Gauss Configurable. 
+
+For running the code and remaining issues look in the merge request itself.
+
+#### Slides to clarify the procedure
+- <a href="https://indico.cern.ch/event/588836/contributions/2374451/attachments/1377416/2092184/reuse_update.pdf"> Fast simulation meeting 24.11.2016</a>
+- <a href="https://indico.cern.ch/event/576720/contributions/2334442/attachments/1354566/2046421/redecay_report_13_10_16.pdf">Fast simulation meeting 13.10.2016</a>
+- <a href="https://indico.cern.ch/event/442259/contributions/2159561/attachments/1270722/1882889/available_fast_mc.pdf">A&S week 10.5.2016</a>
+- <a href="https://indico.cern.ch/event/505110/contributions/1183150/attachments/1256852/1855758/SignalRedecay.pdf">Simulation meeting 12.4.2016</a>
+
+
+### Monitoring and tests
+**[MR !109] Adds running over different EM physics lists and other small changesfor MSc in Muon system**.  
+See LHCBGAUSS-874     
+
+**[MR !108] Tests for EM think layers and Brems**.  
+See LHCBGAUSS-1120     
+
+**[MR !105] Updated Labelling of Plots and Unlocked further plots in Target tests**.  
+See LHCBGAUSS-869
+
+**[MR !82] Updates to Hadronic Multiplicity and Cross Section Test**.  
+See LHCBGAUSS-869
+
+**[MR !68] LHCBGAUSS-874: Muon/MuonMoniSim**
+Adds options file to run Muon Hit and MultipleScattering Checkers in Gauss and a script runmuontest.py to run Gauss using these 
+options. 
+Tested locally and working with CMT and CMake.
+    
+**[MR !71] LHCBGAUSS-878: Matteo's update to the MonitorTiming for Sim09**
+Latest revision of the detailed timing test (MonitorTiming) for Sim09
+    
+**[MR !62] Simchecks package add missing aliases**
+
+**[MR !63] Fix simchecks radlength test**
+
+**[MR !12] Fix issues for GenTune for qmtest**
+fix options and qmtest directories as in v3r0 on svn, see LHCBGAUSS-598
+
+### Code modernization and maintenance
+
+**[MR !163] Port Superchic index and doxygen fixes from master**
+Cherry-pick of !157.   
+
+**[MR !159] Remove EPOS obsolete options**
+Cherry-pick of !150
+
+**[MR !139] Fix missing configurables for upgrade Cherenkov algorithms**  
+
+**[MR !170] Fix build with latest LbScripts**  
+Cherry-pick of !91
+
+**[MR !83] use Vis/XmlVis as a data package**.  
+See LHCBPS-1696.
+
+**[MR !75, !65, !56] Superseeded by later MR** 
+Options and examples updates.
+
+**[MR !30] Remove script and template for new event type tests from Gauss as well as its execution** 
+Cherry-pick of !27. See LHCBGAUSS-838: 
+Remove script and template for new event type tests and executing the script from the cmt requirements. 
+This in not only no longer necessary since they are done in dedicated DecFilesTests
+project but it also creating problems in making the web page test reporting when building with cmake. 
+
+**[Commit 43f1e77d]Update Gauss-DEV.py to use latest 2016 tags**
+
+**[Commit fd3f764f]Update CMakeLists.txt to set the PYTHIA8DATA environment that is used by EvtGen**
+
+**[MR !11]Solving project dependency issues for cmake**
+
+## Developments from master (including in svn head before switching to Git) or specific fixes
+
+### Generators
+
+**[MR !165] Port options of Hijing for production from master**
+Update of the Hijing configuration file to be compatible with the new HI Gauss version
+
+**[MR !154] Update CMakeLists.txt to add dependency for run time**
+
+### Monitoring and tests
+
+**[MR !152] Port from master in Sim09-upgrade changes in VPMoniSim**
+
+### Code optimization, modernization and maintenance
+
+**[MR !174] Update of nightly tests references**
+
+**[MR !169] Add local tag for faster RICH** 
+
+**[MR !173] Port update of GaussGeo from master (its use off by default)**
+
+**[MR !171] Utilise GaussGeo in Gauss Configurable**
+
+**[MR !164] Port RICH fast options into Sim09-upgrade**
+Only changes in Gauss() configurable
+
+**[MR !142] Port all fast RICH and make file changes to upgrade**  
+This includes what was committed in svn master, i.e. 
+Created a GaussRICH and a GaussCherekkov configurable. They have simiar various options allowing to run the RICH simulation for
+the current and upgrade detectors at 4 different speeeds which can be set from the Gauss Configurable.
+
+- The **Formula1** option has creation of most of the parameters for RICH specific studies switched off, including
+assigning the location of 'auxiliary classes' like  /Event/MC/Rich/OpticalPhotons at the output.
+It also has the histogram monitoring switched off. Using this option for standard production may need
+some changes in the RICH reconstrution and overall Gauss Configuration to avoid potential crashes from non-existant classes. 
+This option is not used by default for now.
+- The **GTB** option is similar to 'Formula1', but has the monitoring and auxiliary classes switched on. 
+This is the current default option. 
+Some of the auxiliary information stored will not be the correct values, but just some defaults. But this is OK for large scale
+physics simulations where such information is not needed.
+- The **SUV** option is similar to GTB, but has all the auxiliary information created and filled using some step actions. 
+This may be used for RICH specific studies using RICH reconstruction. This is a bit slower than GTB and mostly corresponds to 
+what was activated so far.
+- The **HGV** option has most of the extra processing for RICH studies in simulation activated. 
+There are also options available to activate even more step actions for special simulation studies. 
+- The 'clunker' option is available from the Gauss configurable for backward compatibility. 
+This allows the options files used so far, to be activated.
+Hence these  options files are kept in the 'options' area.
+- The 'FareFiasco' option allows to switch off the RICH specific processes, including creation of optical photons. 
+This is essentially for the running of Gauss without RICH simulation. 
+     
+The GaussRICH configurable gets the 'year' of the data to simulate from the Gauss DataType. This automatically sets things
+like the activation of aerogel, amount of scintillation yield fraction in RICH2 as appropriate. It is also possible override
+these settings for special runs, if needed.  The configurable also takes care of the Gauss Configurations
+when the RICH geometry is not present or Geant4 is skipped.
+- When the aerogel is switched off, in order to avoid some useless print statements there is a file named
+`$GAUSSROOT/xml/SimulationRICHAerogelOff.xml` which is automatically activated. The older name for this file
+was `SimulationRICHesOff.xml` in the same area, which is a confusing name since it does not switch off the RICH;
+but this file still kept for backward compatibility.
+
+The GaussCherenkov configurable only has the 'Upgrade' datatype and so the year of the data is set as 2022. The aerogel
+is automatically switched off. An options file to set the various options Binary Readout options is made available.
+The default setup does not require this options file
+
+Many improvements in the algorithms to speed up the RICH2 simulation in particular:  
+- Added new track action named RichG4TrackActionRich2Photon which suppresses some of the photons created
+by scintillation process in RICH2, which are not expected to reach the detector plane.
+- Modified RichG4TrackActionRich2Photon and GiGaPhysConstructorOp so that the suppression factor from efficiency losses
+is transferred to the scintillation process, when creating that process. This is to reduce the creation of extra photons,
+instead of suppressing them after they are created in their first step. A good fraction of the scintillation photons
+which do not go to the detector plane die in their first step after reaching the vessel edge.
+- Added a trackaction RichG4TrackActionRich2DbgPhotonTrack and a step action named RichG4StepAnalysis15. for debugging purpose. 
+This is to study the effect of killing rich2 photons. This is not actived by default and is for special studies only.
+- The pixel efficiency and the readout efficiencies seen in data updated into RichG4TrackActionPhotOpt at pre-user trackaction 
+level. The corresponding suppressions are avoided at the hit level in the RichHpdSiEnergyLoss so that there is no
+double suppressions (double counting) for these efficiencies. 
+- The Max of the mirror reflectivites are also included in
+RichG4TrackActionPhotOpt at pre-user trackaction level.
+The default max efficiencies are set to 1.0 so that there is no suppression.
+But when the max efficienies as listed in the recent DB is read in, those
+values are used. In the same database update, new mirror reflectivity tables 
+are activated where the reflectivities are scaled up accordingly so that there is no double counting of the effect 
+from the max reflectivities. As a result the program can be run with or
+without the new database update for RICH. 
+When the new database update is used, the cpu time is improved.
+
+
+
+**[MR !148] Fix missing configurables for upgrade Cherenkov algorithms**
+
+**[MR !167] Update options and tests for upgrade detector**
+
+**[MR !154] Update CMakeLists.txt to add dependency for run time**
+
+**[MR !141] Fixes in view of Sim10Dev when using Gaudi v28 and LHCb v42r3**
+Mostly changes from `endreq` to `endmsg`
+    
+**[MR !136] Fixes for upgrade cmake**
+

Sim/Gauss/CMakeLists.txt

 ################################################################################
 # Package: Gauss
 ################################################################################
-gaudi_subdir(Gauss v49r5)
+gaudi_subdir(Gauss v50r1)
 
 find_package(HepMC)
 

Sim/Gauss/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Gloria Corti (Patrick Robbe, Paul Szczypka) 
 #============================================================================
 package Gauss
-version v49r6
+version v50r1
 
 #============================================================================
 #-- Structure

cmt/project.cmt

 project GAUSS
 
-use LHCB	LHCB_v40r1
-use GEANT4	GEANT4_v96r4p4
+use LHCB	LHCB_v40r2
+use GEANT4	GEANT4_v96r4p5
 
 build_strategy	with_installarea
 setup_strategy	root