patch DP read anc_already_art

mrc-ide · Nov 18, 2024 · bf0cd1a · bf0cd1a
1 parent fa90b52
commit bf0cd1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: naomi
 Title: Naomi Model for Subnational HIV Estimates
-Version: 2.10.0
+Version: 2.10.1
 Authors@R:
     person(given = "Jeff",
            family = "Eaton",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# naomi 2.10.1
+
+* Patch error in reading `anc_already_art` from Spectrum PJNZ file (was errantly
+  reading number of women initiated ART <4 weeks before delivery).
+
 # naomi 2.10.0
 
 * Update Naomi example and test datasets to current example data for Malawi

diff --git a/R/inputs-spectrum.R b/R/inputs-spectrum.R
@@ -387,9 +387,9 @@ read_dp_anc_testing <- function(dp) {
   ## Note: these values start 1 column later than other arrays in the .DP file
   ## If value is 0, interpret as not entered (NA)
   if (exists_dptag("<ARVRegimen MV2>")) {
-    anc_already_art <- dpsub("<ARVRegimen MV2>", 13, timedat.idx+1)
+    anc_already_art <- dpsub("<ARVRegimen MV2>", 11, timedat.idx+1)
   } else if (exists_dptag("<ARVRegimen MV3>")) {
-    anc_already_art <- dpsub("<ARVRegimen MV3>", 13, timedat.idx+1)
+    anc_already_art <- dpsub("<ARVRegimen MV3>", 11, timedat.idx+1)
   }
   anc_already_art <- sapply(anc_already_art, as.integer)
   anc_already_art[anc_already_art == 0] <- NA