diff --git a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
index 2b5cbf7aac89407dab6d02127d450076bcb223f4..c9ae148779f540c6357b67344f0c03f61ab1cbca 100644
--- a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
+++ b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
@@ -37,9 +37,10 @@ def CaloWaveformDigiCfg(flags, name="CaloWaveformDigiAlg", **kwargs):
     kwargs.setdefault("CB_n", 1000)
     kwargs.setdefault("CB_sigma", 3.67)
     kwargs.setdefault("CB_mean", 820) # Time in ns
-    kwargs.setdefault("CB_norm", 40)  # Low gain default, use x5? for high gain
+    # This number is over-ridden in the digitization script, so change it there!
+    kwargs.setdefault("CB_norm", 5.0)  # Low gain default without filters, use x5? for high gain
 
-    kwargs.setdefault("base_mean", 15000)
+    kwargs.setdefault("base_mean", 15650)
     kwargs.setdefault("base_rms", 3)
 
     digiAlg = CompFactory.CaloWaveformDigiAlg(name, **kwargs)
diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
index 9ad760cb0cd70181fffeb9e729c19f2302d2653c..1154edd8aad0cd4ac8daadf5559e05ef1cc362b9 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
@@ -131,9 +131,9 @@ acc.merge(FaserSCT_DigitizationCfg(ConfigFlags))
 
 from CaloDigiAlgs.CaloDigiAlgsConfig import CaloWaveformDigitizationCfg
 if args.highCaloGain:
-    calo_norm = 200.
+    calo_norm = 25.
 else:
-    calo_norm = 40.
+    calo_norm =  5.
 acc.merge(CaloWaveformDigitizationCfg(ConfigFlags, CB_norm=calo_norm))
 
 from ScintDigiAlgs.ScintDigiAlgsConfig import ScintWaveformDigitizationCfg
diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
index fd9673559a1650f1fdac25ba682e03c3f25df400..a421cead6c379b8dd56fc2d80ea86bb9ca8ab342 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
@@ -193,9 +193,9 @@ acc.merge(FaserSCT_DigitizationCfg(ConfigFlags))
 
 from CaloDigiAlgs.CaloDigiAlgsConfig import CaloWaveformDigitizationCfg
 if args.highCaloGain:
-    calo_norm = 200.
+    calo_norm = 25.
 else:
-    calo_norm = 40.
+    calo_norm =  5.
 acc.merge(CaloWaveformDigitizationCfg(ConfigFlags, CB_norm=calo_norm))
 
 from ScintDigiAlgs.ScintDigiAlgsConfig import ScintWaveformDigitizationCfg
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi.py b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
index d8cb774850b8b46b94288da30887e3146b7b0c9e..9a1ced5b0ca751c6ff2b975083984c4b9890eee6 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
@@ -130,9 +130,9 @@ acc.merge(FaserSCT_DigitizationCfg(ConfigFlags))
 
 from CaloDigiAlgs.CaloDigiAlgsConfig import CaloWaveformDigitizationCfg
 if args.highCaloGain:
-    calo_norm = 20.
+    calo_norm = 25.
 else:
-    calo_norm = 4.
+    calo_norm = 5.
 acc.merge(CaloWaveformDigitizationCfg(ConfigFlags, CB_norm=calo_norm))
 
 from ScintDigiAlgs.ScintDigiAlgsConfig import ScintWaveformDigitizationCfg
diff --git a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
index efcf2ae9c5e59ab0c425cbcbfc22c24459527b41..e75457ead2dc9ebb44a9a76bfb6abc63e9e23fb2 100644
--- a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
+++ b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
@@ -12,18 +12,18 @@ from WaveformConditionsTools.WaveformCableMappingConfig import WaveformCableMapp
 # 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.
 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 = 5000)
-dict_CB_param["Timing"] =dict(CB_alpha=-0.424, CB_n=6.14, CB_mean=846, CB_sigma=3.21, CB_norm = 5000)
-dict_CB_param["Veto"]   =dict(CB_alpha=-0.32,  CB_n=9.0,  CB_mean=815, CB_sigma=3.35, CB_norm = 4000)
-dict_CB_param["VetoNu"] =dict(CB_alpha=-0.28,  CB_n=1000, CB_mean=815, CB_sigma=5.00, CB_norm = 10000) # copy from Trigger; Veto was not in TestBeam, but in sim "Veto" is the TestBeam Trigger component
-dict_CB_param["Preshower"]=dict(CB_alpha=-0.32, CB_n=1000, CB_mean=846, CB_sigma=4.0, CB_norm = 250)
+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) 
+dict_CB_param["Veto"]   =dict(CB_alpha=-0.32,  CB_n=9.0,  CB_mean=815, CB_sigma=3.35, CB_norm = 6840) 
+dict_CB_param["VetoNu"] =dict(CB_alpha=-0.28,  CB_n=1000, CB_mean=815, CB_sigma=5.00, CB_norm = 7040) 
+dict_CB_param["Preshower"]=dict(CB_alpha=-0.32, CB_n=1000, CB_mean=846, CB_sigma=4.0, CB_norm =  400)
 
 dict_baseline_params = {
-    "Trigger"   : {"mean" : 15000, "rms" : 3},
-    "Timing"    : {"mean" : 15000, "rms" : 3},
-    "Veto"      : {"mean" : 15000, "rms" : 3},
-    "VetoNu"    : {"mean" : 15000, "rms" : 3},
-    "Preshower" : {"mean" : 15000, "rms" : 3},        
+    "Trigger"   : {"mean" : 15650, "rms" : 3},
+    "Timing"    : {"mean" : 15650, "rms" : 3},
+    "Veto"      : {"mean" : 15650, "rms" : 3},
+    "VetoNu"    : {"mean" : 15650, "rms" : 3},
+    "Preshower" : {"mean" : 15650, "rms" : 3},        
     }
 
 # One stop shopping for normal FASER data