diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat
deleted file mode 120000
index 6ea9665877..0000000000
--- a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat
+++ /dev/null
@@ -1 +0,0 @@
-2019SF_MC_parameters_electrons.dat
\ No newline at end of file
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat
new file mode 100644
index 0000000000..2151096d0f
--- /dev/null
+++ b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_electrons.dat
@@ -0,0 +1,65 @@
+64
+2.5 0.064635 -0.188093 0.82694
+3.5 0.0484554 -0.163223 0.848388
+4.5 0.0338564 -0.147726 0.866783
+5.5 0.0089245 -0.104883 0.86591
+6.5 0.000424936 -0.0904522 0.872268
+7.5 -0.00902225 -0.0760639 0.876247
+8.5 -0.0121186 -0.070202 0.882148
+9.5 -0.00344141 -0.0853102 0.892993
+10.5 0.00617963 -0.104391 0.904749
+11.5 0.0197733 -0.13057 0.918187
+12.5 0.0218319 -0.134579 0.922079
+13.5 0.0375154 -0.168023 0.94129
+14.5 0.0350026 -0.16846 0.947638
+15.5 0.0287057 -0.164857 0.951582
+16.5 0.0199986 -0.157109 0.953213
+17.5 0.00936755 -0.145889 0.952243
+18.5 0.0135269 -0.160119 0.960952
+19.5 0.0108326 -0.158527 0.961745
+20.5 0.00487344 -0.149807 0.959717
+21.5 0.0129593 -0.161364 0.9636
+22.5 0.0267525 -0.181066 0.969014
+23.5 0.0361899 -0.193849 0.972457
+24.5 0.0538715 -0.222488 0.98097
+25.5 0.0470685 -0.205341 0.971072
+26.5 0.0608879 -0.222586 0.974847
+27.5 0.0550967 -0.212812 0.972509
+28.5 0.0562832 -0.219986 0.980316
+29.5 0.0486232 -0.209847 0.978572
+30.5 0.0359245 -0.193949 0.974296
+31.5 0.0224626 -0.175152 0.968662
+32.5 0.0209931 -0.177348 0.971036
+33.5 0.0180516 -0.17512 0.971343
+34.5 0.0207037 -0.179432 0.972625
+35.5 0.0177235 -0.170347 0.967979
+36.5 0.0270497 -0.183562 0.972508
+37.5 0.0391285 -0.200151 0.976734
+38.5 0.0489895 -0.214471 0.978986
+39.5 0.0595261 -0.229497 0.982315
+40.5 0.055208 -0.215155 0.972694
+41.5 0.0563367 -0.217276 0.976369
+42.5 0.0514698 -0.20962 0.975951
+43.5 0.0432676 -0.200996 0.974924
+44.5 0.0305898 -0.18304 0.969203
+45.5 0.0227243 -0.175052 0.968176
+46.5 0.0206728 -0.177276 0.970934
+47.5 0.016015 -0.169255 0.967218
+48.5 0.00805896 -0.154238 0.960526
+49.5 0.0100625 -0.155068 0.959593
+50.5 0.0135168 -0.154243 0.95642
+51.5 0.0172718 -0.15532 0.952903
+52.5 0.0270588 -0.167377 0.952535
+53.5 0.0366162 -0.175911 0.948946
+54.5 0.0189954 -0.132074 0.923016
+55.5 0.016507 -0.121656 0.918151
+56.5 0.0105806 -0.110151 0.912002
+57.5 0.00415499 -0.0994696 0.904518
+58.5 -0.00891229 -0.0767598 0.890488
+59.5 -0.0181757 -0.0589498 0.877018
+60.5 -0.0100495 -0.0745257 0.875852
+61.5 -0.0017142 -0.0870505 0.87028
+62.5 0.00737177 -0.0997613 0.860891
+63.5 0.0179548 -0.117285 0.851194
+64.5 0.00931844 -0.0948815 0.816528
+65.5 0.0794962 -0.21381 0.831763
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat
deleted file mode 120000
index 4fb51580ba..0000000000
--- a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat
+++ /dev/null
@@ -1 +0,0 @@
-2019SF_MC_parameters_photons.dat
\ No newline at end of file
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat
new file mode 100644
index 0000000000..525d406fb6
--- /dev/null
+++ b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_photons.dat
@@ -0,0 +1,65 @@
+64
+2.5 0.044515 -0.129375 0.802468
+3.5 0.0267131 -0.10794 0.827453
+4.5 0.0150272 -0.0921547 0.843946
+5.5 0.00551238 -0.0797621 0.856736
+6.5 -0.00505262 -0.0609433 0.860642
+7.5 -0.014984 -0.0434852 0.863601
+8.5 -0.0170807 -0.0401011 0.869751
+9.5 -0.0107673 -0.0518295 0.880344
+10.5 0.00085919 -0.0717786 0.892016
+11.5 0.00438565 -0.0777329 0.8974
+12.5 0.0164597 -0.102968 0.909448
+13.5 0.0236488 -0.121631 0.92199
+14.5 0.0230777 -0.127192 0.930982
+15.5 0.0171496 -0.124467 0.935704
+16.5 0.0174319 -0.133467 0.943887
+17.5 0.0168242 -0.141568 0.951027
+18.5 0.0214938 -0.157878 0.960827
+19.5 0.0201884 -0.158857 0.962961
+20.5 0.0226879 -0.16358 0.965057
+21.5 0.0222504 -0.160949 0.963891
+22.5 0.025861 -0.161524 0.962137
+23.5 0.0267666 -0.155775 0.957638
+24.5 0.0363867 -0.167417 0.959866
+25.5 0.0432492 -0.173925 0.959439
+26.5 0.0463671 -0.175934 0.955897
+27.5 0.0399974 -0.167181 0.954502
+28.5 0.0371974 -0.164979 0.957512
+29.5 0.0315226 -0.160339 0.958269
+30.5 0.0303002 -0.16544 0.963013
+31.5 0.0236447 -0.159375 0.96283
+32.5 0.0240602 -0.166499 0.967627
+33.5 0.0242597 -0.16867 0.969042
+34.5 0.0245884 -0.168969 0.969128
+35.5 0.0230006 -0.162234 0.965271
+36.5 0.0275063 -0.165862 0.965491
+37.5 0.0244758 -0.153481 0.958174
+38.5 0.0307494 -0.158141 0.957418
+39.5 0.045938 -0.1802 0.962352
+40.5 0.0460657 -0.17847 0.958706
+41.5 0.0452956 -0.176761 0.959216
+42.5 0.0361736 -0.162702 0.956618
+43.5 0.0300966 -0.157786 0.957425
+44.5 0.0234158 -0.151091 0.956275
+45.5 0.0206775 -0.152868 0.959097
+46.5 0.0235922 -0.163562 0.965125
+47.5 0.0230508 -0.164322 0.965551
+48.5 0.0231842 -0.164148 0.964799
+49.5 0.0170692 -0.148047 0.956424
+50.5 0.0166014 -0.141108 0.951357
+51.5 0.016982 -0.132786 0.94364
+52.5 0.018475 -0.125877 0.935753
+53.5 0.0235568 -0.12818 0.930928
+54.5 0.0192256 -0.108915 0.913276
+55.5 0.0113012 -0.090893 0.904771
+56.5 0.00398951 -0.0780267 0.898417
+57.5 -0.00686764 -0.0577633 0.886867
+58.5 -0.013388 -0.0462706 0.877737
+59.5 -0.0173408 -0.0397483 0.869051
+60.5 -0.0122535 -0.0505168 0.866081
+61.5 -0.000695994 -0.0722139 0.86508
+62.5 0.0141239 -0.0970101 0.861717
+63.5 0.0199926 -0.103047 0.845529
+64.5 0.0292083 -0.113481 0.824043
+65.5 0.0423095 -0.127081 0.795632
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat
deleted file mode 120000
index 306df01ded..0000000000
--- a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat
+++ /dev/null
@@ -1 +0,0 @@
-2019SF_MC_parameters_positrons.dat
\ No newline at end of file
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat
new file mode 100644
index 0000000000..4e9dbc4e3d
--- /dev/null
+++ b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2019SF_parameters_positrons.dat
@@ -0,0 +1,65 @@
+64
+2.5 0.0510017 -0.155216 0.810675
+3.5 0.0196382 -0.107443 0.82405
+4.5 -0.00466272 -0.0726448 0.834167
+5.5 -0.00338145 -0.0843645 0.858069
+6.5 -0.0244879 -0.0476183 0.85555
+7.5 -0.0274559 -0.0468326 0.867344
+8.5 -0.0274788 -0.0440394 0.872302
+9.5 -0.0238204 -0.0558768 0.88326
+10.5 -0.00472803 -0.0904386 0.901132
+11.5 0.015321 -0.124046 0.916412
+12.5 0.0167272 -0.123892 0.917319
+13.5 0.0203336 -0.137932 0.929196
+14.5 0.0237927 -0.151162 0.94191
+15.5 0.0138132 -0.143674 0.945208
+16.5 0.00754058 -0.141186 0.948395
+17.5 -0.0010219 -0.135083 0.950118
+18.5 -0.000899689 -0.140839 0.954645
+19.5 -0.00230726 -0.14291 0.957965
+20.5 -0.000262974 -0.147929 0.960702
+21.5 0.00127172 -0.147658 0.959936
+22.5 0.0156383 -0.167247 0.96514
+23.5 0.0175347 -0.167506 0.963156
+24.5 0.0358861 -0.195103 0.970992
+25.5 0.0656363 -0.240555 0.985584
+26.5 0.0514423 -0.210642 0.97123
+27.5 0.0671468 -0.240614 0.986085
+28.5 0.04306 -0.200252 0.973555
+29.5 0.0443122 -0.206456 0.978056
+30.5 0.0235245 -0.176472 0.96836
+31.5 0.0183505 -0.175067 0.971166
+32.5 0.00679601 -0.15862 0.965422
+33.5 0.0040492 -0.155237 0.964393
+34.5 0.00657395 -0.159932 0.966574
+35.5 0.00485402 -0.154629 0.964139
+36.5 0.0128334 -0.163143 0.965748
+37.5 0.0265486 -0.183788 0.971659
+38.5 0.0421512 -0.206571 0.977216
+39.5 0.053817 -0.223227 0.980501
+40.5 0.0552505 -0.21702 0.974043
+41.5 0.0535136 -0.213375 0.974973
+42.5 0.0448999 -0.202608 0.974637
+43.5 0.0394855 -0.198409 0.975139
+44.5 0.0265404 -0.182075 0.970796
+45.5 0.015117 -0.166953 0.966304
+46.5 0.000636881 -0.144464 0.958287
+47.5 0.00117625 -0.148171 0.960218
+48.5 -0.00100402 -0.144003 0.957893
+49.5 -0.00124009 -0.140318 0.954886
+50.5 6.48056e-05 -0.135832 0.950119
+51.5 0.0270074 -0.17348 0.960662
+52.5 0.0165751 -0.154509 0.949507
+53.5 0.0130449 -0.137681 0.934476
+54.5 0.0160329 -0.128842 0.922865
+55.5 0.0072588 -0.108835 0.914016
+56.5 -0.000944252 -0.0931844 0.906609
+57.5 -0.0142502 -0.0692564 0.893398
+58.5 -0.0247172 -0.0513782 0.881551
+59.5 -0.0221439 -0.0556032 0.87711
+60.5 -0.0239465 -0.0538478 0.8689
+61.5 -0.0147719 -0.0686192 0.863593
+62.5 -0.0167464 -0.0598094 0.84568
+63.5 0.00454546 -0.0931923 0.840437
+64.5 0.00764744 -0.0951692 0.816933
+65.5 0.0713644 -0.194335 0.823701
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat
deleted file mode 120000
index 4fb51580ba..0000000000
--- a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat
+++ /dev/null
@@ -1 +0,0 @@
-2019SF_MC_parameters_photons.dat
\ No newline at end of file
diff --git a/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat
new file mode 100644
index 0000000000..525d406fb6
--- /dev/null
+++ b/ecal-recon/src/main/resources/org/hps/recon/ecal/cluster/2021SF_MC_parameters_photons.dat
@@ -0,0 +1,65 @@
+64
+2.5 0.044515 -0.129375 0.802468
+3.5 0.0267131 -0.10794 0.827453
+4.5 0.0150272 -0.0921547 0.843946
+5.5 0.00551238 -0.0797621 0.856736
+6.5 -0.00505262 -0.0609433 0.860642
+7.5 -0.014984 -0.0434852 0.863601
+8.5 -0.0170807 -0.0401011 0.869751
+9.5 -0.0107673 -0.0518295 0.880344
+10.5 0.00085919 -0.0717786 0.892016
+11.5 0.00438565 -0.0777329 0.8974
+12.5 0.0164597 -0.102968 0.909448
+13.5 0.0236488 -0.121631 0.92199
+14.5 0.0230777 -0.127192 0.930982
+15.5 0.0171496 -0.124467 0.935704
+16.5 0.0174319 -0.133467 0.943887
+17.5 0.0168242 -0.141568 0.951027
+18.5 0.0214938 -0.157878 0.960827
+19.5 0.0201884 -0.158857 0.962961
+20.5 0.0226879 -0.16358 0.965057
+21.5 0.0222504 -0.160949 0.963891
+22.5 0.025861 -0.161524 0.962137
+23.5 0.0267666 -0.155775 0.957638
+24.5 0.0363867 -0.167417 0.959866
+25.5 0.0432492 -0.173925 0.959439
+26.5 0.0463671 -0.175934 0.955897
+27.5 0.0399974 -0.167181 0.954502
+28.5 0.0371974 -0.164979 0.957512
+29.5 0.0315226 -0.160339 0.958269
+30.5 0.0303002 -0.16544 0.963013
+31.5 0.0236447 -0.159375 0.96283
+32.5 0.0240602 -0.166499 0.967627
+33.5 0.0242597 -0.16867 0.969042
+34.5 0.0245884 -0.168969 0.969128
+35.5 0.0230006 -0.162234 0.965271
+36.5 0.0275063 -0.165862 0.965491
+37.5 0.0244758 -0.153481 0.958174
+38.5 0.0307494 -0.158141 0.957418
+39.5 0.045938 -0.1802 0.962352
+40.5 0.0460657 -0.17847 0.958706
+41.5 0.0452956 -0.176761 0.959216
+42.5 0.0361736 -0.162702 0.956618
+43.5 0.0300966 -0.157786 0.957425
+44.5 0.0234158 -0.151091 0.956275
+45.5 0.0206775 -0.152868 0.959097
+46.5 0.0235922 -0.163562 0.965125
+47.5 0.0230508 -0.164322 0.965551
+48.5 0.0231842 -0.164148 0.964799
+49.5 0.0170692 -0.148047 0.956424
+50.5 0.0166014 -0.141108 0.951357
+51.5 0.016982 -0.132786 0.94364
+52.5 0.018475 -0.125877 0.935753
+53.5 0.0235568 -0.12818 0.930928
+54.5 0.0192256 -0.108915 0.913276
+55.5 0.0113012 -0.090893 0.904771
+56.5 0.00398951 -0.0780267 0.898417
+57.5 -0.00686764 -0.0577633 0.886867
+58.5 -0.013388 -0.0462706 0.877737
+59.5 -0.0173408 -0.0397483 0.869051
+60.5 -0.0122535 -0.0505168 0.866081
+61.5 -0.000695994 -0.0722139 0.86508
+62.5 0.0141239 -0.0970101 0.861717
+63.5 0.0199926 -0.103047 0.845529
+64.5 0.0292083 -0.113481 0.824043
+65.5 0.0423095 -0.127081 0.795632