Trying to fix merging conflict

restoring elena's version

restoring elena's version

Putting back some fills

Introduces systematic uncertainty on CCE, however this is merged with the statistical uncertainty to avoid a huge modification of the code

increased dimension of saved vector (11->12) due to introduction of systematic error on equivalent collected charge

Added a fit of pulse shape with poly on degree 3, 4, 5 to estimate systematic error on integral of pulse

[macros/CCEScan/batch] Update environment, use all fills

[macros/CCEScan] Add latest fills

Merge branch 'master' of ssh://git.physik.uzh.ch:8443/egraveri/STAging

[macros/CCEScan/batch] Update env variables

[data/db] Update running conditions to 2017

[data/lumi] Update luminosity data

[macros/runCond] Add code to process 2017 luminosity

[data/lumi] Add 2017 lumi

[macros/runCond] Update to 2017 temperatures

[data/temperature] Update box temperature histories to 2017

[macros/CCEScan/batch] Update to SLURM

[macros/runCond] Fix typo

[macros/runCond] Improve documentation

[macros/CCEScan] Remove unused code

[macros/runCond] Improve documentation

[macros/runCond] Fix typo

[macros/runCond] Add the latest CCE scans to STDatabase.h

Merge branch 'master' of ssh://git.physik.uzh.ch:8443/egraveri/STAging

(WIP) [macros/CCEScan] Clean up Hamburg.C, added radii but need to clean up unnecessary code

Merge branch 'master' of ssh://git.physik.uzh.ch:8443/egraveri/STAging ...

Getting rid of the chi2ndf error correction

Comments + no chi2ndf error correction

Comments + no chi2ndf error correction

Mainly Comments