Merge branch 'prepare_v9r0' into 'master'

Prepare v9r0

See merge request !263

CMakeLists.txt

@@ -9,5 +9,5 @@ find_package(GaudiProject)
 #set_property(DIRECTORY PROPERTY GAUDI_IGNORE_SUBDIRS GaudiPolicy)
 
 # Declare project name and version
-gaudi_project(Urania v8r0)
+gaudi_project(Urania v9r0)
 

ReleaseNotes/v9r0.md

+2019-11-16 - Urania v9r0
+========================================
+Based on LCG96b, released on master branch.
+
+## Updates and new features:
+
+- Fix warnings, !262 (@clemenci)   
+  
+
+- clang8 PIDCalib update, !261 (@dhill)   
+  
+
+- Add Run2 p_CombDLL MC templates, !260 (@poluekt)   
+  Add Run2 p_CombDLL MC templates
+
+- Fix warnings, !259 (@clemenci)   
+  please note that I only fixed the `auto_ptr` warning in file that are compiled, but there are several other occurrences of `auto_ptr` which should be addressed.
+
+- Update CMake support modules to latest Gaudi, !258 (@clemenci)   
+  This fixes build problems with avx512 and latest ROOT (in LCG dev slots).  
+    
+  It also updates the default LCG version to 96b.
+
+- IncLC PIDCalib update, !257 (@dhill)   
+  
+
+- removing DecRateCoeff, !256 (@adudziak)   
+  Removing obsolete class; DecRateCoeff from the B2DXFitters   
+  cc: @kheinick, @cofitzpa
+
+- PIDCalib bad_alloc fix, !255 (@dhill)   
+  
+
+- Add Lb->JpsipK proton MC sample for Run2, !254 (@poluekt)   
+  Add Lb->JpsipK proton MC sample for Run2  
+  Update web pages scripts
+
+- Pid calib hlt12 unbias update, !252 (@dhill)   
+  
+
+- B2DXFitters: change for Lb2Dsp, !251 (@jobutter)   
+  Changed MassFitUtils to be able to make Lb2Dsp Signal workspaces.  
+  - ID cuts need to be the same as Bs2DsPi  
+  - TrueID cuts need to remain Lb2Dsp
+
+- Replace RooFIter with suggested RooAbsCollection iterators, !250 (@kheinick)   
+  The copy constructor was deleted in a recent ROOT version. This commit will  
+  fix the nightly errors such as [lhcb-head/...](https://lhcb-nightlies.cern.ch/logs/build/nightly/lhcb-head/2371/x86_64-centos7-gcc8-opt/Urania/#show_PhysFit_B2DXFitters/PhysFit_B2DXFitters_24) by using [the recommended](https://root.cern.ch/doc/master/classRooAbsCollection.html#a04ad1690e3cc8a8c241fba66829345fd) [RooAbsCollection itertaros](https://root.cern.ch/doc/master/classRooAbsCollection.html#ab9285688148539b2da6fc0f3fd35aeeb).  
+    
+  I was unable to test these changes though, because I have no experience with the `DecRateCoeff.cxx` class (but use the `DecRateCoeff_Bd.cxx` through the `runSFit_new.py` scrip...). So if any expert has scripts available that actually use this implementation, a quick check to see if everything works as expected would probably be good.  
+    
+  Ping @cvazquez @adudziak @mfuehrin.
+
+- bug fix: `treename` overwrite was flawed for multiple tracks, !249 (@nmeinert)   
+  `treename` has to be reset to `input_tree` for each `input_file` in `files`, but updated corresponding to the temporary file that is created for each track in `tracks`.
+
+- Bug fix: `Run2.Config.configs` is a function, !248 (@nmeinert)   
+  `Run1.Config.configs` is of type `dict`, whereas `Run2.Config.configs` is a function. Additional parentheses are thus necessary.
+
+- Variable `treename` is overwritten in the for loop and thus changes the..., !247 (@nmeinert)   
+  Variable `treename` is overwritten in the for loop and thus changes the provided `input_tree` name for the second and following files.  
+  Only affect cases when more than one file in provided in `files`.
+
+- update of Bd2DPiConfigForNominalMassFit.py, !246 (@abertoli)   
+  
+
+- PIDGen updates, !245 (@poluekt)   
+  
+
+- update  of lb2lcpi for run1, allowing sim/combined fit to run1 and run2, !244 (@adudziak)   
+  - update config files and README for Lb2LcPi Run1 and MC,   
+  - small fix bugs in prepareWorkspace (when calling --year)  
+  - allowing sim/combined fits to Run1 and Run2
+
+- small fix for plotting, !243 (@adudziak)   
+  Small fix for plotting results.
+
+- config files for Lb2Dsp, !242 (@adudziak)   
+  Update of config files for BR(Lb2Dsp) measurement
+
+- prepare workspace flexibility, more config files and readme updates, !241 (@adudziak)   
+  prepareWorkspace:  
+  - allow to handle one year, despite config file (if needed)  
+  - move to ArgumentParser()   
+    
+  more cleaning up in config files and README
+
+- config files update, !240 (@adudziak)   
+  Config files updates, after some minor changes.  
+  (sorry for the amount of MRs...)
+
+- Readme for Lb2LcPi fits, !239 (@adudziak)   
+  It is just readme how to use the code.
+
+- Modification for Lb2Dsp and flexible usage of Run2 data, !238 (@adudziak)   
+  - fixing lumi problem (@kheinick - your fix did not full work, sorry)   
+  - allowing flexible combination of run 2 merging (all 4 years can be merged, any mixture of them etc)   
+  - new config files for Lb2Dsp analysis:  
+    - Lb2LcPi   
+    - Bs2DsPi   
+    - Bs2DsK  
+  - update of Lb2Dsp config files  
+    
+  cc: @tszumlak @pkopciew @jobutter 
+
+- Fix for mu_CombDLLmu_IsMuon sample for Run 1, !237 (@mmaterok)   
+  Cutstrings supplied in the [Run1 Config](PIDCalib/PIDPerfScripts/scripts/python/PIDGenExpert/Run1/Config.py) are not applied in the [MakeTuples.py](PIDCalib/PIDPerfScripts/scripts/python/PIDGenExpert/Run1/MakeTuples.py) script.   
+  This merge request fixes this issue for the function "convert_single_file" but does not do it in the function "convert_calo_file".  
+    
+  In the [Run1 Config](PIDCalib/PIDPerfScripts/scripts/python/PIDGenExpert/Run1/Config.py) the cutstring is also given incorrectly. This is also corrected for in the merge request.
+
+- Update cmake folder from Gaudi/master, !236 (@cvazquez)   
+  
+
+- Config files for Delta Gamma_s measurement, !235 (@adudziak)   
+  Config files for performing Bs2DsPi MDFit for Delta Gamma_s   
+  @abertoli , @lik
+
+- Bs2DsPi signal config files, !234 (@adudziak)   
+  missing bs-dspi signal MC config files
+
+- Add first version of more general simultaneous sFit, !233 (@kheinick)   
+  Ping @adudziak.  
+    
+  Just as in !232, the FT parameters are still WIP.  
+    
+  After the updates you can run the sFit via  
+  ```  
+  ../../../run python runSFit_new.py --configName ../data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAccSimFit.py \  
+  --mode nonres phipi kstk kpipi pipipi --year 20152016 2017 2018 --pol both --merge pol --debug \  
+  --fileName /eos/lhcb/wg/b2oc/DsK_Run2/sWeights_withOSCombination/sWeights_Bs2DsPi_20152016_LifetimeConsD.root /eos/lhcb/wg/b2oc/DsK_Run2/sWeights_withOSCombination/sWeights_Bs2DsPi_2017_LifetimeConsD.root /eos/lhcb/wg/b2oc/DsK_Run2/sWeights_withOSCombination/sWeights_Bs2DsPi_2018_LifetimeConsD.root \  
+  --pereventmistag --pereventterr -s WS_sFit_Bs2DsPi_simfit.root -j 16 --treeName data_sweight --sim  
+  ```
+
+- Add simfit config for 2018, !232 (@kheinick)   
+  Hey @adudziak this is a slightly adjusted sFit config for 2018. I have updated the Twiki accordingly already.
+
+- update configs for Bs2DsPi, !231 (@adudziak)   
+  - update luminosity ratio in Bs2DsPiConfigForNominalMassFit.py  
+  - fix weighting in Bs2DsPiConfigForMCWorkspace.py (lab3 for Bd->DPi, Lb->LcPi)   
+  - remove exp(log(x)) from workspace preparation   
+    
+  cc: @kheinick
+
+- Poluekt pidgen, !230 (@poluekt)   
+  
+
+- config files for bs2dspi, !229 (@adudziak)   
+  Update configuration for data preparation:  
+    
+  - with LifetimeFitConsD variables (Bs2DsPiConfigForDataWorkspaceLifetimeConsD.py)   
+  - with LifetimeFit variables  (Bs2DsPiConfigForDataWorkspaceLifetimeNoConsD.py)   
+  - remove Bs2DsPiConfigForDataWorkspace.py   
+  - clean up of Bs2DsPiConfigForNominalMassFitOtherSignalParametrizations.py (takes everything from Bs2DsPiConfigForNominalMassFit.py)    
+  - change baseline LifetimeFit-> LifetimeFitConsD in Bs2DsPiConfigForNominalMassFit.py  
+    
+  cc @kheinick 
+
+- update config files for the final Bs2DsPi MDFit, !228 (@adudziak)   
+  Update of config files for the Delta ms measurement.   
+  cc: @kheinick
+
+- Hotfix for plotSFit and runSFit_new scripts, !227 (@kheinick)   
+  The scripts failed if certain command line options are omitted. This should be fixed (in a hacky way) for now.  
+    
+  IMHO In the long term, the runSFit_new and plotSFit scripts should handle non-simfits and simfits the same way, internally. The workspace of the nonsim fit should more or less look like a simfit with only one category. This could prevent many if-else checks.
+
+- Add mu_CombDLLe templates for Run1 and Run2, !226 (@poluekt)   
+  
+
+- Add DeltaMs-specific B2DXFitter changes, !225 (@kheinick)   
+  This MR implements  
+  - a few new command line arguments for the script:  
+    - runMDFitter  
+      - allow specification of number of cpus used for the fit and the RooFit minimizer  
+    - plotMDFitter  
+      - allow to specify a plot prefix  
+    - prepareWorkspace  
+      - allow to specify a plot prefix and a different temporary directory  
+      - allow to override config file parameters by specifying a json dictionary on the command line  
+  - Bs2DsPi configuration file that are needed for the automated FT-Calibration, 2018 datasets are included  
+  - minor code formatting and some minimal refactoring of configuration parsing
+
+- New templates, !224 (@poluekt)   
+  New templates in Run2:   
+    pi_MC15TuneV1_ProbNNe_Brunel, pi_CombDLLe_Brunel  
+    2018 templates for pi, K
+
+- Update for DsPi Run 2 analysis, !222 (@adudziak)   
+  The merge request:  
+  - updates existing configuration files for Delta m_s analysis,   
+  - adds missing config files (for misID fits, sFit),  
+  - fixes small bugs in Ipatia + JohnsonSU   
+  - allows usage of Ipatia + JohnsonSU  for Bd->Dspi/K bkgs,   
+  - updates sFit for simultaneous fit and Run 2 usage.
+
+- Updated 2017 WGP file path., !220 (@dhill)   
+  
+
+- Add p_CombDLLp for 2017, !219 (@poluekt)   
+  
+
+- Fix PIDCorr.py to include 2017, !218 (@poluekt)   
+  
+
+- Updated call to GetWGPFilesDirac.py to be compatible with LHCbDirac v9r3., !217 (@dhill)   
+  
+
+- Updated call to GetWGPFilesDirac.py to be compatible with LHCbDirac v9r3., !216 (@dhill)   
+  
+
+- Add 2017 MC samples, !215 (@poluekt)   
+  

UraniaSys/CMakeLists.txt

 ################################################################################
 # Package: UraniaSys
 ################################################################################
-gaudi_subdir(UraniaSys v8r0)
+gaudi_subdir(UraniaSys v9r0)
 
 gaudi_depends_on_subdirs(Math/SomeUtils 
                          Phys/A2MuMu