Use Western Baltic 2022 advice sheet

ices-eg · Nov 27, 2023 · 8c53f10 · 8c53f10
1 parent 8125f22
commit 8c53f10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/selectivity/R/sag/boot/advice.R b/selectivity/R/sag/boot/advice.R
@@ -19,6 +19,9 @@ download("https://ices-library.figshare.com/ndownloader/files/35905118",
 message("2022 North Sea")
 download("https://ices-library.figshare.com/ndownloader/files/38140326",
          destfile="advice_north_sea.pdf")
+message("2022 W Baltic")
+download("https://ices-library.figshare.com/ndownloader/files/35457407",
+         destfile="advice_w_baltic.pdf")
 
 message("2023 E Baltic")
 download("https://ices-library.figshare.com/ndownloader/files/41007086",
@@ -35,6 +38,3 @@ download("https://ices-library.figshare.com/ndownloader/files/41385474",
 message("2023 S Celtic")
 download("https://ices-library.figshare.com/ndownloader/files/41412585",
          destfile="advice_s_celtic.pdf")
-message("2023 W Baltic")
-download("https://ices-library.figshare.com/ndownloader/files/41007074",
-         destfile="advice_w_baltic.pdf")
diff --git a/selectivity/R/sag/data_pick.R b/selectivity/R/sag/data_pick.R
@@ -55,10 +55,12 @@ names(kattegat) <- colnames
 kattegat.refpt <- NULL
 kattegat <- data.frame(Stock="Kattegat", kattegat)
 
-# W Baltic 2023
-w.baltic <- sumtab.2023$"cod.27.22-24"[columns]
+# W Baltic 2022 (use 2022 when reference points were in absolute tonnes)
+w.baltic <- sumtab.2022$"cod.27.22-24"[columns]
 names(w.baltic) <- colnames
-w.baltic.refpt <- refpt.2023$"cod.27.22-24"[c("Blim", "MSYBtrigger")]
+w.baltic.refpt <- refpt.2022$"cod.27.22-24"[c("Blim", "Bpa", "MSYBtrigger",
+                                              "FMSY", "Fpa", "FLim")]
+names(w.baltic.refpt)[names(w.baltic.refpt) == "FLim"] <- "Flim"
 w.baltic <- data.frame(Stock="W Baltic", w.baltic, w.baltic.refpt)
 
 # E Baltic 2023