diff --git a/MMPgridSODATEST.mat b/MMPgridSODATEST.mat
new file mode 100644
index 0000000..111269c
Binary files /dev/null and b/MMPgridSODATEST.mat differ
diff --git a/database/cal/Af/132 b/database/cal/Af/132
index 581e706..f7b1775 100755
--- a/database/cal/Af/132
+++ b/database/cal/Af/132
@@ -8,3 +8,4 @@ jan04      26.240    931
 jul06      26.020    976
 may07      23.550    983
 mar09      24.430    909
+nov17	27.0	949
diff --git a/database/cal/Af/134 b/database/cal/Af/134
index 7460ae3..81bcca6 100755
--- a/database/cal/Af/134
+++ b/database/cal/Af/134
@@ -4,3 +4,4 @@ jul06      31.500    1010
 may07      30.040    966
 mar09      32.610    897
 jul14      30.340    980
+nov17	27.57	1092
diff --git a/database/cal/Af/139 b/database/cal/Af/139
index 90dbd24..eb9a0c2 100755
--- a/database/cal/Af/139
+++ b/database/cal/Af/139
@@ -8,3 +8,4 @@ jul06      25.560    925
 may07      22.940    913
 mar09      24.520    867
 jul14      25.520    874
+nov17      26.76     906
diff --git a/database/cal/Af/140 b/database/cal/Af/140
index d58fa5c..aa51cbf 100755
--- a/database/cal/Af/140
+++ b/database/cal/Af/140
@@ -8,3 +8,4 @@ jul06      22.230    989
 may07      20.280    980
 mar09      22.760    926
 jul14      22.720    931
+nov17      22.01     954
diff --git a/database/cal/Af/143 b/database/cal/Af/143
index 7b862fa..9272368 100755
--- a/database/cal/Af/143
+++ b/database/cal/Af/143
@@ -8,3 +8,4 @@ jul06      27.550    960
 may07      24.430    955
 mar09      26.320    898
 jul14      27.150    918
+nov17      28.5      938
\ No newline at end of file
diff --git a/database/cal/Af/147 b/database/cal/Af/147
index bf5a765..c913fe6 100755
--- a/database/cal/Af/147
+++ b/database/cal/Af/147
@@ -12,3 +12,4 @@ jul06      22.070    1067
 may07      20.350    1059
 mar09      21.270    1011
 jul14      21.930    1022
+nov17      19.26     1059
diff --git a/database/cal/Af/170 b/database/cal/Af/170
old mode 100644
new mode 100755
diff --git a/database/cal/Af/187 b/database/cal/Af/187
index 7fb334e..d8df234 100755
--- a/database/cal/Af/187
+++ b/database/cal/Af/187
@@ -4,3 +4,4 @@ jul06      26.280    1080
 may07      23.870    1076
 mar09      26.180    1017
 jul14      25.700    1028
+nov17      23.13     1072
diff --git a/database/cal/Af/188 b/database/cal/Af/188
index 5d8a0a5..7f6b808 100755
--- a/database/cal/Af/188
+++ b/database/cal/Af/188
@@ -4,4 +4,5 @@ jul06      29.140    1047
 may07      26.830    1053
 mar09      28.660    999
 jul14      30.130    1011
-feb17	    29.3	977
\ No newline at end of file
+feb17	    29.3	977
+nov17      28.64     1037
\ No newline at end of file
diff --git a/database/cal/Af/201 b/database/cal/Af/201
index 53ef1f5..b94984b 100755
--- a/database/cal/Af/201
+++ b/database/cal/Af/201
@@ -14,3 +14,4 @@ jul06      27.990    1080
 may07      25.840    1076
 mar09      27.160    1021
 jul14      27.650    1037
+nov17      23.62     1056
diff --git a/database/cal/Af/202 b/database/cal/Af/202
old mode 100644
new mode 100755
diff --git a/database/cal/Af/209 b/database/cal/Af/209
index 2394c47..02862fa 100755
--- a/database/cal/Af/209
+++ b/database/cal/Af/209
@@ -11,3 +11,4 @@ jul06      23.310    989
 may07      21.970    999
 mar09      23.430    928
 jul14      23.040    940
+nov17      22.63     997
\ No newline at end of file
diff --git a/database/cal/Af/215 b/database/cal/Af/215
index 9105cbe..8312aa7 100755
--- a/database/cal/Af/215
+++ b/database/cal/Af/215
@@ -3,3 +3,4 @@ jan04      22.080    985
 jul06      21.530    1032
 may07      19.360    1038
 mar09      20.380    974
+nov17      21.02     1020
\ No newline at end of file
diff --git a/database/cal/Af/221 b/database/cal/Af/221
index d229d1d..2cf7983 100755
--- a/database/cal/Af/221
+++ b/database/cal/Af/221
@@ -14,3 +14,4 @@ jul06      22.050    1096
 may07      20.590    1103
 mar09      21.550    1039
 jul14      21.810    1065
+nov17      22.13     1077
\ No newline at end of file
diff --git a/database/cal/Af/226 b/database/cal/Af/226
index b424205..b0f2db1 100755
--- a/database/cal/Af/226
+++ b/database/cal/Af/226
@@ -14,3 +14,4 @@ jul06      27.430    1005
 may07      25.090    1002
 jul14      27.410    967
 feb17      24.5    1056
+nov17      28.25   989
diff --git a/database/cal/Af/228 b/database/cal/Af/228
index fae0d96..589d9f6 100755
--- a/database/cal/Af/228
+++ b/database/cal/Af/228
@@ -4,4 +4,5 @@ jul06      17.830    1081
 may07      16.670    1077
 mar09      16.900    1016
 jul14      17.430    1024
-feb17	    17.0      1045
\ No newline at end of file
+feb17	    17.0      1045
+nov17      18.11     1067
\ No newline at end of file
diff --git a/database/cal/Af/235 b/database/cal/Af/235
index 31f5b7d..bb7577e 100755
--- a/database/cal/Af/235
+++ b/database/cal/Af/235
@@ -11,3 +11,4 @@ jan04      26.570    1038
 jul06      25.510    1093
 may07      23.110    1094
 mar09      24.350    1028
+nov17      23.99     1068
\ No newline at end of file
diff --git a/database/cal/Af/238 b/database/cal/Af/238
index e5dd846..9ec9f1c 100755
--- a/database/cal/Af/238
+++ b/database/cal/Af/238
@@ -12,3 +12,4 @@ jul06      25.070    1083
 may07      23.070    1074
 mar09      24.490    1022
 jul14      24.780    1040
+nov17      21.15     1059
diff --git a/database/cal/Af/242 b/database/cal/Af/242
index f1bd01b..8578ce1 100755
--- a/database/cal/Af/242
+++ b/database/cal/Af/242
@@ -3,3 +3,4 @@ jan04      26.220    1018
 jul06      26.080    1067
 may07      23.210    1068
 mar09      24.900    1005
+nov17      24.77     1056
diff --git a/database/cal/Af/275 b/database/cal/Af/275
index 3db66d9..6b9cd52 100755
--- a/database/cal/Af/275
+++ b/database/cal/Af/275
@@ -14,3 +14,5 @@ jul06      24.860    1045
 may07      23.270    1049
 mar09      25.480    985
 jul14      24.530    997
+nov17      21.88     1023
+
diff --git a/database/cal/Af/276 b/database/cal/Af/276
index bbeb7a9..64b2186 100755
--- a/database/cal/Af/276
+++ b/database/cal/Af/276
@@ -14,3 +14,4 @@ jul06      29.390    1078
 may07      27.390    1072
 mar09      29.390    1026
 jul14      29.030    1039
+nov17      30.07     1051
diff --git a/database/cal/Af/280 b/database/cal/Af/280
index 6c3c27b..2c32804 100755
--- a/database/cal/Af/280
+++ b/database/cal/Af/280
@@ -10,3 +10,4 @@ jan04      22.480    992
 jul06      22.400    1038
 may07      20.040    1035
 jul14      21.890    994
+nov17      24.03     1023
diff --git a/database/cal/Af/281 b/database/cal/Af/281
index 1fa140f..c81a796 100755
--- a/database/cal/Af/281
+++ b/database/cal/Af/281
@@ -5,3 +5,4 @@ jul06      19.450    1031
 may07      18.250    1028
 mar09      14.960    971
 jul14      15.250    986
+nov17      10.07     729
diff --git a/database/cal/Af/284 b/database/cal/Af/284
index 68762f8..c03709e 100755
--- a/database/cal/Af/284
+++ b/database/cal/Af/284
@@ -9,3 +9,4 @@ jul06      29.150    1128
 may07      26.950    1129
 mar09      28.030    1069
 jul14      28.720    1082
+nov17      26.91     1103
diff --git a/database/cal/Af/298 b/database/cal/Af/298
index 337cf3d..7937a95 100755
--- a/database/cal/Af/298
+++ b/database/cal/Af/298
@@ -14,3 +14,4 @@ jul06      24.560    1085
 may07      22.480    1085
 mar09      24.320    1030
 jul14      23.900    1043
+nov17      24.3      1072
diff --git a/database/cal/Af/314 b/database/cal/Af/314
index 519108b..c2df49e 100755
--- a/database/cal/Af/314
+++ b/database/cal/Af/314
@@ -9,3 +9,4 @@ calid    Sv    Cs
 aug00      25.545    1048
 08aug01      25.380    1038
 jan04       0.000    462
+nov17       9.8      533
diff --git a/database/cal/Af/317 b/database/cal/Af/317
index 79b5a4c..448da97 100755
--- a/database/cal/Af/317
+++ b/database/cal/Af/317
@@ -13,3 +13,4 @@ jan04      26.240    1043
 jul06      25.910    1090
 mar09      26.010    1033
 jul14      25.990    1049
+nov17      10.42     718
diff --git a/database/cal/Af/whichcal_132 b/database/cal/Af/whichcal_132
index a221807..b8283f6 100755
--- a/database/cal/Af/whichcal_132
+++ b/database/cal/Af/whichcal_132
@@ -7,4 +7,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18259    jul06
 18260    18719    may07
-18720    99999    mar09
+18720    18924    mar09
+21505	 99999    nov17
diff --git a/database/cal/Af/whichcal_134 b/database/cal/Af/whichcal_134
index b9e15e8..9232da9 100755
--- a/database/cal/Af/whichcal_134
+++ b/database/cal/Af/whichcal_134
@@ -3,4 +3,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505	 99999    nov17
diff --git a/database/cal/Af/whichcal_139 b/database/cal/Af/whichcal_139
index c61b594..6906861 100755
--- a/database/cal/Af/whichcal_139
+++ b/database/cal/Af/whichcal_139
@@ -7,4 +7,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_140 b/database/cal/Af/whichcal_140
index c61b594..220cfb5 100755
--- a/database/cal/Af/whichcal_140
+++ b/database/cal/Af/whichcal_140
@@ -7,4 +7,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
\ No newline at end of file
diff --git a/database/cal/Af/whichcal_143 b/database/cal/Af/whichcal_143
index c61b594..6906861 100755
--- a/database/cal/Af/whichcal_143
+++ b/database/cal/Af/whichcal_143
@@ -7,4 +7,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_147 b/database/cal/Af/whichcal_147
index 5ad7bfa..dec8a71 100755
--- a/database/cal/Af/whichcal_147
+++ b/database/cal/Af/whichcal_147
@@ -11,4 +11,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_170 b/database/cal/Af/whichcal_170
old mode 100644
new mode 100755
diff --git a/database/cal/Af/whichcal_187 b/database/cal/Af/whichcal_187
index b9e15e8..222eea5 100755
--- a/database/cal/Af/whichcal_187
+++ b/database/cal/Af/whichcal_187
@@ -3,4 +3,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_188 b/database/cal/Af/whichcal_188
index 152f46f..ed2682b 100755
--- a/database/cal/Af/whichcal_188
+++ b/database/cal/Af/whichcal_188
@@ -4,4 +4,5 @@ firstdrop    lastdrop    calid
 18260    18719    may07
 18720    18924    mar09
 18925    21460    jul14
-21461    99999    feb17
\ No newline at end of file
+21461    21504    feb17
+21505    99999    nov17
\ No newline at end of file
diff --git a/database/cal/Af/whichcal_201 b/database/cal/Af/whichcal_201
index 084c4ac..d86f0f9 100755
--- a/database/cal/Af/whichcal_201
+++ b/database/cal/Af/whichcal_201
@@ -13,4 +13,6 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+19538    21504    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_202 b/database/cal/Af/whichcal_202
old mode 100644
new mode 100755
diff --git a/database/cal/Af/whichcal_209 b/database/cal/Af/whichcal_209
index 9ccd038..621d65c 100755
--- a/database/cal/Af/whichcal_209
+++ b/database/cal/Af/whichcal_209
@@ -10,4 +10,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_215 b/database/cal/Af/whichcal_215
index 63d3bde..d4774e5 100755
--- a/database/cal/Af/whichcal_215
+++ b/database/cal/Af/whichcal_215
@@ -2,4 +2,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18259    jul06
 18260    18719    may07
-18720    99999    mar09
+18720    18924    mar09
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_221 b/database/cal/Af/whichcal_221
index 084c4ac..388de88 100755
--- a/database/cal/Af/whichcal_221
+++ b/database/cal/Af/whichcal_221
@@ -13,4 +13,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
\ No newline at end of file
diff --git a/database/cal/Af/whichcal_226 b/database/cal/Af/whichcal_226
index 29d2ef4..20be26e 100755
--- a/database/cal/Af/whichcal_226
+++ b/database/cal/Af/whichcal_226
@@ -13,4 +13,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18924    may07
 18925    21446    jul14
-21447    99999    feb17
+21447    21504    feb17
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_228 b/database/cal/Af/whichcal_228
index f87ab64..a59dee7 100755
--- a/database/cal/Af/whichcal_228
+++ b/database/cal/Af/whichcal_228
@@ -4,4 +4,5 @@ firstdrop    lastdrop    calid
 18260    18719    may07
 18720    18924    mar09
 18925    21460    jul14
-21461    99999    feb17
+21461    21504    feb17
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_235 b/database/cal/Af/whichcal_235
index 0a35c6a..08eb19b 100755
--- a/database/cal/Af/whichcal_235
+++ b/database/cal/Af/whichcal_235
@@ -10,4 +10,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18259    jul06
 18260    18719    may07
-18720    99999    mar09
+18720    18924    mar09
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_238 b/database/cal/Af/whichcal_238
index 5ad7bfa..dec8a71 100755
--- a/database/cal/Af/whichcal_238
+++ b/database/cal/Af/whichcal_238
@@ -11,4 +11,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_242 b/database/cal/Af/whichcal_242
index 63d3bde..d4774e5 100755
--- a/database/cal/Af/whichcal_242
+++ b/database/cal/Af/whichcal_242
@@ -2,4 +2,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18259    jul06
 18260    18719    may07
-18720    99999    mar09
+18720    18924    mar09
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_275 b/database/cal/Af/whichcal_275
index 084c4ac..6a62f26 100755
--- a/database/cal/Af/whichcal_275
+++ b/database/cal/Af/whichcal_275
@@ -13,4 +13,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_276 b/database/cal/Af/whichcal_276
index 084c4ac..fc9fdde 100755
--- a/database/cal/Af/whichcal_276
+++ b/database/cal/Af/whichcal_276
@@ -13,4 +13,7 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+19538    21504    jul14
+21505    99999    nov17   
+
diff --git a/database/cal/Af/whichcal_280 b/database/cal/Af/whichcal_280
index 3aa1e50..42e942a 100755
--- a/database/cal/Af/whichcal_280
+++ b/database/cal/Af/whichcal_280
@@ -9,4 +9,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18259    jul06
 18260    18924    may07
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_281 b/database/cal/Af/whichcal_281
index 1b3b4d4..6203704 100755
--- a/database/cal/Af/whichcal_281
+++ b/database/cal/Af/whichcal_281
@@ -4,4 +4,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_284 b/database/cal/Af/whichcal_284
index 4f5ac34..c9d899b 100755
--- a/database/cal/Af/whichcal_284
+++ b/database/cal/Af/whichcal_284
@@ -8,4 +8,7 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+19538    21504    jul14
+21505    99999    nov17
+
diff --git a/database/cal/Af/whichcal_298 b/database/cal/Af/whichcal_298
index 7cf91a5..e625c71 100755
--- a/database/cal/Af/whichcal_298
+++ b/database/cal/Af/whichcal_298
@@ -10,4 +10,5 @@ firstdrop    lastdrop    calid
 14910    18259    jul06
 18260    18719    may07
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/cal/Af/whichcal_314 b/database/cal/Af/whichcal_314
index 0f1b54f..b1a19b8 100755
--- a/database/cal/Af/whichcal_314
+++ b/database/cal/Af/whichcal_314
@@ -8,4 +8,5 @@ firstdrop    lastdrop    calid
 7700    11399    20sep99
 11400    12299    aug00
 12300    14361    08aug01
-14362    99999    jan04
+14362    14646    jan04
+21505    99999     nov17
diff --git a/database/cal/Af/whichcal_317 b/database/cal/Af/whichcal_317
index 110d372..cd680eb 100755
--- a/database/cal/Af/whichcal_317
+++ b/database/cal/Af/whichcal_317
@@ -12,4 +12,5 @@ firstdrop    lastdrop    calid
 14362    14909    jan04
 14910    18719    jul06
 18720    18924    mar09
-18925    99999    jul14
+18925    19537    jul14
+21505    99999    nov17
diff --git a/database/config/MMP1/TH2 b/database/config/MMP1/TH2
index 0d4ee0f..3049ba5 100755
--- a/database/config/MMP1/TH2
+++ b/database/config/MMP1/TH2
@@ -48,4 +48,7 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 19703 21077 A4 t3_1 bessel4 100 col5
 21078 21087 A6 t3_1 bessel4 100 col5
 21088 21123 A4 t3_1 bessel4 100 col5
-21124 99999 A5 t3_1 bessel4 100 col5
+21124 21552 A5 t3_1 bessel4 100 col5
+21553 21557 A4 t3_1 bessel4 100 col5
+21558 22226 A10 t3_1 bessel4 100 col5
+22227 99999 A7 t3_1 bessel4 100 col5
diff --git a/database/config/MMP1/V1 b/database/config/MMP1/V1
index c010641..9c059aa 100755
--- a/database/config/MMP1/V1
+++ b/database/config/MMP1/V1
@@ -80,4 +80,5 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 21448 21449 202 af1_1 cheby6 100 col6
 21450 21451 170 af1_1 cheby6 100 col6
 21452 21460 226 af1_1 cheby6 100 col6
-21461 99999 226 af1_1 cheby6 100 col6
+21461 21552 226 af1_1 cheby6 100 col6
+21553 99999 298 af1_1 cheby6 100 col6
diff --git a/database/config/MMP1/V2 b/database/config/MMP1/V2
index dac065a..4dfcaf0 100755
--- a/database/config/MMP1/V2
+++ b/database/config/MMP1/V2
@@ -72,4 +72,6 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 21000 21114 249 af2_1 cheby6 100 col7
 21115 21129 284 af2_1 cheby6 100 col7
 21130 21130 283 af2_1 cheby6 100 col7
-21131 99999 188 af2_1 cheby6 100 col7
+21131 21552 188 af2_1 cheby6 100 col7
+21553 21557 284 af2_1 cheby6 100 col7
+21558 99999 132	af2_1 cheby6 100 col7
diff --git a/database/config/MMP2/TH1 b/database/config/MMP2/TH1
index 8fb27e6..03571a2 100755
--- a/database/config/MMP2/TH1
+++ b/database/config/MMP2/TH1
@@ -20,4 +20,4 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 14400 14909 [] t3_1 bessel4 100 col4
 14910 14984 A10 t3_1 bessel4 100 col4
 14985 16949 A8 t3_1 bessel4 100 col4
-16990 99999 [] t3_1 bessel4 100 col4
+16990 99999 A8 t3_1 bessel4 100 col4
diff --git a/database/config/MMP2/TH2 b/database/config/MMP2/TH2
index 61e45b9..01be3b7 100755
--- a/database/config/MMP2/TH2
+++ b/database/config/MMP2/TH2
@@ -10,4 +10,5 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 14068 14399 104 t2_1 bessel4 100 col5
 14400 14646 104 t2_1 bessel4 100 col5
 14647 14909 A9 t2_1 bessel4 100 col5
-14910 99999 [] t2_1 bessel4 100 col5
\ No newline at end of file
+14910 21972 A8 t2_1 bessel4 100 col5
+21973 99999 116 t2_1 bessel4 100 col5
diff --git a/database/config/MMP2/TL2 b/database/config/MMP2/TL2
index 5560556..d56da17 100755
--- a/database/config/MMP2/TL2
+++ b/database/config/MMP2/TL2
@@ -10,4 +10,4 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 14068 14399 104 t2_1 bessel4 100 col3
 14400 14646 104 t2_1 bessel4 100 col3
 14647 14909 A9 t2_1 bessel4 100 col3
-14910 99999 [] t2_1 bessel4 100 col3
\ No newline at end of file
+14910 99999 [] t2_1 bessel4 100 col3
diff --git a/database/config/MMP4/.V1.swp b/database/config/MMP4/.V1.swp
new file mode 100755
index 0000000..820d429
Binary files /dev/null and b/database/config/MMP4/.V1.swp differ
diff --git a/database/config/MMP4/TH1 b/database/config/MMP4/TH1
index 979cca3..de5b8a8 100755
--- a/database/config/MMP4/TH1
+++ b/database/config/MMP4/TH1
@@ -3,4 +3,7 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 19899 20999 104 t1_1 bessel4 100 col4
 21000 21030 A2 t1_1 bessel4 100 col4
 21031 21123 6 t1_1 bessel4 100 col4
-21124 29999 12 t1_1 bessel4 100 col4
+21124 21441 12 t1_1 bessel4 100 col4
+21505 21546 96 t1_1 bessel4 100 col4
+21547 21809 96 t1_1 bessel4 100 col4
+21809 99999 6 t1_1 bessel4 100 col4
diff --git a/database/config/MMP4/TH2 b/database/config/MMP4/TH2
index f39e930..72554ed 100755
--- a/database/config/MMP4/TH2
+++ b/database/config/MMP4/TH2
@@ -4,4 +4,9 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 19889 20999 102 t3_1 bessel4 100 col5
 21000 21030 A1 t3_1 bessel4 100 col5
 21031 21123 96 t3_1 bessel4 100 col5
-21124 29999 11 t3_1 bessel4 100 col5
+21124 21441 11 t3_1 bessel4 100 col5
+21505 21546 104 t3_1 bessel4 100 col5
+21547 21659 104  t3_1 bessel4 100 col5
+21660 21089 102 t3_1 bessel4 100 col5
+21090 22021 4 t3_1 bessel4 100 col5
+22022 99999 A5 t3_1 bessel4 100 col5
diff --git a/database/config/MMP4/V1 b/database/config/MMP4/V1
index e176702..353006f 100755
--- a/database/config/MMP4/V1
+++ b/database/config/MMP4/V1
@@ -6,4 +6,7 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 19891 20543 283 af1_1 cheby6 100 col6
 20544 20552 228 af1_1 cheby6 100 col6
 20553 21123 281 af1_1 cheby6 100 col6
-21124 29999 276 af1_1 cheby6 100 col6
+21124 21441 276 af1_1 cheby6 100 col6
+21505 21545 276 af1_1 cheby6 100 col6
+21546 21808 134 af1_1 cheby6 100 col6
+21809 99999 235 af1_1 cheby6 100 col6
diff --git a/database/config/MMP4/V2 b/database/config/MMP4/V2
index 8254d5e..2382c66 100755
--- a/database/config/MMP4/V2
+++ b/database/config/MMP4/V2
@@ -4,4 +4,10 @@ firstdrop lastdrop sensorid electronicsid filter fc scanpos
 18787 20999 103 af2_1 cheby6 100 col7
 21000 21030 152 af2_1 cheby6 100 col7
 21031 21123 284 af2_1 cheby6 100 col7
-21124 29999 201 af2_1 cheby6 100 col7
+21124 21441 201 af2_1 cheby6 100 col7
+21505 21511 201 af2_1 cheby6 100 col7
+21512 21512 132 af2_1 cheby6 100 col7
+21513 21513 134 af2_1 cheby6 100 col7
+21514 21515 139 af2_1 cheby6 100 col7
+21516 21516 143 af2_1 cheby6 100 col7
+21517 99999 221 af2_1 cheby6 100 col7
diff --git a/database/config/MMPID b/database/config/MMPID
index a023f1f..1326930 100755
--- a/database/config/MMPID
+++ b/database/config/MMPID
@@ -534,7 +534,7 @@
 21024 21029 mmp4
 21030 21030 mmp1
 21031 21033 mmp4
-20134 21123 mmp1
+21034 21123 mmp1
 21124 21126 mmp4
 21127 21127 mmp1
 21128 21129 mmp4
@@ -551,4 +551,19 @@
 21439 21444 mmp1
 21445 21446 mmp4
 21447 21462 mmp1
-21463 99999 mmp4
+21463 21504 mmp4
+21505 21527 mmp4
+21528 21529 mmp1
+21530 21552 mmp4
+21553 21659 mmp1
+21660 21699 mmp4
+21700 21754 mmp1
+21755 21798 mmp4
+21799 21849 mmp1
+21850 21863 mmp4
+21864 21887 mmp1
+21888 21939 mmp1
+21940 22123 mmp4
+22124 22129 mmp1
+22130 22239 mmp4
+22240 22241 mmp1
diff --git a/database/cruises b/database/cruises
index 6d2b221..3dc28e4 100755
--- a/database/cruises
+++ b/database/cruises
@@ -48,4 +48,6 @@
 19600 19699 SproulTest15
 19700 21000 ArcticMix15
 21001 21441 FLEAT16
-21442 22999 Plumex17
+21442 21504 Plumex17
+21505 21527 EpsiTest17
+21528 99999 SODA18
diff --git a/mymatlab/mmp/batchprocess/droplist.mat b/mymatlab/mmp/batchprocess/droplist.mat
index d4d3fdf..6a66063 100755
Binary files a/mymatlab/mmp/batchprocess/droplist.mat and b/mymatlab/mmp/batchprocess/droplist.mat differ
diff --git a/mymatlab/mmp/batchprocess/write_droptime2G_mmp.m b/mymatlab/mmp/batchprocess/write_droptime2G_mmp.m
index c405b26..179a364 100755
--- a/mymatlab/mmp/batchprocess/write_droptime2G_mmp.m
+++ b/mymatlab/mmp/batchprocess/write_droptime2G_mmp.m
@@ -9,7 +9,7 @@
 
    % load current mmplog, check year,yday columns for drop
 
-   load([procdata filesep cruise filesep 'mmplog'])
+   load([procdata cruise filesep 'mmplog'])
 
    irow=find(mmplog(:,1)==drop);
 
diff --git a/mymatlab/mmp/mmpfolders2.m b/mymatlab/mmp/mmpfolders2.m
deleted file mode 100755
index b85f7b4..0000000
--- a/mymatlab/mmp/mmpfolders2.m
+++ /dev/null
@@ -1,26 +0,0 @@
-% mmpfolders: loads folder names for mmp processing and data
-% edit selections based on disk configuration being used
-%modified 12/28/98 MHA
-%global FSP
-global harddrive
-harddrive='/Users/ecfine/Documents/MATLAB/MMP_proc/';
-%harddrive='/Volumes/DataDrive1/DataArchive/';
-%harddrive2='~malford/';
-FSP='/';
-filesep=FSP';
-
-% rawmmp=[harddrive 'Data' filesep 'mmp' filesep 'data'];
-% procdata=[harddrive 'Data' filesep 'mmp'];
-% mmpdatabase=[harddrive 'Data' filesep 'mmp' filesep 'database'];
-% mmpconfig=[harddrive 'Data' filesep 'mmp' filesep 'config'];
-% matlabdisk=[harddrive2 ];
-% mymatlabdisk=[harddrive2 'Projects' filesep 'MatlabLocal' filesep 'mymatlab'];
-
-rawmmp=fullfile(harddrive,'data');
-procdata=fullfile(harddrive);
-mmpdatabase=fullfile(harddrive,'database');
-mmpconfig=fullfile(harddrive,'database','config');
-matlabdisk='/Users/malford/';
-mymatlabdisk='/Users/ecfine/Documents/MATLAB/MMP_proc/mymatlab';
-
-cd(fullfile(mymatlabdisk,'mmp','batchprocess'))
\ No newline at end of file
diff --git a/mymatlab/mmp/processing/get_chi1_mmp.m b/mymatlab/mmp/processing/get_chi1_mmp.m
index 7c74b50..3b97f8d 100755
--- a/mymatlab/mmp/processing/get_chi1_mmp.m
+++ b/mymatlab/mmp/processing/get_chi1_mmp.m
@@ -1 +1 @@
-function [chi, pr_chi]=get_chi1_mmp(drop);
% Usage: function [chi, pr_chi]=get_chi1_mmp(drop);
%   drop is the integer drop number
%   pr_eps is the pressure at the center of the epsilon window.
%
mmpfolders
cruise=read_cruises_mmp(drop);

% set up string names of files to open
fstr1=[procdata filesep cruise filesep 'chi' filesep 'chi' int2str(drop) '.mat'];


% load eps<drop>
if exist(fstr1)~=2
	nodata_str=['get_chi1_mmp: ' fstr1 ' does not exist'];
	disp(nodata_str)
else
	ld_str=['load ' setstr(39) fstr1 setstr(39)];
	eval(ld_str)
end
\ No newline at end of file
+function [chi, pr_chi, MLEout]=get_chi1_mmp(drop);
% Usage: function [chi, pr_chi]=get_chi1_mmp(drop);
%   drop is the integer drop number
%   pr_eps is the pressure at the center of the epsilon window.
%   Edited by ECF 6/28/18 to return MLEchi too 
%   Edited by ECF 7/2/18 to parallel get_eps in deciding what chi to return

mmpfolders
cruise=read_cruises_mmp(drop);


RATIO=4; % max allowable ratio between MLE1 & MLE2 for them to be averaged

% set up string names of files to open
fstr1=[procdata cruise filesep 'chi' filesep 'chi' int2str(drop) '.mat'];

chi = [];
pr_chi = [];
MLEchi = [];

% load eps<drop>
if exist(fstr1)~=2
	nodata_str=['get_chi1_mmp: ' fstr1 ' does not exist'];
	disp(nodata_str)
else
	ld_str=['load ' setstr(39) fstr1 setstr(39)];
	eval(ld_str)
end

% Decide which MLE to return
MLE1=MLEchi(:,1);
MLE2=MLEchi(:,2);

  % Take MLEchi as the nan mean of  MLE1 and  MLE2.
  MLEout = nanmean(MLEchi,2);

  % If  MLE1 &  MLE2 are not NaNs and one is more than RATIO
  % times the other, take the lower assuming that the higher
  % level was produced by a plankton impact.
  i=find( MLE1<RATIO* MLE2);
  MLEout(i)= MLE1(i);
  i=find( MLE2<RATIO* MLE1);
  MLEout(i)= MLE2(i);
\ No newline at end of file
diff --git a/mymatlab/mmp/processing/get_epsilon2_mmp.m b/mymatlab/mmp/processing/get_epsilon2_mmp.m
index 203891a..fc9b673 100755
--- a/mymatlab/mmp/processing/get_epsilon2_mmp.m
+++ b/mymatlab/mmp/processing/get_epsilon2_mmp.m
@@ -1 +1 @@
-function [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
% Usage: [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
%   drop is the integer drop number
%   testing is a string and must be 'y' to plot epsx (red +), epsy (green +),
%      and epsilon (white line)
%   epsilon is the average when neither  epsx nor  epsy are
%      NaN and neither is more 4 times the other.  If one
%      is more than 4 times the other, epsilon is the smaller.
%   pr_eps is the pressure at the center of the epsilon window.
% Function: to obtain the best estimate for epsilon from
%    epsx and  epsy.
% M.Gregg, 2 July 1995, rev. 28sep95
% revised from get_eps1_amp to work for mmp.  J.Mackinnon 21 Aug 96

testing='n';
RATIO=4; % max allowable ratio between eps1 & eps2 for them to be averaged

mmpfolders
cruise=read_cruises_mmp(drop);

% set up string names of files to open
%fstr1=[procdata '\' cruise '\eps\eps' int2str(drop) '.mat'];
%fstr2=[procdata '\' cruise '\problems\vx\badvx' int2str(drop) '.mat'];
%fstr3=[procdata '\' cruise '\problems\vy\badvy' int2str(drop) '.mat'];
fstr1=[procdata filesep cruise filesep 'eps' filesep 'eps' int2str(drop) '.mat'];
fstr2=[procdata filesep cruise filesep 'problems' filesep 'vx' filesep 'badvx' int2str(drop) '.mat'];
fstr3=[procdata filesep cruise filesep 'problems' filesep 'vy' filesep 'badvy' int2str(drop) '.mat'];

% load eps<drop>
if exist(fstr1)~=2
	nodata_str=['get_epsilon1_mmp: ' fstr1 ' does not exist'];
	disp(nodata_str)
else
	ld_str=['load ' setstr(39) fstr1 setstr(39)];
	eval(ld_str)

  neps=length(pr_eps);
	%mha change -- older files seem not to have eps1 and eps2
	if ~exist('eps1')
		eps1=epsilon(:,1);
		eps2=epsilon(:,2);
	end 
  epsx=eps1;
  epsy=eps2;

  % load badvx if it exists
  if exist(fstr2)==2
	  badvx_str=['load ' setstr(39) fstr2 setstr(39)];
	  eval(badvx_str)
  end

  % load badvy if it exists
  if exist(fstr3)==2
	  badvy_str=['load ' setstr(39) fstr3 setstr(39)];
	  eval(badvy_str)
  end

  % set up arrays for pr_lb & pr_ub of all eps bins if badvx or badvy
  % exist
  if exist('badvx')==1 | exist('badvy')==1
	  pr_lb=zeros(size(pr_eps)); pr_ub=zeros(size(pr_eps));
	  dpr=diff(pr_eps);
	  pr_lb(1)=pr_eps(1)-dpr(1)/2;
	  pr_lb(2:neps)=pr_eps(2:neps)-dpr(1:neps-1)/2;
	  pr_ub(1:neps-1)=pr_eps(1:neps-1)+dpr(1:neps-1)/2;
	  pr_ub(neps)=pr_eps(neps)+dpr(neps-1)/2;
  end

  % use badvx to set bad  epsx values to NaNs
  if exist('badvx')==1
	  sbvx=size(badvx);	
	  for i=1:sbvx(1)
		  % find bins whose upper bounds exceed the lower bound
		  % of the bad data
		  iu=find(pr_ub>badvx(i,1));
		  % find bins whose lower bounds are less than the lower 
		  % bound of the bad data
		  il=find(pr_lb<badvx(i,2));
		  % find the indices common to iu and il
		  imin=max(min(iu),min(il));
		  imax=min(max(iu),max(il));
		  epsx(imin:imax)=NaN*ones(1,imax-imin+1);
	  end
  end

  % use badvy to set bad  epsy values to NaNs
  if exist('badvy')==1
	  sbvy=size(badvy);	
	  for i=1:sbvy(1)
		  % find bins whose upper bounds exceed the lower bound
		  % of the bad data
		  iu=find(pr_ub>badvy(i,1));
		  % find bins whose lower bounds are less than the lower 
		  % bound of the bad data
		  il=find(pr_lb<badvy(i,2));
		  % find the indices common to iu and il
		  imin=max(min(iu),min(il));
		  imax=min(max(iu),max(il));
		  epsy(imin:imax)=NaN*ones(1,imax-imin+1);
	  end
  end

  % Take epsilon as the average of  epsx and  epsy.  If  epsx
  % or  epsy is NaN, epsilon will be NaN.
  epsilon=( epsx+ epsy)/2;

  % If only  epsx or ep_vy is NaN, set epsilon to the good value
  ix=find(~isnan( epsx)==1 & isnan( epsy)==1); % good vx & bad vy
  epsilon(ix)= epsx(ix);
  iy=find(isnan( epsx)==1 & ~isnan( epsy)==1); % good vy & bad vx
  epsilon(iy)= epsx(iy);

  % If  epsx &  epsy are not NaNs and one is more than RATIO
  % times the other, take the lower assuming that the higher
  % level was produced by a plankton impact.
  i=find( epsx<RATIO* epsy);
  epsilon(i)= epsx(i);
  i=find( epsy<RATIO* epsx);
  epsilon(i)= epsy(i);

  % overlay epsilon profiles if testing
  if strcmp(testing,'y')
	  clf
	  semilogx(epsilon,pr_eps,'w');
	  set(gca,'ydir','reverse')
	  hold on
	  semilogx(epsx,pr_eps,'r+');
	  semilogx(epsy,pr_eps,'g+');
  end
end
\ No newline at end of file
+function [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
% Usage: [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
%   drop is the integer drop number
%   testing is a string and must be 'y' to plot epsx (red +), epsy (green +),
%      and epsilon (white line)
%   epsilon is the average when neither  epsx nor  epsy are
%      NaN and neither is more 4 times the other.  If one
%      is more than 4 times the other, epsilon is the smaller.
%   pr_eps is the pressure at the center of the epsilon window.
% Function: to obtain the best estimate for epsilon from
%    epsx and  epsy.
% M.Gregg, 2 July 1995, rev. 28sep95
% revised from get_eps1_amp to work for mmp.  J.Mackinnon 21 Aug 96

testing='n';
RATIO=4; % max allowable ratio between eps1 & eps2 for them to be averaged

mmpfolders
cruise=read_cruises_mmp(drop);

% set up string names of files to open
%fstr1=[procdata '\' cruise '\eps\eps' int2str(drop) '.mat'];
%fstr2=[procdata '\' cruise '\problems\vx\badvx' int2str(drop) '.mat'];
%fstr3=[procdata '\' cruise '\problems\vy\badvy' int2str(drop) '.mat'];
fstr1=[procdata cruise filesep 'eps' filesep 'eps' int2str(drop) '.mat'];
fstr2=[procdata cruise filesep 'problems' filesep 'vx' filesep 'badvx' int2str(drop) '.mat'];
fstr3=[procdata cruise filesep 'problems' filesep 'vy' filesep 'badvy' int2str(drop) '.mat'];

% load eps<drop>
if exist(fstr1)~=2
	nodata_str=['get_epsilon1_mmp: ' fstr1 ' does not exist'];
	disp(nodata_str)
else
	ld_str=['load ' setstr(39) fstr1 setstr(39)];
	eval(ld_str)

  neps=length(pr_eps);
	%mha change -- older files seem not to have eps1 and eps2
	if ~exist('eps1')
		eps1=epsilon(:,1);
		eps2=epsilon(:,2);
	end 
  epsx=eps1;
  epsy=eps2;

  % load badvx if it exists
  if exist(fstr2)==2
	  badvx_str=['load ' setstr(39) fstr2 setstr(39)];
	  eval(badvx_str)
  end

  % load badvy if it exists
  if exist(fstr3)==2
	  badvy_str=['load ' setstr(39) fstr3 setstr(39)];
	  eval(badvy_str)
  end

  % set up arrays for pr_lb & pr_ub of all eps bins if badvx or badvy
  % exist
  if exist('badvx')==1 | exist('badvy')==1
	  pr_lb=zeros(size(pr_eps)); pr_ub=zeros(size(pr_eps));
	  dpr=diff(pr_eps);
	  pr_lb(1)=pr_eps(1)-dpr(1)/2;
	  pr_lb(2:neps)=pr_eps(2:neps)-dpr(1:neps-1)/2;
	  pr_ub(1:neps-1)=pr_eps(1:neps-1)+dpr(1:neps-1)/2;
	  pr_ub(neps)=pr_eps(neps)+dpr(neps-1)/2;
  end

  % use badvx to set bad  epsx values to NaNs
  if exist('badvx')==1
	  sbvx=size(badvx);	
	  for i=1:sbvx(1)
		  % find bins whose upper bounds exceed the lower bound
		  % of the bad data
		  iu=find(pr_ub>badvx(i,1));
		  % find bins whose lower bounds are less than the lower 
		  % bound of the bad data
		  il=find(pr_lb<badvx(i,2));
		  % find the indices common to iu and il
		  imin=max(min(iu),min(il));
		  imax=min(max(iu),max(il));
		  epsx(imin:imax)=NaN*ones(1,imax-imin+1);
	  end
  end

  % use badvy to set bad  epsy values to NaNs
  if exist('badvy')==1
	  sbvy=size(badvy);	
	  for i=1:sbvy(1)
		  % find bins whose upper bounds exceed the lower bound
		  % of the bad data
		  iu=find(pr_ub>badvy(i,1));
		  % find bins whose lower bounds are less than the lower 
		  % bound of the bad data
		  il=find(pr_lb<badvy(i,2));
		  % find the indices common to iu and il
		  imin=max(min(iu),min(il));
		  imax=min(max(iu),max(il));
		  epsy(imin:imax)=NaN*ones(1,imax-imin+1);
	  end
  end

  % Take epsilon as the average of  epsx and  epsy.  If  epsx
  % or  epsy is NaN, epsilon will be NaN.
  epsilon=( epsx+ epsy)/2;

  % If only  epsx or ep_vy is NaN, set epsilon to the good value
  ix=find(~isnan( epsx)==1 & isnan( epsy)==1); % good vx & bad vy
  epsilon(ix)= epsx(ix);
  iy=find(isnan( epsx)==1 & ~isnan( epsy)==1); % good vy & bad vx
  epsilon(iy)= epsx(iy);

  % If  epsx &  epsy are not NaNs and one is more than RATIO
  % times the other, take the lower assuming that the higher
  % level was produced by a plankton impact.
  i=find( epsx<RATIO* epsy);
  epsilon(i)= epsx(i);
  i=find( epsy<RATIO* epsx);
  epsilon(i)= epsy(i);

  % overlay epsilon profiles if testing
  if strcmp(testing,'y')
	  clf
	  semilogx(epsilon,pr_eps,'w');
	  set(gca,'ydir','reverse')
	  hold on
	  semilogx(epsx,pr_eps,'r+');
	  semilogx(epsy,pr_eps,'g+');
  end
end
\ No newline at end of file
diff --git a/mymatlab/mmp/processing/grid_mmp_ArcticMix_1m.m b/mymatlab/mmp/processing/grid_mmp_ArcticMix_1m.m
new file mode 100644
index 0000000..ff7663b
--- /dev/null
+++ b/mymatlab/mmp/processing/grid_mmp_ArcticMix_1m.m
@@ -0,0 +1,81 @@
+%Grid MMP data for PS02.
+%Use a .25-m grid, grid log eps and log chi, use psu for s and m for depth.
+mmpfolders
+cruise='ArcticMix15';
+%load([procdata filesep cruise filesep 'mmplog'])
+
+griddata = '/Users/ecfine/Documents/MATLAB/mmp_processing/ArcticMix15/gridded/';
+load(fullfile(procdata,cruise,'mmplog'))
+%mmplog=load(fullfile(procdata,cruise,'mmplog'));
+
+%%
+
+
+
+dz=1; % revised 9/13/18 to look at larger scale statistics
+zmax=300;
+
+zgrid=0:dz:zmax;
+
+MMP.p=zgrid;
+
+ig=find(~isnan(mmplog(:,2))); %assumes first drop is not a nan!
+%19254 chi does not exist... ??
+droplist = mmplog(ig,1)';
+for c=1:length(ig)%length(mmplog(:,1))
+    %drop=mmplog(c,1);
+    drop = droplist(c);
+    disp(['Drop ' num2str(drop) ', index ' num2str(c)]);
+    %DisplayProgress(drop,1)
+    try
+        [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
+        [pr_thetasd,t,theta,salinity,sgth]=get_thetasd2_mmp(drop,'t','th','s','sgth',0);
+        salinity=salinity*1000;
+        [chi, pr_chi, MLEchi]=get_chi1_mmp(drop);
+        dox=get_dox_mmp(drop);
+        if isempty(find(~isnan(dox)))
+            dox=NaN*zeros(size(t));
+        end
+
+        %Now interpolate onto the grid
+        MMP.dox(:,c)=nonmoninterp1(pr_thetasd*100,dox,zgrid);
+        MMP.t(:,c)=nonmoninterp1(pr_thetasd*100,t,zgrid);
+        MMP.th(:,c)=nonmoninterp1(pr_thetasd*100,theta,zgrid);
+        MMP.s(:,c)=nonmoninterp1(pr_thetasd*100,salinity,zgrid);
+        MMP.sgth(:,c)=nonmoninterp1(pr_thetasd*100,sgth,zgrid);
+        MMP.eps(:,c)=10.^nonmoninterp1(pr_eps*100,log10(epsilon),zgrid);
+        MMP.chi(:,c)=10.^nonmoninterp1(pr_chi*100,log10(MLEchi),zgrid); % Edited by ECF
+        MMP.w(:,c)=nonmoninterp1(pr_eps*100,w_eps,zgrid);               % 6/28/18 to use MLEchi 
+    catch
+        disp('problem, continuing')
+    end
+end
+
+%%
+%Final error checking
+
+%Now put NaN's in where the dox is negative
+try
+    ind1=find(MMP.dox(100,:)<0);
+    MMP.dox(:,ind1)=NaN;
+catch
+    disp('dox failed')
+end
+%subtract 1000 from sgth
+MMP.sgth=MMP.sgth-1000;
+
+
+%Then fill in the easy ones
+MMP.yday=mmplog(ig,3)';
+
+MMP.lat=mmplog(1:ig,5)';
+MMP.lon=mmplog(ig,4)';
+MMP.floatrange=mmplog(ig,14)';
+MMP.mmpid=mmplog(ig,11)';
+MMP.drop=mmplog(ig,1)';
+
+%MMP.dnum=yday2datenum(MMP.yday,mmplog(1,2)); %fill in year from mmplog - first drop - this would be a bug if we did a cruise spanning new year!
+MMP.dnum = MMP.yday + datenum(2015,1,1,0,0,0);
+
+cd(griddata)
+save MMPgrid1m MMP
diff --git a/mymatlab/mmp/processing/grid_mmp_ArcticMix_fromstart.m b/mymatlab/mmp/processing/grid_mmp_ArcticMix_fromstart.m
index c86e045..69b9f80 100644
--- a/mymatlab/mmp/processing/grid_mmp_ArcticMix_fromstart.m
+++ b/mymatlab/mmp/processing/grid_mmp_ArcticMix_fromstart.m
@@ -5,14 +5,14 @@
 %load([procdata filesep cruise filesep 'mmplog'])
 
 %griddata='/Users/mmp/MATLAB/SharedProjects/WashingtonWaves/data/proc_mmp/';
-griddata = '/Users/mmp/Documents/MATLAB/mmp/ArcticMix15/gridded/';
+griddata = '/Users/ecfine/Documents/MATLAB/mmp_processing/ArcticMix15/gridded/';
 load(fullfile(procdata,cruise,'mmplog'))
 %mmplog=load(fullfile(procdata,cruise,'mmplog'));
 
 %%
 
 
-%The deepest drop was to 220 m.  
+
 dz=0.25; % revised by Effie for Arctic cruise
 zmax=300;
 
@@ -28,25 +28,28 @@
     drop = droplist(c);
     disp(['Drop ' num2str(drop) ', index ' num2str(c)]);
     %DisplayProgress(drop,1)
-    [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
-    [pr_thetasd,t,theta,salinity,sgth]=get_thetasd2_mmp(drop,'t','th','s','sgth',0);
-    salinity=salinity*1000;
-    [chi, pr_chi]=get_chi1_mmp(drop);
-    dox=get_dox_mmp(drop);
-    if isempty(find(~isnan(dox)))
-        dox=NaN*zeros(size(t));
+    try
+        [epsilon, pr_eps, w_eps]=get_epsilon2_mmp(drop);
+        [pr_thetasd,t,theta,salinity,sgth]=get_thetasd2_mmp(drop,'t','th','s','sgth',0);
+        salinity=salinity*1000;
+        [chi, pr_chi, MLEchi]=get_chi1_mmp(drop);
+        dox=get_dox_mmp(drop);
+        if isempty(find(~isnan(dox)))
+            dox=NaN*zeros(size(t));
+        end
+
+        %Now interpolate onto the grid
+        MMP.dox(:,c)=nonmoninterp1(pr_thetasd*100,dox,zgrid);
+        MMP.t(:,c)=nonmoninterp1(pr_thetasd*100,t,zgrid);
+        MMP.th(:,c)=nonmoninterp1(pr_thetasd*100,theta,zgrid);
+        MMP.s(:,c)=nonmoninterp1(pr_thetasd*100,salinity,zgrid);
+        MMP.sgth(:,c)=nonmoninterp1(pr_thetasd*100,sgth,zgrid);
+        MMP.eps(:,c)=10.^nonmoninterp1(pr_eps*100,log10(epsilon),zgrid);
+        MMP.chi(:,c)=10.^nonmoninterp1(pr_chi*100,log10(MLEchi),zgrid); % Edited by ECF
+        MMP.w(:,c)=nonmoninterp1(pr_eps*100,w_eps,zgrid);               % 6/28/18 to use MLEchi 
+    catch
+        disp('problem, continuing')
     end
-    
-    %Now interpolate onto the grid
-    MMP.dox(:,c)=nonmoninterp1(pr_thetasd*100,dox,zgrid);
-    MMP.t(:,c)=nonmoninterp1(pr_thetasd*100,t,zgrid);
-    MMP.th(:,c)=nonmoninterp1(pr_thetasd*100,theta,zgrid);
-    MMP.s(:,c)=nonmoninterp1(pr_thetasd*100,salinity,zgrid);
-    MMP.sgth(:,c)=nonmoninterp1(pr_thetasd*100,sgth,zgrid);
-    MMP.eps(:,c)=10.^nonmoninterp1(pr_eps*100,log10(epsilon),zgrid);
-    MMP.chi(:,c)=10.^nonmoninterp1(pr_chi*100,log10(chi),zgrid);
-    MMP.w(:,c)=nonmoninterp1(pr_eps*100,w_eps,zgrid);
-    
 end
 
 %%
@@ -73,4 +76,4 @@
 MMP.dnum = MMP.yday + datenum(2015,1,1,0,0,0);
 
 cd(griddata)
-save MMPgrid MMP
+save MMPgridMLE MMP
diff --git a/mymatlab/mmp/processing/grid_mmp_SODA.m b/mymatlab/mmp/processing/grid_mmp_SODA.m
new file mode 100644
index 0000000..0b15821
--- /dev/null
+++ b/mymatlab/mmp/processing/grid_mmp_SODA.m
@@ -0,0 +1,117 @@
+% Grid MMP data for SODA2018.
+% Use a .25-m grid, grid log eps and log chi, use psu for s and m for depth.
+mmpfolders
+cruise = 'SODA18';
+year = 2018;
+
+%% Change paths here!
+path_local  = '/Users/ecfine/Documents/MATLAB/mmp_processing';
+work_dir  = '/Users/ecfine/Documents/MATLAB/mmp_processing/mymatlab/mmp/batchprocess';
+%path_server = '/Volumes/public/Cruises/SKQ201511S/data/mmp_data/processed/gridded/';
+
+load(fullfile(procdata,cruise,'mmplog'))
+
+%%
+% The deepest drop was to 300 m.  
+dz    = 0.25; % revised by Effie for Arctic cruise
+zmax  = 300;
+
+% ?
+zgrid = 0:dz:zmax;
+
+MMP.p = zgrid;  %JBM changed this...it is PRESSURE not DEPTH.  This is a very important distinction.
+
+ig = find(~isnan(mmplog(:,7))); %assumes first drop is not a nan!
+droplist = mmplog(ig,1)';
+%19254 chi does not exist... ??
+if exist([path_local 'MMPgrid.mat'])
+    load([path_local 'MMPgrid.mat']);
+    %cc = [1:78,80:158,160:549,551:length(ig)]; % 80th drop, 19773, doesn't exist! neither does 159 (19853)
+    cc = length(MMP.yday):length(ig); 
+    toinit = nan(length(MMP.p), length(cc));
+else
+    cc = 1:length(droplist);
+end
+% a for loop.
+for c = cc %length(mmplog(:,1))
+    %drop = mmplog(c,1);
+    drop = droplist(c);
+    disp([num2str(drop) ', index ' num2str(c)])
+    %DisplayProgress(drop,1)
+    % get dissipation (epsilon)
+    try
+        [epsilon, pr_eps, w_eps]            = get_epsilon2_mmp(drop);
+    catch
+        epsilon = nan;
+        pr_eps = nan;
+        w_eps = nan;
+    end
+    % get potential temperature, salinity, and other things...
+    [pr_thetasd,t,theta,salinity,sgth]  = get_thetasd2_mmp(drop,'t','th','s','sgth',0);
+    % change the units of salinity
+    salinity                            = salinity*1000;
+    % get temperature variance (chi)
+    try
+        [chi, pr_chi]                       = get_chi1_mmp(drop);
+    catch 
+        chi = nan;
+        pr_chi = nan;
+    end
+    % get dissolved oxygen
+    dox                                 = get_dox_mmp(drop);
+    % set empty data points to NaN
+    if isempty(find(~isnan(dox)))
+        dox=NaN*zeros(size(t));
+    end
+    % Now interpolate onto the grid
+    % dissolved oxygen
+    MMP.dox (:,c)    = nonmoninterp1    ( pr_thetasd*100 , dox              , zgrid);
+    % temperature
+    MMP.t   (:,c)    = nonmoninterp1    ( pr_thetasd*100 , t                , zgrid);
+    % potential temperature (theta)
+    MMP.th  (:,c)    = nonmoninterp1    ( pr_thetasd*100 , theta            , zgrid);
+    % salinity
+    MMP.s   (:,c)    = nonmoninterp1    ( pr_thetasd*100 , salinity         , zgrid);
+    % sigma-theta
+    MMP.sgth(:,c)    = nonmoninterp1    ( pr_thetasd*100 , sgth             , zgrid);
+    % dissipation (epsilon)
+    MMP.eps (:,c)    = 10.^nonmoninterp1( pr_eps*100     , log10(epsilon)   , zgrid);
+    % temperature variance (chi)
+    MMP.chi (:,c)    = 10.^nonmoninterp1( pr_chi*100     , log10(chi)       , zgrid);
+    % vertical velocity of mmp
+    MMP.w   (:,c)    = nonmoninterp1    ( pr_eps*100     , w_eps            , zgrid);
+    
+end
+
+%%
+%Final error checking
+%Now put NaN's in where the dox is negative
+ind1            = find(MMP.dox(100,:)<0);
+new.dox(:,ind1) = NaN;
+%subtract 1000 from sgth
+MMP.sgth        = MMP.sgth-1000;
+
+
+%Then fill in the easy ones
+MMP.yday        = mmplog(ig,3)';
+MMP.lat         = mmplog(1:ig,5)';
+MMP.lon         = mmplog(ig,4)';
+MMP.floatrange  = mmplog(ig,14)';
+MMP.mmpid       = mmplog(ig,11)';
+MMP.drop        = mmplog(ig,1)';
+
+%MMP.dnum=yday2datenum(MMP.yday,mmplog(1,2)); %fill in year from mmplog - first drop - this would be a bug if we did a cruise spanning new year!
+MMP.dnum        = MMP.yday + datenum(year,1,1,0,0,0); 
+
+% move to folder with gridded data
+%cd(path_local)
+
+% save mmp grid
+disp('saving data...')
+cd(path_local)
+save MMPgridSODATEST MMP
+cd(work_dir)
+% 
+% %% copy mmp data to server
+%  disp('copying data to shared folder...')
+%  eval([ '!cp ' path_local 'MMPgrid.mat ' path_server ])
diff --git a/mymatlab/mmp/scan_test.m b/mymatlab/mmp/scan_test.m
index dd3cbe8..526d553 100755
--- a/mymatlab/mmp/scan_test.m
+++ b/mymatlab/mmp/scan_test.m
@@ -4,10 +4,11 @@
 
 mmpfolders
 global FSP
-
+ch = 'sc';
+drop = 19707;
 scan_err=[];
 
-for drop=2400:2588
+%for drop=2400:2588
   sc=read_rawdata_mmp(ch,drop);
 	dsc=diff(sc);
 	if strcmp(PLOTS,'y')
@@ -23,5 +24,7 @@
 		%disp(msg)
 		%disp(int2str(diff(err)))
 		scan_err=[scan_err drop];
+    else
+        disp('no scan error! woohoo!')
 	end
-end
+%end
diff --git a/mymatlab/mmp/set_mmp_paths2.m b/mymatlab/mmp/set_mmp_paths2.m
deleted file mode 100755
index 93131da..0000000
--- a/mymatlab/mmp/set_mmp_paths2.m
+++ /dev/null
@@ -1,15 +0,0 @@
-mmpfolders
-
-path([mymatlabdisk '/mmp'],path)
-path([mymatlabdisk '/mmp/batchprocess'],path)
-path([mymatlabdisk '/mmp/calibration'],path)
-path([mymatlabdisk '/mmp/calibration/batchprocess'],path)
-path([mymatlabdisk '/mmp/calibration/read'],path)
-path([mymatlabdisk '/mmp/calibration/filters'],path)
-path([mymatlabdisk '/mmp/processing'],path)
-path([mymatlabdisk '/mmp/utilities'],path)
-path([mymatlabdisk '/mmp/testing'],path)
-path([mymatlabdisk '/toolbox/utilities'],path)
-path([mymatlabdisk '/toolbox/seawater2'],path)
-path([mymatlabdisk '/toolbox/seawater'],path)
-path([mymatlabdisk '/toolbox/generaltrf'],path)
\ No newline at end of file
diff --git a/mymatlab/mmp/test.m b/mymatlab/mmp/test.m
deleted file mode 100755
index 8cdad12..0000000
--- a/mymatlab/mmp/test.m
+++ /dev/null
@@ -1 +0,0 @@
-%test.m

x=1;

if x==1
for jj=1
  for w=2:3
    break
  end
	disp('here')
	
end
end
\ No newline at end of file
diff --git a/mymatlab/toolbox/MLE/vmp_chi_MLE.m b/mymatlab/toolbox/MLE/vmp_chi_MLE.m
index 75fb119..38e7f41 100644
--- a/mymatlab/toolbox/MLE/vmp_chi_MLE.m
+++ b/mymatlab/toolbox/MLE/vmp_chi_MLE.m
@@ -107,39 +107,41 @@
     % polynomial fit goes to zero.
     % Use 7 points on either side of the maximum that has been identified so
     % far.
-    Y = C_fine(I-7:I+7);
-    X = loopover(I-7:I+7);
-    [P,~,mu] = polyfit(X,Y,5);
-    % take the derivative of the 5th order polynomial
-    der = polyder(P);
-    
-    % Calculate the derivative over many points (remember that the polyfit was
-    % on a scaled x). The maximum likelihood will occur where the the slope is
-    % closest, in absolute value, to zero.
-    manypoints = loopover(I-7):0.01:loopover(I+7);
-    manypoints_sc = (manypoints - mu(1))./mu(2);
-    pp = polyval(der,manypoints_sc);
-    [~,max_spot] = min(abs(pp));
-    best_kB = manypoints(max_spot);
-    S_batchelor = vmp_batchelor_spectra(best_kB,k,chi,kappa);  %,q);
-    
-    % Account for the missing variance in the chi calculation
-    % Batchelor wavenumber in cpm
-    kB_cpm = best_kB/(2*pi);
-    missing.low = 6*kappa*vmp_integral(S_batchelor,k,0,k(2));
-    del_k = mean(diff(k));
-    if kB_cpm >= k_noise_cutoff + del_k
-        ktmp = (k(end-1):del_k:kB_cpm)';
-        S_tmp = vmp_batchelor_spectra(best_kB,ktmp,chi,kappa);
-        missing.high = 6*kappa*vmp_integral(S_tmp,ktmp,k_noise_cutoff,kB_cpm);
-    else
-        missing.high = 0;
-    end
-    chi_prev = chi;
-    chi = missing.low + chi + missing.high;
-    
-    count = count + 1;
-    MLE_successful = 1;
+    try
+        Y = C_fine(I-7:I+7);
+        X = loopover(I-7:I+7);
+        [P,~,mu] = polyfit(X,Y,5);
+        % take the derivative of the 5th order polynomial
+        der = polyder(P);
+
+        % Calculate the derivative over many points (remember that the polyfit was
+        % on a scaled x). The maximum likelihood will occur where the the slope is
+        % closest, in absolute value, to zero.
+        manypoints = loopover(I-7):0.01:loopover(I+7);
+        manypoints_sc = (manypoints - mu(1))./mu(2);
+        pp = polyval(der,manypoints_sc);
+        [~,max_spot] = min(abs(pp));
+        best_kB = manypoints(max_spot);
+        S_batchelor = vmp_batchelor_spectra(best_kB,k,chi,kappa);  %,q);
+
+        % Account for the missing variance in the chi calculation
+        % Batchelor wavenumber in cpm
+        kB_cpm = best_kB/(2*pi);
+        missing.low = 6*kappa*vmp_integral(S_batchelor,k,0,k(2));
+        del_k = mean(diff(k));
+        if kB_cpm >= k_noise_cutoff + del_k
+            ktmp = (k(end-1):del_k:kB_cpm)';
+            S_tmp = vmp_batchelor_spectra(best_kB,ktmp,chi,kappa);
+            missing.high = 6*kappa*vmp_integral(S_tmp,ktmp,k_noise_cutoff,kB_cpm);
+        else
+            missing.high = 0;
+        end
+        chi_prev = chi;
+        chi = missing.low + chi + missing.high;
+
+        count = count + 1;
+        MLE_successful = 1;
+    end         
 end
 
 if  MLE_successful