Fix conflict

Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py

@@ -11,6 +11,8 @@ from WaveformConditionsTools.WaveformCableMappingConfig import WaveformCableMapp
 # Crystalball function Parameters estimated from Deion's slides uploaded at
 # https://indico.cern.ch/event/1099652/contributions/4626975/attachments/2352595/4013927/Faser-Physics-run3933-plots.pdf  (20/01/2022)
 # Parameters are per scintillator source, but not per channel.
+# Updated aamplitudes (norm) to match testbeam response
+# Make everything except VetoNu look like the preshower
 dict_CB_param = {}
 dict_CB_param["Trigger"]=dict(CB_alpha=-0.424, CB_n=6.14, CB_mean=815, CB_sigma=3.21, CB_norm = 4240) 
 dict_CB_param["Timing"] =dict(CB_alpha=-0.424, CB_n=6.14, CB_mean=846, CB_sigma=3.21, CB_norm = 4240)